rtl/core, tb: replace bus_master with a new top-level module

2 files changed, 59 insertions, 70 deletions

diff --git a/tb/platform.sv b/tb/platform.sv
index 570ee4e..a4db086 100644
--- a/tb/platform.sv
+++ b/tb/platform.sv
@@ -2,56 +2,50 @@
 
 module platform
 (
-	input  wire        clk_clk,                          //                       clk.clk
-	input  wire [29:0] master_0_core_addr,               // master_0_core.addr
-	output wire [31:0] master_0_core_data_rd,            //              .data_rd
-	input  wire [31:0] master_0_core_data_wr,            //              .data_wr
-	input  wire [3:0]  master_0_core_data_be,            //              .data_be
-	output wire        master_0_core_ready,              //              .ready
-	input  wire        master_0_core_write,              //              .write
-	input  wire        master_0_core_start,              //              .start
-	output wire        master_0_core_irq,                //                          .irq
-	output wire        master_0_core_cpu_clk,            //                          .cpu_clk
-	output wire        master_0_core_cpu_rst_n,
-	output wire [12:0] memory_mem_a,                     //                    memory.mem_a
-	output wire [2:0]  memory_mem_ba,                    //                          .mem_ba
-	output wire        memory_mem_ck,                    //                          .mem_ck
-	output wire        memory_mem_ck_n,                  //                          .mem_ck_n
-	output wire        memory_mem_cke,                   //                          .mem_cke
-	output wire        memory_mem_cs_n,                  //                          .mem_cs_n
-	output wire        memory_mem_ras_n,                 //                          .mem_ras_n
-	output wire        memory_mem_cas_n,                 //                          .mem_cas_n
-	output wire        memory_mem_we_n,                  //                          .mem_we_n
-	output wire        memory_mem_reset_n,               //                          .mem_reset_n
-	inout  wire [7:0]  memory_mem_dq,                    //                          .mem_dq
-	inout  wire        memory_mem_dqs,                   //                          .mem_dqs
-	inout  wire        memory_mem_dqs_n,                 //                          .mem_dqs_n
-	output wire        memory_mem_odt,                   //                          .mem_odt
-	output wire        memory_mem_dm,                    //                          .mem_dm
-	input  wire        memory_oct_rzqin,                 //                          .oct_rzqin
-	output wire [7:0]  pio_0_external_connection_export, // pio_0_external_connection.export
-	input  wire [7:0]  switches_external_connection_export, // pio_1_external_connection.export
-	input  wire [7:0]  buttons_external_connection_export, // pio_2_external_connection.export
-	input  wire        pll_0_reset_reset,
-	output wire        sys_sdram_pll_0_sdram_clk_clk,
-	input  wire        reset_reset_n /*verilator public*/,//                     reset.reset_n
-	output wire [12:0] vram_wire_addr,                   //                 vram_wire.addr
-	output wire [1:0]  vram_wire_ba,                     //                          .ba
-	output wire        vram_wire_cas_n,                  //                          .cas_n
-	output wire        vram_wire_cke,                    //                          .cke
-	output wire        vram_wire_cs_n,                   //                          .cs_n
-	inout  wire [15:0] vram_wire_dq,                     //                          .dq
-	output wire [1:0]  vram_wire_dqm,                    //                          .dqm
-	output wire        vram_wire_ras_n,                  //                          .ras_n
-	output wire        vram_wire_we_n,                   //                          .we_n
-	output wire        vga_dac_CLK,                      //                   vga_dac.CLK
-	output wire        vga_dac_HS,                       //                          .HS
-	output wire        vga_dac_VS,                       //                          .VS
-	output wire        vga_dac_BLANK,                    //                          .BLANK
-	output wire        vga_dac_SYNC,                     //                          .SYNC
-	output wire [7:0]  vga_dac_R,                        //                          .R
-	output wire [7:0]  vga_dac_G,                        //                          .G
-	output wire [7:0]  vga_dac_B                        //                          .B
+	input  wire [7:0]  buttons_external_connection_export,  //  buttons_external_connection.export
+	input  wire        clk_clk,                             //                          clk.clk
+	input  wire        cpu_0_mp_step,                       //                     cpu_0_mp.step
+	input  wire        cpu_0_mp_cpu_halt,                   //                             .cpu_halt
+	output wire        cpu_0_mp_cpu_halted,                 //                             .cpu_halted
+	output wire        cpu_0_mp_breakpoint,                 //                             .breakpoint
+	output wire [12:0] memory_mem_a,                        //                       memory.mem_a
+	output wire [2:0]  memory_mem_ba,                       //                             .mem_ba
+	output wire        memory_mem_ck,                       //                             .mem_ck
+	output wire        memory_mem_ck_n,                     //                             .mem_ck_n
+	output wire        memory_mem_cke,                      //                             .mem_cke
+	output wire        memory_mem_cs_n,                     //                             .mem_cs_n
+	output wire        memory_mem_ras_n,                    //                             .mem_ras_n
+	output wire        memory_mem_cas_n,                    //                             .mem_cas_n
+	output wire        memory_mem_we_n,                     //                             .mem_we_n
+	output wire        memory_mem_reset_n,                  //                             .mem_reset_n
+	inout  wire [7:0]  memory_mem_dq,                       //                             .mem_dq
+	inout  wire        memory_mem_dqs,                      //                             .mem_dqs
+	inout  wire        memory_mem_dqs_n,                    //                             .mem_dqs_n
+	output wire        memory_mem_odt,                      //                             .mem_odt
+	output wire        memory_mem_dm,                       //                             .mem_dm
+	input  wire        memory_oct_rzqin,                    //                             .oct_rzqin
+	output wire [7:0]  pio_0_external_connection_export,    //    pio_0_external_connection.export
+	input  wire        pll_0_reset_reset,                   //                  pll_0_reset.reset
+	input  wire        reset_reset_n /*verilator public*/,  //                        reset.reset_n
+	input  wire [7:0]  switches_external_connection_export, // switches_external_connection.export
+	output wire        sys_sdram_pll_0_sdram_clk_clk,       //    sys_sdram_pll_0_sdram_clk.clk
+	output wire        vga_dac_CLK,                         //                      vga_dac.CLK
+	output wire        vga_dac_HS,                          //                             .HS
+	output wire        vga_dac_VS,                          //                             .VS
+	output wire        vga_dac_BLANK,                       //                             .BLANK
+	output wire        vga_dac_SYNC,                        //                             .SYNC
+	output wire [7:0]  vga_dac_R,                           //                             .R
+	output wire [7:0]  vga_dac_G,                           //                             .G
+	output wire [7:0]  vga_dac_B,                           //                             .B
+	output wire [12:0] vram_wire_addr,                      //                    vram_wire.addr
+	output wire [1:0]  vram_wire_ba,                        //                             .ba
+	output wire        vram_wire_cas_n,                     //                             .cas_n
+	output wire        vram_wire_cke,                       //                             .cke
+	output wire        vram_wire_cs_n,                      //                             .cs_n
+	inout  wire [15:0] vram_wire_dq,                        //                             .dq
+	output wire [1:0]  vram_wire_dqm,                       //                             .dqm
+	output wire        vram_wire_ras_n,                     //                             .ras_n
+	output wire        vram_wire_we_n                       //                             .we_n
 );
 
 	logic[31:0]  avl_address /*verilator public*/;
@@ -71,20 +65,14 @@ module platform
 	logic       core_avl_waitrequest;
 	logic[3:0]  core_avl_byteenable;
 
-	bus_master master_0
+	core cpu0
 	(
 		.clk(clk_clk),
 		.rst_n(reset_reset_n),
-		.addr(master_0_core_addr),
-		.start(master_0_core_start),
-		.write(master_0_core_write),
-		.ready(master_0_core_ready),
-		.data_rd(master_0_core_data_rd),
-		.data_wr(master_0_core_data_wr),
-		.data_be(master_0_core_data_be),
-		.cpu_clk(master_0_core_cpu_clk),
-		.cpu_rst_n(master_0_core_cpu_rst_n),
-		.irq(master_0_core_irq),
+		.step(cpu_0_mp_step),
+		.breakpoint(cpu_0_mp_breakpoint),
+		.cpu_halt(cpu_0_mp_cpu_halt),
+		.cpu_halted(cpu_0_mp_cpu_halted),
 		.avl_address(core_avl_address),
 		.avl_read(core_avl_read),
 		.avl_write(core_avl_write),
@@ -107,7 +95,7 @@ module platform
 	      data_ready_0, data_ready_1, data_ready_2, data_ready_3,
 	      token_valid_0, token_valid_1, token_valid_2, token_valid_3;
 
-	cache #(.TOKEN_AT_RESET(0)) c0
+	cache #(.TOKEN_AT_RESET(0)) cache0
 	(
 		.clk(clk_clk),
 		.rst_n(reset_reset_n),
@@ -149,7 +137,7 @@ module platform
 		.out_token_valid(token_valid_0)
 	);
 
-	cache #(.TOKEN_AT_RESET(0)) c1
+	cache #(.TOKEN_AT_RESET(0)) cache1
 	(
 		.clk(clk_clk),
 		.rst_n(reset_reset_n),
@@ -191,7 +179,7 @@ module platform
 		.out_token_valid(token_valid_1)
 	);
 
-	cache #(.TOKEN_AT_RESET(0)) c2
+	cache #(.TOKEN_AT_RESET(0)) cache2
 	(
 		.clk(clk_clk),
 		.rst_n(reset_reset_n),
@@ -233,7 +221,7 @@ module platform
 		.out_token_valid(token_valid_2)
 	);
 
-	cache #(.TOKEN_AT_RESET(1)) c3
+	cache #(.TOKEN_AT_RESET(1)) cache3
 	(
 		.clk(clk_clk),
 		.rst_n(reset_reset_n),
diff --git a/tb/top/conspiracion.cpp b/tb/top/conspiracion.cpp
index b243c89..4f0fb3d 100644
--- a/tb/top/conspiracion.cpp
+++ b/tb/top/conspiracion.cpp
@@ -18,6 +18,7 @@
 #include "Vconspiracion_conspiracion.h"
 #include "Vconspiracion_platform.h"
 #include "Vconspiracion_vga_domain.h"
+#include "Vconspiracion_core.h"
 #include "Vconspiracion_core_control.h"
 #include "Vconspiracion_core_control_issue.h"
 #include "Vconspiracion_core_cp15_domain.h"
@@ -386,7 +387,7 @@ int main(int argc, char **argv)
 		std::fclose(img_file);
 	}
 
-	auto &core = *top.conspiracion->core;
+	auto &core = *plat.cpu0->cpu;
 	for(const auto &init : init_regs)
 	{
 		core.regs->a->file[init.index] = init.value;
@@ -473,10 +474,10 @@ int main(int argc, char **argv)
 	};
 
 	Vconspiracion_cache_sram *const caches[] = {
-		plat.c0->sram,
-		plat.c1->sram,
-		plat.c2->sram,
-		plat.c3->sram
+		plat.cache0->sram,
+		plat.cache1->sram,
+		plat.cache2->sram,
+		plat.cache3->sram
 	};
 
 	auto dump_coherent = [&](std::uint32_t addr, std::uint32_t &data)