Changeset 375 for soft/giet_vm

Timestamp:

Aug 1, 2014, 12:04:16 PM (10 years ago)

Author:

alain

Message:

bug fix

Location:

soft/giet_vm/giet_libs

Files:

• barrier.c (modified) (4 diffs)
• remote_malloc.c (modified) (1 diff)

soft/giet_vm/giet_libs/barrier.c

@@ -41 +41 @@
     volatile unsigned int* pcount  = (unsigned int *)&barrier->count;
     volatile unsigned int  count    = 0;  // avoid a warning
-    asm volatile ("barrier_llsc:                     \n"
-                  "ll     $2,     0(%1)              \n"    
-                  "addi   $3,     $2,        -1      \n"
-                  "sc     $3,     0(%1)              \n"
-                  "addu   %0,     $2,        $0      \n"
-                  "beqz   $3,     barrier_llsc       \n"
+
+    asm volatile( "addu   $2,     %1,        $0      \n"
+                  "barrier_llsc:                     \n"
+                  "ll     $8,     0($2)              \n"
+                  "addi   $9,     $8,        -1      \n"
+                  "sc     $9,     0($2)              \n"
+                  "beqz   $9,     barrier_llsc       \n"
+                  "addu   %0,     $8,        $0      \n"
                   : "=r" (count)
                   : "r" (pcount)
-                  : "$3", "$2", "memory" );
+                  : "$2", "$8", "$9", "memory" );
 
     // the last task re-initializes count and toggle sense,
@@ -64 +66 @@
         // input: expected sense value (expected)
         volatile unsigned int* psense  = (unsigned int *)&barrier->sense;
-        asm volatile ("barrier_sense:                   \n"
-                      "lw    $3,   0(%0)                \n"
-                      "bne   $3,   %1,    barrier_sense \n"
-                      :
-                      : "r"(psense), "r"(expected)
-                      : "$3" );
+        asm volatile ( "barrier_sense:                   \n"
+                       "lw    $3,   0(%0)                \n"
+                       "bne   $3,   %1,    barrier_sense \n"
+                       :
+                       : "r"(psense), "r"(expected)
+                       : "$3" );
     }
 
@@ -309 +311 @@
     unsigned int   count     = 0;  // avoid a warning
 
-    asm volatile( "sbt_llsc:                         \n"                   
-                  "ll     $2,     0(%1)              \n"    
-                  "addi   $3,     $2,        -1      \n"
-                  "sc     $3,     0(%1)              \n"
-                  "addu   %0,     $2,        $0      \n"
-                  "beqz   $3,     sbt_llsc           \n"
+    asm volatile( "addu   $2,     %1,        $0      \n"
+                  "sbt_llsc:                         \n"
+                  "ll     $8,     0($2)              \n"
+                  "addi   $9,     $8,        -1      \n"
+                  "sc     $9,     0($2)              \n"
+                  "beqz   $9,     sbt_llsc           \n"
+                  "addu   %0,     $8,        $0      \n"
                   : "=r" (count)
                   : "r" (pcount)
-                  : "$3", "$2", "memory" );
+                  : "$2", "$8", "$9", "memory" );
 
     if ( count == 1 )    // last task for this level 
@@ -336 +339 @@
         // input: expected sense value (expected)
         volatile unsigned int* psense  = (unsigned int *)&node->sense;
-        asm volatile ("sbt_sense:                       \n"
-                      "lw    $3,   0(%0)                \n"
-                      "bne   $3,   %1,    sbt_sense     \n"
-                      :
-                      : "r"(psense), "r"(expected)
-                      : "$3" );
+        asm volatile ( "sbt_sense:                       \n"
+                       "lw    $3,   0(%0)                \n"
+                       "bne   $3,   %1,    sbt_sense     \n"
+                       :
+                       : "r"(psense), "r"(expected)
+                       : "$3" );
     }
 } // end sbt_decrement()

soft/giet_vm/giet_libs/remote_malloc.c

@@ -19 +19 @@
 ///////////////////////////////////////////////////////////////////////////////////
 
-unsigned int remote_malloc_cur[X_SIZE][Y_SIZE] = {[0 ... Y_SIZE-1][0 ... X_SIZE-1] = 0};
+unsigned int remote_malloc_cur[X_SIZE][Y_SIZE] = {[0 ... X_SIZE-1][0 ... Y_SIZE-1] = 0};
 
-unsigned int remote_malloc_max[X_SIZE][Y_SIZE] = {[0 ... Y_SIZE-1][0 ... X_SIZE-1] = 0};
+unsigned int remote_malloc_max[X_SIZE][Y_SIZE] = {[0 ... X_SIZE-1][0 ... Y_SIZE-1] = 0};
 
 giet_lock_t  remote_malloc_lock[X_SIZE][Y_SIZE] __attribute__((aligned(512)));