Changeset 588 for soft/giet_vm/giet_libs/malloc.h

Timestamp:

Jul 8, 2015, 3:40:18 PM (9 years ago)

Author:

alain

Message:

1) Fix a bug in the free() function in the malloc.c
2) Introduce new syscalls to access the FAT in stdio.c

File:

• soft/giet_vm/giet_libs/malloc.h (modified) (5 diffs)

soft/giet_vm/giet_libs/malloc.h

@@ -14 +14 @@
 //   to MIN_BLOCK_SIZE (typically 128 bytes).
 // - All free blocks are aligned.
-// - They are pre-classed in NB_SIZES linked lists, where all blocks in the
-//   same list have the same size. 
+// - They are pre-classed in NB_SIZES linked lists, where all blocks in a
+//   given list have the same size. 
 // - The NEXT pointer implementing those linked lists is written 
 //   in the 4 first bytes of the block itself, using the unsigned int type.
@@ -40 +40 @@
 // - This allocation policy has the nice following property:
 //   If the heap segment is aligned (the heap_base is a multiple of the
-//   heap_base), all allocated blocks are aligned on the actual_size.
+//   heap_size), all allocated blocks are aligned on the actual_size.
 ////////////////////////////////////////////////////////////////////////////////
 // Free policy:
@@ -52 +52 @@
 // - The index in this array is computed from the allocated block base address:
 //      index = (block_base - heap_base) / MIN_BLOCK_SIZE
-// - The allocated[] array is stored at the end of heap segment. This consume
+// - The alloc[] array is stored at the end of heap segment. This consume
 //   (1 / MIN_BLOCK_SIZE) of the total heap storage capacity.
 ////////////////////////////////////////////////////////////////////////////////
@@ -73 +73 @@
 // heap(x,y) descriptor (one per cluster)
 ////////////////////////////////////////////////////////////////////////////////
+
 typedef struct giet_heap_s
 {
+    user_lock_t    lock;            // lock protecting exclusive access
     unsigned int   init;            // initialised <=> value == HEAP_INITIALIZED
     unsigned int   x;               // cluster X coordinate
@@ -82 +84 @@
     unsigned int   alloc_base;      // alloc[] array base address
     unsigned int   alloc_size;      // alloc[] array size (bytes)
-    user_lock_t    lock;            // lock protecting exclusive access
     unsigned int   free[32];        // array of base addresses of free blocks 
                                     // (address of first block of a given size)