Changeset 541 for soft/giet_vm/giet_libs

Timestamp:

Mar 30, 2015, 6:21:31 PM (10 years ago)

Author:

bellefin

Message:

Introducing user lever heap_init() into malloc library

Location:

soft/giet_vm/giet_libs

Files:

• malloc.c (modified) (1 diff)
• malloc.h (modified) (1 diff)
• user_barrier.c (modified) (2 diffs)

soft/giet_vm/giet_libs/malloc.c

@@ -261 +261 @@
     }
 
-    // initializes the heap if first access
+    // checking initialization
     if ( heap[x][y].init != HEAP_INITIALIZED )
     {
-        heap_init( x , y );
+        giet_exit("ERROR in malloc() : heap not initialized\n");
     }
 

soft/giet_vm/giet_libs/malloc.h

@@ -90 +90 @@
 ///////// user functions /////////////////
 
+extern void heap_init( unsigned int x,
+                       unsigned int y );
+
 extern void* malloc( unsigned int size );
 

soft/giet_vm/giet_libs/user_barrier.c

@@ -303 +303 @@
 
     asm volatile( "addu   $2,     %1,        $0      \n"
-                  "sqt_llsc:                         \n"
+                  "1234:                             \n"
                   "ll     $8,     0($2)              \n"
                   "addi   $9,     $8,        -1      \n"
                   "sc     $9,     0($2)              \n"
-                  "beqz   $9,     sqt_llsc           \n"
+                  "beqz   $9,     1234b              \n"
                   "addu   %0,     $8,        $0      \n"
                   : "=r" (count)
@@ -337 +337 @@
         // input: expected sense value (expected)
         unsigned int* psense  = (unsigned int *)&node->sense;
-        asm volatile ( "sqt_sense:                       \n"
+        asm volatile ( "5678:                            \n"
                        "lw    $3,   0(%0)                \n"
-                       "bne   $3,   %1,    sqt_sense     \n"
+                       "bne   $3,   %1,    5678b         \n"
                        :
                        : "r"(psense), "r"(expected)