Changeset 624

Timestamp:

Jan 30, 2014, 5:36:02 PM (11 years ago)

Author:

cfuguet

Message:

Modification in tsar_generic_xbar platform:

• Using the constant IRQ_PER_PROCESSOR on the hard_config.h file to specify more than one irq from the XICU to each processor.

Location:

trunk/platforms/tsar_generic_xbar

Files:

• Makefile (modified) (1 diff)
• tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h (modified) (2 diffs)
• tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp (modified) (3 diffs)

trunk/platforms/tsar_generic_xbar/Makefile

@@ -5 +5 @@
         soclib-cc -x -p top.desc -I.
         rm -rf *.o *.x term*
+
+.PHONY: simul.x

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/include/tsar_xbar_cluster.h

@@ -36 +36 @@
 #include "vci_cc_vcache_wrapper.h"
 #include "vci_simhelper.h"
+#include "../../../../giet_vm/hard_config.h"
 
 namespace soclib { namespace caba {
@@ -62 +63 @@
     // interrupt signals
     sc_signal<bool>         signal_false;
-    sc_signal<bool>         signal_proc_it[8];
+    sc_signal<bool>         signal_proc_it[8*IRQ_PER_PROCESSOR];
     sc_signal<bool>         signal_irq_mdma[8];
     sc_signal<bool>         signal_irq_mtty[23];

trunk/platforms/tsar_generic_xbar/tsar_xbar_cluster/caba/source/src/tsar_xbar_cluster.cpp

@@ -185 +185 @@
                      32,                                // number of hard IRQs
                      32,                                // number of soft IRQs
-                     nb_procs);                         // number of output IRQs
+                     nb_procs*IRQ_PER_PROCESSOR);       // number of output IRQs
 
     wt_xicu = new VciDspinTargetWrapper<vci_param_int,
@@ -571 +571 @@
         proc[p]->p_dspin_p2m                (signal_dspin_p2m_proc[p]);
         proc[p]->p_dspin_clack              (signal_dspin_clack_proc[p]);
-        proc[p]->p_irq[0]                   (signal_proc_it[p]);
-        for ( size_t j = 1 ; j < 6 ; j++)
+
+        for ( size_t i = 0 ; i < IRQ_PER_PROCESSOR ; i++)
+        {
+            proc[p]->p_irq[i]               (signal_proc_it[p*IRQ_PER_PROCESSOR+i]);
+        }
+        for ( size_t j = IRQ_PER_PROCESSOR ; j < 6 ; j++)
         {
             proc[p]->p_irq[j]               (signal_false);
@@ -590 +594 @@
     xicu->p_resetn                     (this->p_resetn);
     xicu->p_vci                        (signal_vci_tgt_xicu);
-    for (size_t p = 0; p < nb_procs; p++)
-    {
-        xicu->p_irq[p]                 (signal_proc_it[p]);
-    }
-
+
+    for (size_t i = 0; i < nb_procs*IRQ_PER_PROCESSOR; i++)
+    {
+        xicu->p_irq[i]                       (signal_proc_it[i]);
+    }
     for (size_t i = 0; i < 32; i++)
     {