Changeset 428 for soft/giet_vm/giet_kernel/irq_handler.c

Timestamp:

Oct 4, 2014, 3:19:32 PM (10 years ago)

Author:

alain

Message:

Introducing fixed format (X_WIDTH / Y_WIDTH / P_WIDTH) for processor index.

File:

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

soft/giet_vm/giet_kernel/irq_handler.c

@@ -51 +51 @@
 {
     unsigned int gpid           = _get_procid();
-    unsigned int cluster_xy     = gpid / NB_PROCS_MAX;
+    unsigned int cluster_xy     = gpid >> P_WIDTH;
     unsigned int x              = cluster_xy >> Y_WIDTH;
     unsigned int y              = cluster_xy & ((1<<Y_WIDTH)-1);
-    unsigned int lpid           = gpid % NB_PROCS_MAX;
+    unsigned int lpid           = gpid & ((1<<P_WIDTH)-1);
     unsigned int irq_id;
     unsigned int irq_type;
@@ -144 +144 @@
 {
     unsigned int gpid       = _get_procid();
-    unsigned int cluster_xy = gpid / NB_PROCS_MAX;
+    unsigned int cluster_xy = gpid >> P_WIDTH;
     unsigned int x          = cluster_xy >> Y_WIDTH;
     unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
-    unsigned int lpid       = gpid % NB_PROCS_MAX;
+    unsigned int lpid       = gpid & ((1<<P_WIDTH)-1);
 
     _printf("\n[GIET WARNING] IRQ handler called but no active IRQ "
@@ -164 +164 @@
                  unsigned int channel )   // unused
 {
-    unsigned int procid     = _get_procid();
-    unsigned int cluster_xy = procid / NB_PROCS_MAX;
+    unsigned int gpid       = _get_procid();
+    unsigned int cluster_xy = gpid >> P_WIDTH;
     unsigned int x          = cluster_xy >> Y_WIDTH;
     unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
-    unsigned int lpid       = procid % NB_PROCS_MAX;
+    unsigned int lpid       = gpid & ((1<<P_WIDTH)-1);
+
     unsigned int task       = _get_current_task_id();
     unsigned int value;
@@ -219 +220 @@
                 unsigned int channel )   // channel index if HWI
 {
-    unsigned int procid     = _get_procid();
-    unsigned int cluster_xy = procid / NB_PROCS_MAX;
+    unsigned int gpid       = _get_procid();
+    unsigned int cluster_xy = gpid >> P_WIDTH;
 
     // acknowledge HWI or PTI
@@ -229 +230 @@
 unsigned int x          = cluster_xy >> Y_WIDTH;
 unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
-unsigned int lpid       = procid % NB_PROCS_MAX;
+unsigned int lpid       = gpid & ((1<<P_WIDTH)-1);
 _puts("\n[IRQS DEBUG] Processor[");
 _putd( x );