Changeset 636 for branches/v4/platforms/tsarv4_mono_mmu_ioc

Timestamp:

Feb 20, 2014, 5:05:48 PM (11 years ago)

Author:

porquet

Message:

use vci_icu and vci_timer instead of vci_xicu

Location:

branches/v4/platforms/tsarv4_mono_mmu_ioc

Files:

• desc.py (modified) (1 diff)
• segmentation.h (modified) (1 diff)
• top.cpp (modified) (13 diffs)

branches/v4/platforms/tsarv4_mono_mmu_ioc/desc.py

@@ -11 +11 @@
             Uses('caba:vci_logger'),
             Uses('caba:vci_multi_tty'),
-            Uses('caba:vci_xicu'),
+            Uses('caba:vci_icu'),
+            Uses('caba:vci_timer'),
             Uses('caba:vci_block_device_tsar_v4'),
             Uses('caba:vci_vgmn'),

branches/v4/platforms/tsarv4_mono_mmu_ioc/segmentation.h

@@ -2 +2 @@
 #define _SEGMENTATION_H
 
-#define MEMC_BASE 0x00000000
-#define MEMC_SIZE 0x10000000 // 256Mb
+#define MEMC_BASE   0x00000000
+#define MEMC_SIZE   0x10000000 // 256Mb
 
-#define BOOT_BASE 0xbfc00000
-#define BOOT_SIZE 0x00040000
+#define BOOT_BASE   0xbfc00000
+#define BOOT_SIZE   0x00040000
 
-#define EXIT_BASE 0x10000000
-#define EXIT_SIZE 0x00000010
+#define ICU_BASE    0x10000000
+#define ICU_SIZE    0x00000014 // 5 mapped-registers
 
-#define MTTY_BASE 0x20000000
-#define MTTY_SIZE 0x00000010
+#define MTTY_BASE   0x14000000
+#define MTTY_SIZE   0x0000000c // 3 mapped-registers
 
-#define XICU_BASE 0x30000000
-#define XICU_SIZE 0x00001000
+#define TIMER_BASE  0x18000000
+#define TIMER_SIZE  0x00000010 // 4 mapped-registers
 
-#define IOBD_BASE 0x40000000
-#define IOBD_SIZE 0x00000020
+#define BD_BASE     0x1c000000
+#define BD_SIZE     0x00000020 // 8 mapped-registers
 
 #endif

branches/v4/platforms/tsarv4_mono_mmu_ioc/top.cpp

@@ -30 +30 @@
 
 #include "vci_simhelper.h"
+#include "vci_icu.h"
 #include "vci_multi_tty.h"
-#include "vci_xicu.h"
+#include "vci_timer.h"
 #include "vci_block_device_tsar_v4.h"
 
@@ -154 +155 @@
             std::cout << "--dsk pathname" << std::endl;
             std::cout << "[--dummy-boot]" << std::endl;
-            std::cout << "[-trace trace_start_cycle]" << std::endl;
+            std::cout << "[--trace trace_start_cycle]" << std::endl;
             exit(0);
         }
@@ -185 +186 @@
 
     /*
-     * mapping table
+     * mapping table (data and coherence)
      */
 
@@ -193 +194 @@
 
     // uncached peripherals
-    maptabd.add(Segment("exit_d" , EXIT_BASE , EXIT_SIZE , IntTab(2), false));
-    maptabd.add(Segment("mtty_d" , MTTY_BASE , MTTY_SIZE , IntTab(3), false));
-    maptabd.add(Segment("xicu_d" , XICU_BASE , XICU_SIZE , IntTab(4), false));
-    maptabd.add(Segment("iobd_d" , IOBD_BASE , IOBD_SIZE , IntTab(5), false));
+    maptabd.add(Segment("icu_d"   , ICU_BASE   , ICU_SIZE   , IntTab(2), false));
+    maptabd.add(Segment("mtty_d"  , MTTY_BASE  , MTTY_SIZE  , IntTab(3), false));
+    maptabd.add(Segment("timer_d" , TIMER_BASE , TIMER_SIZE , IntTab(4), false));
+    maptabd.add(Segment("bd_d"    , BD_BASE    , BD_SIZE    , IntTab(5), false));
 
     std::cout << maptabd << std::endl;
@@ -223 +224 @@
     {
         /* boot linux image directly */
-        const BinaryFileSymbol *bfs = loader.get_symbol_by_name("kernel_entry");
-        std::cout << "setResetAdress: " << std::hex << bfs->address() << std::endl;
-        proc_iss::setResetAddress(bfs->address());
+        uint64_t entry_addr = loader.get_entry_point_address();
+        std::cout << "setResetAdress: " << std::hex << entry_addr << std::endl << std::endl;
+        proc_iss::setResetAddress(entry_addr);
     }
 
@@ -246 +247 @@
                 param.trace_enabled);
 
-    VciSimpleRam<vci_param> xram("xram", IntTab(0), maptabd, loader);
+    VciSimpleRam<vci_param> ram("ram", IntTab(0), maptabd, loader);
 
     VciSimpleRam<vci_param> rom("rom", IntTab(1), maptabd, loader);
@@ -257 +258 @@
             param.trace_start_cycle, param.trace_enabled);
 
-    VciSimhelper<vci_param> vciexit("vciexit", IntTab(2), maptabd);
-
-    VciXicu<vci_param> xicu("xicu", maptabd, IntTab(4),
-            1, 2, 0, 1); // #timers, #hard_irqs, #soft_irqs, # output_irqs
+    VciIcu<vci_param> icu("icu", IntTab(2), maptabd,
+            3); // #input_irqs
 
     VciMultiTty<vci_param> mtty("mtty", IntTab(3), maptabd, "vcitty0", NULL);
 
-    VciBlockDeviceTsarV4<vci_param> iobd("iobd", maptabd, IntTab(1), IntTab(5),
+    VciTimer<vci_param> timer("timer", IntTab(4), maptabd,
+            1); // #timers
+
+    VciBlockDeviceTsarV4<vci_param> bd("bd", maptabd, IntTab(1), IntTab(5),
             param.dsk_path); // mapped_file[, block_size=512, latency=0]
 
-    VciVgmn<vci_param> ringd("ringd", maptabd,
+    VciVgmn<vci_param> vgmnd("vgmnd", maptabd,
             2, 6,       // #initiators, #targets
             2, 8,       // min_latency, FIFO depth
             IntTab(1)); // default target
 
-    VciVgmn<vci_param> ringc("ringc", maptabc,
+    VciVgmn<vci_param> vgmnc("vgmnc", maptabc,
             2, 2,   // #initiators, #targets
             2, 8);  // min_latency, FIFO depth
@@ -288 +290 @@
         alloc_elems<sc_signal<bool> >("signal_proc_irq", proc_iss::n_irq);
     sc_signal<bool> signal_mtty_irq("signal_mtty_irq");
-    sc_signal<bool> signal_iobd_irq("signal_iobd_irq");
+    sc_signal<bool> signal_timer_irq("signal_timer_irq");
+    sc_signal<bool> signal_bd_irq("signal_bd_irq");
 
     /* vci */
@@ -295 +298 @@
     VciSignals<vci_param> signal_vci_tgt_c_proc("vci_tgt_c_proc");
 
-    VciSignals<vci_param> signal_vci_xram("signal_vci_xram");
-
-    VciSignals<vci_param> signal_vci_tgt_d_brom("signal_vci_tgt_d_brom");
+    VciSignals<vci_param> signal_vci_ram("signal_vci_ram");
+
+    VciSignals<vci_param> signal_vci_tgt_d_rom("signal_vci_tgt_d_rom");
 
     VciSignals<vci_param> signal_vci_ini_c_memc("signal_vci_ini_c_memc");
@@ -303 +306 @@
     VciSignals<vci_param> signal_vci_tgt_c_memc("signal_vci_tgt_c_memc");
 
-    VciSignals<vci_param> signal_vci_tgt_d_exit("signal_vci_tgt_d_exit");
-
-    VciSignals<vci_param> signal_vci_tgt_d_xicu("signal_vci_tgt_d_xicu");
+    VciSignals<vci_param> signal_vci_tgt_d_icu("signal_vci_tgt_d_icu");
 
     VciSignals<vci_param> signal_vci_tgt_d_mtty("signal_vci_tgt_d_mtty");
 
-    VciSignals<vci_param> signal_vci_ini_d_iobd("signal_vci_ini_d_iobd");
-    VciSignals<vci_param> signal_vci_tgt_d_iobd("signal_vci_tgt_d_iobd");
+    VciSignals<vci_param> signal_vci_tgt_d_timer("signal_vci_tgt_d_timer");
+
+    VciSignals<vci_param> signal_vci_ini_d_bd("signal_vci_ini_d_bd");
+    VciSignals<vci_param> signal_vci_tgt_d_bd("signal_vci_tgt_d_bd");
 
     /*
@@ -324 +327 @@
     proc.p_vci_tgt_c(signal_vci_tgt_c_proc);
 
-    xram.p_clk(signal_clk);
-    xram.p_resetn(signal_resetn);
-    xram.p_vci(signal_vci_xram);
+    ram.p_clk(signal_clk);
+    ram.p_resetn(signal_resetn);
+    ram.p_vci(signal_vci_ram);
 
     rom.p_clk(signal_clk);
     rom.p_resetn(signal_resetn);
-    rom.p_vci(signal_vci_tgt_d_brom);
+    rom.p_vci(signal_vci_tgt_d_rom);
 
     memc.p_clk(signal_clk);
@@ -337 +340 @@
     memc.p_vci_tgt_cleanup(signal_vci_tgt_c_memc);
     memc.p_vci_ini(signal_vci_ini_c_memc);
-    memc.p_vci_ixr(signal_vci_xram);
-
-    vciexit.p_clk(signal_clk);
-    vciexit.p_resetn(signal_resetn);
-    vciexit.p_vci(signal_vci_tgt_d_exit);
-
-    xicu.p_resetn(signal_resetn);
-    xicu.p_clk(signal_clk);
-    xicu.p_vci(signal_vci_tgt_d_xicu);
-    xicu.p_hwi[0](signal_mtty_irq);
-    xicu.p_hwi[1](signal_iobd_irq);
-    xicu.p_irq[0](signal_proc_irq[0]);
+    memc.p_vci_ixr(signal_vci_ram);
+
+    icu.p_resetn(signal_resetn);
+    icu.p_clk(signal_clk);
+    icu.p_vci(signal_vci_tgt_d_icu);
+    icu.p_irq_in[0](signal_mtty_irq);
+    icu.p_irq_in[1](signal_timer_irq);
+    icu.p_irq_in[2](signal_bd_irq);
+    icu.p_irq(signal_proc_irq[0]);
 
     mtty.p_clk(signal_clk);
@@ -355 +355 @@
     mtty.p_irq[0](signal_mtty_irq);
 
-    iobd.p_clk(signal_clk);
-    iobd.p_resetn(signal_resetn);
-    iobd.p_vci_target(signal_vci_tgt_d_iobd);
-    iobd.p_vci_initiator(signal_vci_ini_d_iobd);
-    iobd.p_irq(signal_iobd_irq);
-
-    ringd.p_clk(signal_clk);
-    ringd.p_resetn(signal_resetn);
-    ringd.p_to_initiator[0](signal_vci_ini_d_proc);
-    ringd.p_to_initiator[1](signal_vci_ini_d_iobd);
-    ringd.p_to_target[0](signal_vci_tgt_d_memc);
-    ringd.p_to_target[1](signal_vci_tgt_d_brom);
-    ringd.p_to_target[2](signal_vci_tgt_d_exit);
-    ringd.p_to_target[3](signal_vci_tgt_d_mtty);
-    ringd.p_to_target[4](signal_vci_tgt_d_xicu);
-    ringd.p_to_target[5](signal_vci_tgt_d_iobd);
-
-    ringc.p_clk(signal_clk);
-    ringc.p_resetn(signal_resetn);
-    ringc.p_to_initiator[0](signal_vci_ini_c_proc);
-    ringc.p_to_initiator[1](signal_vci_ini_c_memc);
-    ringc.p_to_target[0](signal_vci_tgt_c_proc);
-    ringc.p_to_target[1](signal_vci_tgt_c_memc);
+    timer.p_clk(signal_clk);
+    timer.p_resetn(signal_resetn);
+    timer.p_vci(signal_vci_tgt_d_timer);
+    timer.p_irq[0](signal_timer_irq);
+
+    bd.p_clk(signal_clk);
+    bd.p_resetn(signal_resetn);
+    bd.p_vci_target(signal_vci_tgt_d_bd);
+    bd.p_vci_initiator(signal_vci_ini_d_bd);
+    bd.p_irq(signal_bd_irq);
+
+    vgmnd.p_clk(signal_clk);
+    vgmnd.p_resetn(signal_resetn);
+    vgmnd.p_to_initiator[0](signal_vci_ini_d_proc);
+    vgmnd.p_to_initiator[1](signal_vci_ini_d_bd);
+    vgmnd.p_to_target[0](signal_vci_tgt_d_memc);
+    vgmnd.p_to_target[1](signal_vci_tgt_d_rom);
+    vgmnd.p_to_target[2](signal_vci_tgt_d_icu);
+    vgmnd.p_to_target[3](signal_vci_tgt_d_mtty);
+    vgmnd.p_to_target[4](signal_vci_tgt_d_timer);
+    vgmnd.p_to_target[5](signal_vci_tgt_d_bd);
+
+    vgmnc.p_clk(signal_clk);
+    vgmnc.p_resetn(signal_resetn);
+    vgmnc.p_to_initiator[0](signal_vci_ini_c_proc);
+    vgmnc.p_to_initiator[1](signal_vci_ini_c_memc);
+    vgmnc.p_to_target[0](signal_vci_tgt_c_proc);
+    vgmnc.p_to_target[1](signal_vci_tgt_c_memc);
 
     /*