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

Timestamp:

Dec 12, 2014, 5:06:18 PM (10 years ago)

Author:

alain

Message:

Cosmetic: Improving debug.

File:

• soft/giet_vm/giet_libs/malloc.c (modified) (10 diffs)

soft/giet_vm/giet_libs/malloc.c

@@ -8 +8 @@
 #include "malloc.h"
 #include "stdio.h"
+#include "giet_config.h"
 
 // Global variables defining the heap descriptors array (one heap per cluster)
@@ -51 +52 @@
 {
     giet_shr_printf(
-                " - coordinates = [%d][%d]\n"
                 " - heap_base   = %x\n"
                 " - heap_size   = %x\n"
@@ -80 +80 @@
                 " - free[22]    = %x\n"
                 " - free[23]    = %x\n",
-                heap[x][y].x, heap[x][y].y, 
                 heap[x][y].heap_base, heap[x][y].heap_size, 
                 heap[x][y].alloc_base, heap[x][y].alloc_size,
@@ -115 +114 @@
     heap_index = GET_SIZE_INDEX( heap_size );
 
+#if GIET_DEBUG_USER_MALLOC
+giet_shr_printf("\n[DEBUG USER_MALLOC] Starting Heap[%d][%d] initialisation /"
+                " base = %x / size = %x\n", x, y, heap_base, heap_size );
+#endif
+
     // checking heap segment constraints
     if ( heap_size == 0 )                                    // heap segment exist
@@ -166 +170 @@
     heap[x][y].alloc_base = alloc_base;
 
-    lock_release( &heap[x][y].lock );
-
-#if GIET_DEBUG_MALLOC
-giet_shr_printf("\n[MALLOC DEBUG] Completing Heap[%d][%d] initialisation\n", x, y );
+    lock_init( &heap[x][y].lock );
+
+#if GIET_DEBUG_USER_MALLOC
+giet_shr_printf("\n[DEBUG USER_MALLOC] Completing Heap[%d][%d] initialisation\n", x, y );
 display_free_array(x,y);
 #endif
@@ -238 +242 @@
 {
 
-#if GIET_DEBUG_MALLOC
-giet_shr_printf("\n[MALLOC DEBUG] Malloc request for Heap[%d][%d] / size = %x\n", 
+#if GIET_DEBUG_USER_MALLOC
+giet_shr_printf("\n[DEBUG USER_MALLOC] Malloc request for Heap[%d][%d] / size = %x\n", 
                  x, y, size );
 #endif
@@ -260 +264 @@
     if ( heap[x][y].init != HEAP_INITIALIZED )
     {
-        heap_init( x, y );
+        heap_init( x , y );
     }
 
@@ -288 +292 @@
     lock_release( &heap[x][y].lock );
  
-#if GIET_DEBUG_MALLOC
-giet_shr_printf("\n[MALLOC DEBUG] Malloc vaddr from Heap[%d][%d] = %x\n", 
+#if GIET_DEBUG_USER_MALLOC
+giet_shr_printf("\n[DEBUG USER_MALLOC] Malloc vaddr from Heap[%d][%d] = %x\n", 
                 x, y, base );
 display_free_array(x,y);
@@ -383 +387 @@
     giet_get_xy( ptr, &x, &y );
 
-#if GIET_DEBUG_MALLOC
-giet_shr_printf("\n[MALLOC DEBUG] Free for vaddr = %x / x = %d / y = %d\n",
+#if GIET_DEBUG_USER_MALLOC
+giet_shr_printf("\n[DEBUG USER_MALLOC] Free for vaddr = %x / x = %d / y = %d\n",
                  (unsigned int)ptr, x, y );
 #endif
@@ -418 +422 @@
     lock_release( &heap[x][y].lock );
 
-#if GIET_DEBUG_MALLOC
+#if GIET_DEBUG_USER_MALLOC
 display_free_array(x,y);
 #endif