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

Timestamp:

Jan 20, 2015, 4:06:49 PM (9 years ago)

Author:

cfuguet

Message:

reconf: add external ROM in platform

• The external ROM, which can be accessed through both IO Bridges, contains the bootloader program and some other utility functions which are used once the reconfiguration is performed.

File:

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

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -133 +133 @@
 #include "vci_framebuffer.h"
 #include "vci_iox_network.h"
-#include "vci_iox_network.h"
 #include "vci_iopic.h"
 #include "vci_simhelper.h"
@@ -213 +212 @@
 
 #define cluster(x, y)   ((y) + ((x) << Y_WIDTH))
-
-////////////////////////////////////////////////////////////
-//    Software to be loaded in ROM & RAM
-//////////////////////i/////////////////////////////////////
-
-#define BOOT_SOFT_NAME        "../../softs/tsar_boot/preloader.elf"
 
 ////////////////////////////////////////////////////////////
@@ -272 +265 @@
 #define INT_XICU_TGT_ID              1
 #define INT_MDMA_TGT_ID              2
-#define INT_BROM_TGT_ID              3
+#define INT_DROM_TGT_ID              3
 #define INT_IOBX_TGT_ID              4
 
@@ -299 +292 @@
 #define IOX_IOPI_TGT_ID              5
 #define IOX_SIMH_TGT_ID              6
-#define IOX_IOB0_TGT_ID              7
-#define IOX_IOB1_TGT_ID              8
+#define IOX_ROM_TGT_ID               7
+#define IOX_IOB0_TGT_ID              8
+#define IOX_IOB1_TGT_ID              9
 
 #define IOX_BDEV_INI_ID              0
@@ -317 +311 @@
 
 
-   char     soft_name[256]   = BOOT_SOFT_NAME;    // pathname: binary code
+   char     dsoft_name[256]  = "";                // pathname: binary code
+   char     soft_name[256]   = "";                // pathname: binary code
    size_t   ncycles          = UINT_MAX;          // simulated cycles
    char     disk_name[256]   = BDEV_IMAGE_NAME;   // pathname: disk image
@@ -348 +343 @@
          {
             strcpy(soft_name, argv[n+1]);
+         }
+         else if ((strcmp(argv[n], "-DSOFT") == 0) && (n+1<argc) )
+         {
+            strcpy(dsoft_name, argv[n+1]);
          }
          else if ((strcmp(argv[n], "-DEBUG") == 0) && (n+1<argc) )
@@ -444 +443 @@
             std::cout << "   Accepted arguments are :" << std::endl << std::endl;
             std::cout << "     -SOFT pathname_for_embedded_soft" << std::endl;
+            std::cout << "     -DSOFT pathname_for_distributed_embedded_soft" << std::endl;
             std::cout << "     -DISK pathname_for_disk_image" << std::endl;
             std::cout << "     -NCYCLES number_of_simulated_cycles" << std::endl;
@@ -580 +580 @@
                      IntTab(cluster(x, y), INT_MDMA_TGT_ID), not cacheable));
 
-         std::ostringstream    sbrom;
-         sbrom << "int_seg_brom_" << x << "_" << y;
-         maptab_int.add(Segment(sbrom.str(), SEG_ROM_BASE+offset, SEG_ROM_SIZE,
-                     IntTab(cluster(x, y), INT_BROM_TGT_ID), cacheable));
+         std::ostringstream    sdrom;
+         sdrom << "int_seg_drom_" << x << "_" << y;
+         maptab_int.add(Segment(sdrom.str(), SEG_DROM_BASE+offset, SEG_DROM_SIZE,
+                     IntTab(cluster(x, y), INT_DROM_TGT_ID), cacheable));
 
          // the following segments are only defined in cluster_iob0 or in cluster_iob1
@@ -628 +628 @@
             maptab_int.add(Segment(ssim.str(), SEG_SIM_BASE+offset, SEG_SIM_SIZE,
                         IntTab(cluster(x, y), INT_IOBX_TGT_ID), not cacheable));
+
+            std::ostringstream    srom;
+            srom << "int_seg_rom_" << x << "_" << y;
+            maptab_int.add(Segment(srom.str(), SEG_ROM_BASE+offset, SEG_ROM_SIZE,
+                        IntTab(cluster(x, y), INT_IOBX_TGT_ID), cacheable));
          }
 
@@ -711 +716 @@
     // - two levels srcid decoding for responses
     // - 5 initiators (IOB0, IOB1, BDEV, CDMA, IOPI)
-    // - 9 targets (IOB0, IOB1, BDEV, CDMA, MTTY, FBUF, BROM, MNIC, IOPI)
+    // - 9 targets (IOB0, IOB1, BDEV, CDMA, MTTY, FBUF, ROM, MNIC, IOPI)
     //
     // Address bit 32 is used to determine if a command must be routed to
@@ -743 +748 @@
     maptab_iox.add(Segment("iox_seg_simh_0", SEG_SIM_BASE + iob0_base, SEG_SIM_SIZE,
                    IntTab(0, IOX_SIMH_TGT_ID), false));
+    maptab_iox.add(Segment("iox_seg_rom_0", SEG_ROM_BASE + iob0_base, SEG_ROM_SIZE,
+                   IntTab(0, IOX_ROM_TGT_ID), false));
 
     if ( cluster_iob0 != cluster_iob1 )
@@ -763 +770 @@
         maptab_iox.add(Segment("iox_seg_simh_1", SEG_SIM_BASE + iob1_base, SEG_SIM_SIZE,
                    IntTab(0, IOX_SIMH_TGT_ID), false));
+        maptab_iox.add(Segment("iox_seg_rom_1", SEG_ROM_BASE + iob1_base, SEG_ROM_SIZE,
+                   IntTab(0, IOX_ROM_TGT_ID), false));
     }
 
@@ -858 +867 @@
     VciSignals<vci_param_ext>         signal_vci_tgt_iopi("signal_vci_ini_iopi");
     VciSignals<vci_param_ext>         signal_vci_tgt_simh("signal_vci_ini_simh");
+    VciSignals<vci_param_ext>         signal_vci_tgt_rom("signal_vci_ini_rom");
 
    // Horizontal inter-clusters INT network DSPIN
@@ -929 +939 @@
                                  almos_kernel_pathname);
 #else
-   soclib::common::Loader loader(soft_name);
+   soclib::common::Loader loader(soft_name, dsoft_name);
 #endif
 
@@ -946 +956 @@
 
    const size_t nb_iox_initiators = (cluster_iob0 != cluster_iob1) ? 5 : 4;
-   const size_t nb_iox_targets = (cluster_iob0 != cluster_iob1) ? 9 : 8;
+   const size_t nb_iox_targets = (cluster_iob0 != cluster_iob1) ? 10 : 9;
 
    // IOX network
@@ -1022 +1032 @@
                                           maptab_iox );
 
+   // External ROM
+   VciSimpleRom<vci_param_ext>* rom;
+   rom = new VciSimpleRom<vci_param_ext>("rom",
+                                          IntTab(0, IOX_ROM_TGT_ID),
+                                          maptab_iox,
+                                          loader,
+                                          X_WIDTH + Y_WIDTH );
+
    // Clusters
    TsarIobCluster<vci_param_int,
@@ -1089 +1107 @@
                 INT_XICU_TGT_ID,
                 INT_MDMA_TGT_ID,
-                INT_BROM_TGT_ID,
+                INT_DROM_TGT_ID,
                 INT_IOBX_TGT_ID,
 
@@ -1202 +1220 @@
     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);
+    iox_network->p_to_tgt[IOX_ROM_TGT_ID]                (signal_vci_tgt_rom);
 
     if (cluster_iob0 != cluster_iob1)
@@ -1285 +1304 @@
     simh->p_vci(signal_vci_tgt_simh);
 
+    // External ROM connexion
+    rom->p_clk(signal_clk);
+    rom->p_resetn(signal_resetn);
+    rom->p_vci(signal_vci_tgt_rom);
+
     // IOB0 cluster connexion to IOX network
     (*clusters[0][0]->p_vci_iob_iox_ini) (signal_vci_ini_iob0);