Changeset 769 for branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

Timestamp:

Aug 26, 2014, 3:08:14 PM (10 years ago)

Author:

cfuguet

Message:

reconfiguration/tsar_generic_iob: introducing simhelper component

File:

• branches/reconfiguration/platforms/tsar_generic_iob/top.cpp (modified) (12 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -134 +134 @@
 #include "vci_iox_network.h"
 #include "vci_iopic.h"
+#include "vci_simhelper.h"
 
 #include "alloc_elems.h"
@@ -303 +304 @@
 #define IOX_MTTY_TGT_ID              4
 #define IOX_IOPI_TGT_ID              5
-#define IOX_IOB0_TGT_ID              6
-#define IOX_IOB1_TGT_ID              7
+#define IOX_SIMH_TGT_ID              6
+#define IOX_IOB0_TGT_ID              7
+#define IOX_IOB1_TGT_ID              8
 
 #define IOX_BDEV_INI_ID              0
@@ -597 +599 @@
             maptab_int.add(Segment(spic.str(), SEG_PIC_BASE+offset, SEG_PIC_SIZE,
                         IntTab(cluster(x,y), INT_IOBX_TGT_ID), not cacheable));
+
+            std::ostringstream    ssim;
+            ssim << "int_seg_simh_" << x << "_" << y;
+            maptab_int.add(Segment(ssim.str(), SEG_SIM_BASE+offset, SEG_SIM_SIZE,
+                        IntTab(cluster(x,y), INT_IOBX_TGT_ID), not cacheable));
          }
 
@@ -710 +717 @@
     maptab_iox.add(Segment("iox_seg_iopi_0", SEG_PIC_BASE + iob0_base, SEG_PIC_SIZE,
                    IntTab(0, IOX_IOPI_TGT_ID), false));
+    maptab_iox.add(Segment("iox_seg_simh_0", SEG_SIM_BASE + iob0_base, SEG_SIM_SIZE,
+                   IntTab(0, IOX_SIMH_TGT_ID), false));
 
     if ( cluster_iob0 != cluster_iob1 )
@@ -728 +737 @@
         maptab_iox.add(Segment("iox_seg_iopi_1", SEG_PIC_BASE + iob1_base, SEG_PIC_SIZE,
                    IntTab(0, IOX_IOPI_TGT_ID), false));
+        maptab_iox.add(Segment("iox_seg_simh_1", SEG_SIM_BASE + iob1_base, SEG_SIM_SIZE,
+                   IntTab(0, IOX_SIMH_TGT_ID), false));
     }
 
@@ -822 +833 @@
     VciSignals<vci_param_ext>         signal_vci_tgt_cdma("signal_vci_tgt_cdma");
     VciSignals<vci_param_ext>         signal_vci_tgt_iopi("signal_vci_ini_iopi");
+    VciSignals<vci_param_ext>         signal_vci_tgt_simh("signal_vci_ini_simh");
 
    // Horizontal inter-clusters INT network DSPIN
@@ -910 +922 @@
 
    const size_t nb_iox_initiators = (cluster_iob0 != cluster_iob1) ? 5 : 4;
-   const size_t nb_iox_targets = (cluster_iob0 != cluster_iob1) ? 8 : 7;
+   const size_t nb_iox_targets = (cluster_iob0 != cluster_iob1) ? 9 : 8;
 
    // IOX network
@@ -981 +993 @@
                                        32 );        // number of input HWI
 
+   // Simhelper
+   VciSimhelper<vci_param_ext>* simh;
+   simh = new VciSimhelper<vci_param_ext>("simh",
+                                          IntTab(0, IOX_SIMH_TGT_ID),
+                                          maptab_iox );
+
    // Clusters
    TsarIobCluster<vci_param_int,
@@ -1111 +1129 @@
     iox_network->p_to_tgt[IOX_CDMA_TGT_ID]               (signal_vci_tgt_cdma);
     iox_network->p_to_tgt[IOX_IOPI_TGT_ID]               (signal_vci_tgt_iopi);
+    iox_network->p_to_tgt[IOX_SIMH_TGT_ID]               (signal_vci_tgt_simh);
 
     if (cluster_iob0 != cluster_iob1)
@@ -1186 +1205 @@
     std::cout << "  - IOPIC connected" << std::endl;
 
+    // Simhelper connexion
+    simh->p_clk(signal_clk);
+    simh->p_resetn(signal_resetn);
+    simh->p_vci(signal_vci_tgt_simh);
 
     // IOB0 cluster connexion to IOX network
@@ -1532 +1555 @@
             signal_vci_ini_iopi.print_trace("[SIG]IOPI_INI");
             signal_vci_tgt_iopi.print_trace("[SIG]IOPI_TGT");
+
+            signal_vci_tgt_simh.print_trace("[SIG]SIMH_TGT");
+
             iox_network->print_trace();
 
@@ -1553 +1579 @@
    try {
       return _main(argc, argv);
+   } catch (soclib::exception::RunTimeError &e) {
+      std::cout << "RunTimeError: " << e.what() << std::endl;
    } catch (std::exception &e) {
       std::cout << e.what() << std::endl;