Changeset 322 for soft/giet_vm/giet_kernel/kernel_init.c

Timestamp:

Jun 10, 2014, 1:28:14 PM (10 years ago)

Author:

alain

Message:

Various small modifs to comply with the genmap tool.

File:

• soft/giet_vm/giet_kernel/kernel_init.c (modified) (5 diffs)

soft/giet_vm/giet_kernel/kernel_init.c

@@ -71 +71 @@
 #include <mips32_registers.h>
 
+#if !defined(X_SIZE) 
+# error: You must define X_SIZE in the hard_config.h file
+#endif
+
+#if !defined(Y_SIZE) 
+# error: You must define Y_SIZE in the hard_config.h file
+#endif
+
+#if !defined(Y_WIDTH) 
+# error: You must define Y_WIDTH in the hard_config.h file
+#endif
+
+#if !defined(Y_WIDTH) 
+# error: You must define Y_WIDTH in the hard_config.h file
+#endif
+
+#if !defined(NB_PROCS_MAX)
+# error: You must define NB_PROCS_MAX in the hard_config.h file
+#endif
+
+#if !defined(NB_TOTAL_PROCS)
+# error: You must define NB_TOTAL_PROCS in the hard_config.h file
+#endif
+
+#if !defined(USE_XCU) 
+# error: You must define USE_XCU in the hard_config.h file
+#endif
+
+#if !defined(IDLE_TASK_INDEX) 
+# error: You must define IDLE_TASK_INDEX in the giet_config.h file
+#endif
+
+#if !defined(GIET_TICK_VALUE) 
+# error: You must define GIET_TICK_VALUE in the giet_config.h file
+#endif
+
+#if !defined(GIET_NB_VSPACE_MAX)
+# error: You must define GIET_NB_VSPACE_MAX in the giet_config.h file
+#endif
+
 ///////////////////////////////////////////////////////////////////////////////////
 // array of pointers on the page tables (virtual addresses)
@@ -110 +150 @@
     unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
     unsigned int lpid       = global_pid % NB_PROCS_MAX;
-    unsigned int nprocs     = TOTAL_PROCS;
     unsigned int pid        = ((( x * Y_SIZE) + y) * NB_PROCS_MAX) + lpid;
 //  unsigned int pid        = _get_id(i n_procs );
@@ -217 +256 @@
     unsigned int channel = lpid * IRQ_PER_PROCESSOR; 
 
-#if USE_XICU
+#if USE_XCU
     _xcu_set_mask( cluster_xy, channel, hwi_mask, IRQ_TYPE_HWI ); 
     _xcu_set_mask( cluster_xy, channel, wti_mask, IRQ_TYPE_WTI );
@@ -238 +277 @@
         // start system timer
 
-#if USE_XICU
+#if USE_XCU
         _xcu_timer_start( cluster_xy, isr_switch_index, GIET_TICK_VALUE ); 
 #else
@@ -296 +335 @@
             x, y, lpid, _get_proctime() );
 
-/*
-    unsigned int*  pcount = &_init_barrier;
-    unsigned int   count;
-
-    // increment barrier counter with atomic LL/SC
-    asm volatile ( "_init_barrier_loop:             \n"
-                   "ll    %0,   0(%1)               \n"
-                   "addi  $3,   %0,   1             \n"
-                   "sc    $3,   0(%1)               \n"
-                   "beqz  $3,   _init_barrier_loop  \n"
-                   "nop                             \n" 
-                   : "=&r"(count)
-                   : "r"(pcount) 
-                   : "$3" );
-   
-    // busy waiting until all processors synchronized
-    while ( *pcount != nprocs ) asm volatile ("nop");
-*/
-
     // increment barrier counter 
     _init_barrier++;
 
     // busy waiting until all processors synchronized
-    while ( _init_barrier != nprocs ) asm volatile ("nop");
-
-/*
-    _printf("\n[GIET] Processor[%d,%d,%d] jumps to user code at cycle %d\n",
-            x, y, lpid, _get_proctime() );
-*/
-        
+    while ( _init_barrier != NB_TOTAL_PROCS ) asm volatile ("nop");
+
     // set registers and jump to user code
     asm volatile ( "move  $29,  %0                  \n"   /* SP <= ctx[CTX_SP_ID] */