Changeset 376 for soft

Timestamp:

Aug 2, 2014, 1:31:56 PM (10 years ago)

Author:

alain

Message:

Fix a bug in sbt_build() function.

File:

• soft/giet_vm/giet_libs/barrier.c (modified) (5 diffs)

soft/giet_vm/giet_libs/barrier.c

@@ -246 +246 @@
         node->child0   = NULL;
         node->child1   = NULL;
+
+#if GIET_DEBUG_SBT
+giet_shr_printf("[DEBUG SBT] initialize node[%d][%d][%d] :"
+                " arity = %d / child0 = %x / child1 = %x\n", 
+                x, y, level, 
+                node->arity, node->child0, node->child1 );
+#endif
+
     }
     else                   // non terminal case
@@ -254 +262 @@
         unsigned int y1;   // y coordinate for child1;
 
-        // the child1 coordinates depends on the level value
+        // the child0 coordinates are equal to the parent coordinates
+        // the child1 coordinates are incremented depending on the level value
         if ( level & 0x1 ) // odd level => X binary tree
         {
             x0 = x;
             y0 = y;
-            x1 = x + (1 << ((level-1)>>2));
+            x1 = x + (1 << ((level-1)>>1));
             y1 = y;
         }    
@@ -267 +276 @@
             y0 = y;
             x1 = x;
-            y1 = y + (1 << ((level-1)>>2));
+            y1 = y + (1 << ((level-1)>>1));
         }
 
@@ -279 +288 @@
         node->child1   = barrier->node[x1][y1][level-1];
 
-        // recursive calls for children nodes
-        sbt_build( barrier , x0 , y0 , level-1 , node );
-        sbt_build( barrier , x1 , y1 , level-1 , node );
-    }
-
 #if GIET_DEBUG_SBT
 giet_shr_printf("[DEBUG SBT] initialize node[%d][%d][%d] :"
@@ -290 +294 @@
                 node->arity, node->child0, node->child1 );
 #endif
+
+        // recursive calls for children nodes
+        sbt_build( barrier , x0 , y0 , level-1 , node );
+        sbt_build( barrier , x1 , y1 , level-1 , node );
+    }
 
 }  // end sbt_build()