From fa6f6505d43e186deb89dbbe51680e20f72ed7a9 Mon Sep 17 00:00:00 2001
From: Byron Lathi <bslathi19@gmail.com>
Date: Wed, 17 Jul 2024 00:55:58 -0700
Subject: [PATCH] Fixes for sim

---
 hw/super6502_fpga/sources.list           | 23 ++++++++++++++++++++++-
 hw/super6502_fpga/src/sim/Makefile       |  2 +-
 hw/super6502_fpga/src/sim/hvl/sim_top.sv | 18 ++++++++----------
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/hw/super6502_fpga/sources.list b/hw/super6502_fpga/sources.list
index f4c54e9..5ab0581 100644
--- a/hw/super6502_fpga/sources.list
+++ b/hw/super6502_fpga/sources.list
@@ -7,4 +7,25 @@ src/sub/rtl-common/src/rtl/ff_cdc.sv
 src/sub/rtl-common/src/rtl/shallow_async_fifo.sv
 src/sub/rtl-common/src/rtl/sync_fifo.sv
 src/sub/rtl-common/src/rtl/axi4_lite_to_apb4.sv
-ip/sdram_controller/sdram_controller.v
\ No newline at end of file
+ip/sdram_controller/sdram_controller.v
+src/sub/wb2axip/rtl/axilxbar.v
+src/sub/wb2axip/rtl/addrdecode.v
+src/sub/wb2axip/rtl/skidbuffer.v
+src/sub/sdspi/rtl/sdckgen.v
+src/sub/sdspi/rtl/sddma_rxgears.v
+src/sub/sdspi/rtl/sddma.v
+src/sub/sdspi/rtl/sdrxframe.v
+src/sub/sdspi/rtl/sdtxframe.v
+src/sub/sdspi/rtl/sddma_s2mm.v
+src/sub/sdspi/rtl/afifo.v
+src/sub/sdspi/rtl/sddma_txgears.v
+src/sub/sdspi/rtl/sdskid.v
+src/sub/sdspi/rtl/sdfrontend.v
+src/sub/sdspi/rtl/spicmd.v
+src/sub/sdspi/rtl/sdaxil.v
+src/sub/sdspi/rtl/sddma_mm2s.v
+src/sub/sdspi/rtl/sdio_top.v
+src/sub/sdspi/rtl/sdwb.v
+src/sub/sdspi/rtl/sdio.v
+src/sub/sdspi/rtl/sdcmd.v
+src/sub/sdspi/rtl/sdfifo.v
\ No newline at end of file
diff --git a/hw/super6502_fpga/src/sim/Makefile b/hw/super6502_fpga/src/sim/Makefile
index 5c25611..e441c4e 100644
--- a/hw/super6502_fpga/src/sim/Makefile
+++ b/hw/super6502_fpga/src/sim/Makefile
@@ -10,7 +10,7 @@ TB_NAME=sim_top
 
 COPY_FILES=addr_map.mem init_hex.mem
 
-FLAGS=-DSIM -DRTL_SIM
+FLAGS=-DSIM -DRTL_SIM -DVERILATOR -DSDIO_AXI
 
 all: waves
 
diff --git a/hw/super6502_fpga/src/sim/hvl/sim_top.sv b/hw/super6502_fpga/src/sim/hvl/sim_top.sv
index c8ba47e..e03514e 100644
--- a/hw/super6502_fpga/src/sim/hvl/sim_top.sv
+++ b/hw/super6502_fpga/src/sim/hvl/sim_top.sv
@@ -49,7 +49,7 @@ initial begin
     $dumpvars(0,sim_top);
 end
 
-logic button_reset;
+logic button_resetn;
 
 logic           w_cpu0_reset;
 logic [15:0]    w_cpu0_addr;
@@ -120,9 +120,8 @@ logic o_sd_cmd;
 logic o_sd_cmd_oe;
 logic i_sd_dat;
 logic o_sd_dat;
-logic i_sd_dat_oe;
+logic o_sd_dat_oe;
 logic o_sd_clk;
-logic o_sd_cs;
 
 super6502_fpga u_dut (
     .i_sysclk               (clk_100),
@@ -130,7 +129,7 @@ super6502_fpga u_dut (
     .i_tACclk               (~clk_200),
     .clk_cpu                (clk_cpu),
 
-    .button_reset           (button_reset),
+    .button_resetn          (button_resetn),
 
     .o_cpu0_reset           (w_cpu0_reset),
     .i_cpu0_addr            (w_cpu0_addr),
@@ -160,13 +159,12 @@ super6502_fpga u_dut (
     .i_sd_dat               (i_sd_dat),
     .o_sd_dat               (o_sd_dat),
     .o_sd_dat_oe            (o_sd_dat_oe),
-    .o_sd_clk               (o_sd_clk),
-    .o_sd_cs                (o_sd_cs)
+    .o_sd_clk               (o_sd_clk)
 );
 
 sd_card_emu u_sd_card_emu(
     .clk(o_sd_clk),
-    .rst(~button_reset),
+    .rst(~button_resetn),
     .i_cmd(o_sd_cmd),
     .o_cmd(i_sd_cmd),
     .i_dat(o_sd_dat),
@@ -174,11 +172,11 @@ sd_card_emu u_sd_card_emu(
 );
 
 initial begin
-    button_reset <= '1;
+    button_resetn <= '1;
     repeat(10) @(clk_cpu);
-    button_reset <= '0;
+    button_resetn <= '0;
     repeat(10) @(clk_cpu);
-    button_reset <= '1;
+    button_resetn <= '1;
     repeat(4000) @(posedge clk_cpu);
     $finish();
 end