Index: /trunk/platforms/caba-xxx-ccxcachemulti-mipsel/top.cpp =================================================================== --- /trunk/platforms/caba-xxx-ccxcachemulti-mipsel/top.cpp (revision 45) +++ /trunk/platforms/caba-xxx-ccxcachemulti-mipsel/top.cpp (revision 46) @@ -44,5 +44,5 @@ maptabp.add(Segment("mc_r" , MC_R_BASE , MC_R_SIZE , IntTab(2), false, true, IntTab(0))); maptabp.add(Segment("mc_m" , MC_M_BASE , MC_M_SIZE , IntTab(2), true )); - maptabp.add(Segment("ptba" , PTD_ADDR , TAB_SIZE , IntTab(2), true)); + maptabp.add(Segment("ptba" , PTD_ADDR , TAB_SIZE , IntTab(2), true)); std::cout << maptabp << std::endl; @@ -105,17 +105,17 @@ soclib::caba::VciSignals signal_vci_ini_d_proc0("vci_ini_d_proc0"); soclib::caba::VciSignals signal_vci_ini_c_proc0("vci_ini_c_proc0"); - soclib::caba::VciSignals signal_vci_tgt_proc0("vci_tgt_proc0"); + soclib::caba::VciSignals signal_vci_tgt_c_proc0("vci_tgt_proc0"); soclib::caba::VciSignals signal_vci_ini_d_proc1("vci_ini_d_proc1"); soclib::caba::VciSignals signal_vci_ini_c_proc1("vci_ini_c_proc1"); - soclib::caba::VciSignals signal_vci_tgt_proc1("vci_tgt_proc1"); + soclib::caba::VciSignals signal_vci_tgt_c_proc1("vci_tgt_proc1"); soclib::caba::VciSignals signal_vci_ini_d_proc2("vci_ini_d_proc2"); soclib::caba::VciSignals signal_vci_ini_c_proc2("vci_ini_c_proc2"); - soclib::caba::VciSignals signal_vci_tgt_proc2("vci_tgt_proc2"); + soclib::caba::VciSignals signal_vci_tgt_c_proc2("vci_tgt_proc2"); soclib::caba::VciSignals signal_vci_ini_d_proc3("vci_ini_d_proc3"); soclib::caba::VciSignals signal_vci_ini_c_proc3("vci_ini_c_proc3"); - soclib::caba::VciSignals signal_vci_tgt_proc3("vci_tgt_proc3"); + soclib::caba::VciSignals signal_vci_tgt_c_proc3("vci_tgt_proc3"); soclib::caba::VciSignals signal_vci_tgt_tty("vci_tgt_tty"); @@ -127,6 +127,6 @@ soclib::caba::VciSignals signal_vci_ixr_memc("vci_ixr_memc"); soclib::caba::VciSignals signal_vci_ini_memc("vci_ini_memc"); - soclib::caba::VciSignals signal_vci_tgt_memc("vci_tgt_memc"); - soclib::caba::VciSignals signal_vci_tgt_cleanup_memc("vci_tgt_cleanup_memc"); + soclib::caba::VciSignals signal_vci_tgt_d_memc("vci_tgt_memc"); + soclib::caba::VciSignals signal_vci_tgt_c_memc("vci_tgt_cleanup_memc"); sc_signal signal_tty_irq0("signal_tty_irq0"); @@ -141,14 +141,14 @@ // Components soclib::caba::VciCcXCacheWrapperMulti - proc0("proc0", 0, maptabp, maptabc, IntTab(0),IntTab(0),IntTab(0),1,8,16,1,8,16,4,8); + proc0("proc0", 0, maptabp, maptabc, IntTab(0),IntTab(0),IntTab(0),1,8,16,1,8,16,4,8,16); soclib::caba::VciCcXCacheWrapperMulti - proc1("proc1", 1, maptabp, maptabc, IntTab(1),IntTab(1),IntTab(1),1,8,16,1,8,16,4,8); + proc1("proc1", 1, maptabp, maptabc, IntTab(1),IntTab(1),IntTab(1),1,8,16,1,8,16,4,8,16); soclib::caba::VciCcXCacheWrapperMulti - proc2("proc2", 2, maptabp, maptabc, IntTab(2),IntTab(2),IntTab(2),1,8,16,1,8,16,4,8); + proc2("proc2", 2, maptabp, maptabc, IntTab(2),IntTab(2),IntTab(2),1,8,16,1,8,16,4,8,16); soclib::caba::VciCcXCacheWrapperMulti - proc3("proc3", 3, maptabp, maptabc, IntTab(3),IntTab(3),IntTab(3),1,8,16,1,8,16,4,8); + proc3("proc3", 3, maptabp, maptabc, IntTab(3),IntTab(3),IntTab(3),1,8,16,1,8,16,4,8,16); soclib::caba::VciSimpleRam @@ -203,5 +203,5 @@ proc0.p_vci_ini_d(signal_vci_ini_d_proc0); proc0.p_vci_ini_c(signal_vci_ini_c_proc0); - proc0.p_vci_tgt_c(signal_vci_tgt_proc0); + proc0.p_vci_tgt_c(signal_vci_tgt_c_proc0); proc1.p_clk(signal_clk); @@ -215,5 +215,5 @@ proc1.p_vci_ini_d(signal_vci_ini_d_proc1); proc1.p_vci_ini_c(signal_vci_ini_c_proc1); - proc1.p_vci_tgt_c(signal_vci_tgt_proc1); + proc1.p_vci_tgt_c(signal_vci_tgt_c_proc1); proc2.p_clk(signal_clk); @@ -227,5 +227,5 @@ proc2.p_vci_ini_d(signal_vci_ini_d_proc2); proc2.p_vci_ini_c(signal_vci_ini_c_proc2); - proc2.p_vci_tgt_c(signal_vci_tgt_proc2); + proc2.p_vci_tgt_c(signal_vci_tgt_c_proc2); proc3.p_clk(signal_clk); @@ -239,29 +239,9 @@ proc3.p_vci_ini_d(signal_vci_ini_d_proc3); proc3.p_vci_ini_c(signal_vci_ini_c_proc3); - proc3.p_vci_tgt_c(signal_vci_tgt_proc3); + proc3.p_vci_tgt_c(signal_vci_tgt_c_proc3); rom.p_clk(signal_clk); rom.p_resetn(signal_resetn); rom.p_vci(signal_vci_tgt_rom); - -// vci_logger_proc0.p_clk(signal_clk); -// vci_logger_proc0.p_resetn(signal_resetn); -// vci_logger_proc0.p_vci(signal_vci_ini_d_proc0); - -// vci_logger_proc1.p_clk(signal_clk); -// vci_logger_proc1.p_resetn(signal_resetn); -// vci_logger_proc1.p_vci(signal_vci_ini_d_proc2); - -// vci_logger_proc2.p_clk(signal_clk); -// vci_logger_proc2.p_resetn(signal_resetn); -// vci_logger_proc2.p_vci(signal_vci_ini_d_proc2); - -// vci_logger_proc3.p_clk(signal_clk); -// vci_logger_proc3.p_resetn(signal_resetn); -// vci_logger_proc3.p_vci(signal_vci_ini_d_proc3); - -// vci_logger_memc.p_clk(signal_clk); -// vci_logger_memc.p_resetn(signal_resetn); -// vci_logger_memc.p_vci(signal_vci_tgt_memc); tty.p_clk(signal_clk); @@ -275,6 +255,6 @@ memc.p_clk(signal_clk); memc.p_resetn(signal_resetn); - memc.p_vci_tgt(signal_vci_tgt_memc); - memc.p_vci_tgt_cleanup(signal_vci_tgt_cleanup_memc); + memc.p_vci_tgt(signal_vci_tgt_d_memc); + memc.p_vci_tgt_cleanup(signal_vci_tgt_c_memc); memc.p_vci_ini(signal_vci_ini_memc); memc.p_vci_ixr(signal_vci_ixr_memc); @@ -292,5 +272,5 @@ ringd.p_to_target[0](signal_vci_tgt_rom); ringd.p_to_target[1](signal_vci_tgt_tty); - ringd.p_to_target[2](signal_vci_tgt_memc); + ringd.p_to_target[2](signal_vci_tgt_d_memc); ringc.p_clk(signal_clk); @@ -301,9 +281,9 @@ ringc.p_to_initiator[3](signal_vci_ini_c_proc3); ringc.p_to_initiator[4](signal_vci_ini_memc); - ringc.p_to_target[0](signal_vci_tgt_proc0); - ringc.p_to_target[1](signal_vci_tgt_proc1); - ringc.p_to_target[2](signal_vci_tgt_proc2); - ringc.p_to_target[3](signal_vci_tgt_proc3); - ringc.p_to_target[4](signal_vci_tgt_cleanup_memc); + ringc.p_to_target[0](signal_vci_tgt_c_proc0); + ringc.p_to_target[1](signal_vci_tgt_c_proc1); + ringc.p_to_target[2](signal_vci_tgt_c_proc2); + ringc.p_to_target[3](signal_vci_tgt_c_proc3); + ringc.p_to_target[4](signal_vci_tgt_c_memc); ringx.p_clk(signal_clk); @@ -312,16 +292,8 @@ ringx.p_to_target[0](signal_vci_tgt_xram); - int ncycles; - -#ifndef SOCVIEW + int ncycles = 1000000000; + if (argc == 2) { ncycles = std::atoi(argv[1]); - } else { - std::cerr - << std::endl - << "The number of simulation cycles must " - "be defined in the command line" - << std::endl; - exit(1); } @@ -335,30 +307,48 @@ for (int i = 0; i < ncycles ; i++) { - sc_start(sc_core::sc_time(1, SC_NS)); if ( i%10000 == 0 ) { - proc0.print_stats(); - proc1.print_stats(); - proc2.print_stats(); - proc3.print_stats(); + proc0.printStatistics(); + proc1.printStatistics(); + proc2.printStatistics(); + proc3.printStatistics(); memc.print_stats(); } +/* + + std::cout << "***************************************** cycle = " << std::dec << i + << " *************************************************" << std::endl; + proc0.printTrace(0); + proc1.printTrace(0); + proc2.printTrace(0); + proc3.printTrace(0); + std::cout << " proc0.cmdval = " << signal_vci_ini_c_proc0.cmdval << std::endl; + std::cout << " proc0.cmdack = " << signal_vci_ini_c_proc0.cmdack << std::endl; + std::cout << " proc0.address = " << signal_vci_ini_c_proc0.address << std::endl; + std::cout << " proc0.wdata = " << signal_vci_ini_c_proc0.wdata << std::endl; + std::cout << " proc0.eop = " << signal_vci_ini_c_proc0.eop << std::endl; + std::cout << " proc0.len = " << signal_vci_ini_c_proc0.plen << std::endl; + std::cout << " proc0.rspval = " << signal_vci_ini_c_proc0.rspval << std::endl; + std::cout << " proc0.rspack = " << signal_vci_ini_c_proc0.rspack << std::endl; + std::cout << " proc0.reop = " << signal_vci_ini_c_proc0.reop << std::endl; + std::cout << " proc0.rdata = " << signal_vci_ini_c_proc0.rdata << std::endl; + std::cout << " proc0.rerror = " << signal_vci_ini_c_proc0.rerror << std::endl; + std::cout << " memc.cmdval = " << signal_vci_tgt_c_memc.cmdval << std::endl; + std::cout << " memc.cmdack = " << signal_vci_tgt_c_memc.cmdack << std::endl; + std::cout << " memc.address = " << signal_vci_tgt_c_memc.address << std::endl; + std::cout << " memc.wdata = " << signal_vci_tgt_c_memc.wdata << std::endl; + std::cout << " memc.eop = " << signal_vci_tgt_c_memc.eop << std::endl; + std::cout << " memc.len = " << signal_vci_tgt_c_memc.plen << std::endl; + std::cout << " memc.rspval = " << signal_vci_tgt_c_memc.rspval << std::endl; + std::cout << " memc.rspack = " << signal_vci_tgt_c_memc.rspack << std::endl; + std::cout << " memc.reop = " << signal_vci_tgt_c_memc.reop << std::endl; + std::cout << " memc.rdata = " << signal_vci_tgt_c_memc.rdata << std::endl; + std::cout << " memc.rerror = " << signal_vci_tgt_c_memc.rerror << std::endl; +*/ + + sc_start(sc_core::sc_time(1, SC_NS)); } - std::cout << "Hit ENTER to end simulation" << std::endl; - char buf[1]; - std::cin.getline(buf,1); - return EXIT_SUCCESS; -#else - ncycles = 1; - sc_start(sc_core::sc_time(0, SC_NS)); - signal_resetn = false; - sc_start(sc_core::sc_time(1, SC_NS)); - signal_resetn = true; - - debug(); - return EXIT_SUCCESS; -#endif }