Changeset 686

Timestamp:

Aug 3, 2015, 7:07:03 PM (9 years ago)

Author:

guerin

Message:

remove almalloc implementation

It is in fact useless because malloc already returns aligned addresses.
Should have read the doc first ;)

Location:

soft/giet_vm

Files:

• applications/raycast/disp.c (modified) (1 diff)
• giet_libs/malloc.c (modified) (1 diff)
• giet_libs/malloc.h (modified) (1 diff)

soft/giet_vm/applications/raycast/disp.c

@@ -210 +210 @@
 
     // Allocate framebuffer
-    buf[0] = almalloc(64, FBUF_X_SIZE * FBUF_Y_SIZE);
-    buf[1] = almalloc(64, FBUF_X_SIZE * FBUF_Y_SIZE);
-    sts[0] = almalloc(64, 64);
-    sts[1] = almalloc(64, 64);
+    buf[0] = malloc(FBUF_X_SIZE * FBUF_Y_SIZE);
+    buf[1] = malloc(FBUF_X_SIZE * FBUF_Y_SIZE);
+    sts[0] = malloc(64);
+    sts[1] = malloc(64);
 
     // Initialize framebuffer

soft/giet_vm/giet_libs/malloc.c

@@ -431 +431 @@
 } // end free()
 
-//////////////////////
-// reference: http://stackoverflow.com/a/6563989/4244300
-void * almalloc( unsigned int align, unsigned int size )
-{
-    unsigned int total_size;
-    void* ptr;
-
-    // check if align is a power of two
-    if ( !align || (align & (align - 1)) )
-        return NULL;
-
-    // reserve memory for data + offset + book-keeping
-    total_size = size + align + sizeof(void*);
-    ptr = malloc( total_size );
-
-    if ( ptr )
-    {
-        void* start = ptr;
-        void** book;
-
-        // find aligned ptr
-        ptr += sizeof(void*);
-        ptr += align - ((unsigned int)ptr % align);
-
-        // keep original ptr just before the actual data
-        book = ptr - sizeof(void*);
-        *book = start;
-    }
-
-    return ptr;
-}
-
-//////////////////////
-void alfree( void* ptr )
-{
-    if ( ptr )
-    {
-        void** book = ptr - sizeof(void*);
-        free(*book);
-    }
-}
-
 // Local Variables:
 // tab-width: 4

soft/giet_vm/giet_libs/malloc.h

@@ -101 +101 @@
 extern void free(void * ptr);
 
-extern void* almalloc (unsigned int align, unsigned int size );
-
-extern void alfree(void * ptr);
-
 #endif