Changeset 791 for soft/giet_vm/giet_libs/malloc.c

Timestamp:

Feb 17, 2016, 4:12:02 PM (9 years ago)

Author:

meunier

Message:

• Added function realloc
• Started to put the bootloader on 2 Big Pages (warning: does not work yet)
• Fixed errors in the rosenfeld application

File:

• soft/giet_vm/giet_libs/malloc.c (modified) (1 diff)

soft/giet_vm/giet_libs/malloc.c

@@ -305 +305 @@
 }
 
+
+/////////////////////////////////////////////////
+// Added by QM
+// Warning, I can't have tested this function yet
+/////////////////////////////////////////////////
+void * realloc ( void * ptr, int size )
+{
+    if ( ptr == NULL )
+    {
+        return malloc( size );
+    }
+    if ( size == 0 )
+    {
+        free( ptr );
+        return NULL;
+    }
+    unsigned int x;
+    unsigned int y;
+    giet_get_xy( ptr, &x, &y );
+    unsigned int base = (unsigned int) ptr;
+    int index = (base - heap[x][y].heap_base) / MIN_BLOCK_SIZE;
+
+    char * pchar = (char *) (heap[x][y].alloc_base + index);
+    int old_size = 1 << ((int) *pchar);
+
+    void * new_ptr = malloc( size );
+    int min_size = (size < old_size) ? size : old_size;
+    memcpy( new_ptr, ptr, min_size );
+    free( ptr );
+    return new_ptr;
+}
+
+
+
 ///////////////////////////////////////////
 void update_free_array( giet_heap_t* heap,