From 7002aeebe6620cdc758db813f3b5d4c666efe99f Mon Sep 17 00:00:00 2001 From: Byron Lathi Date: Sun, 19 Nov 2023 11:58:37 -0800 Subject: [PATCH] Add rtc code test --- .gitlab-ci.yml | 17 +++++- hw/efinix_fpga/simulation/Makefile | 2 +- hw/efinix_fpga/simulation/tbs/rtc_code_tb.sv | 23 ++++++++ hw/efinix_fpga/src/super6502.sv | 26 ++++++++- sw/test_code/irq_test/main.s | 2 +- sw/test_code/rtc_test/Makefile | 39 ++++++++++++++ sw/test_code/rtc_test/link.ld | 35 ++++++++++++ sw/test_code/rtc_test/main.s | 57 ++++++++++++++++++++ sw/test_code/rtc_test/vectors.s | 14 +++++ 9 files changed, 210 insertions(+), 5 deletions(-) create mode 100644 hw/efinix_fpga/simulation/tbs/rtc_code_tb.sv create mode 100644 sw/test_code/rtc_test/Makefile create mode 100644 sw/test_code/rtc_test/link.ld create mode 100644 sw/test_code/rtc_test/main.s create mode 100644 sw/test_code/rtc_test/vectors.s diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c8b39e5..404a63d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -146,4 +146,19 @@ interrupt_controller_code sim: - cd hw/efinix_fpga/simulation - make clean - TEST_PROGRAM_NAME=mapper_test make interrupt_controller_code_tb - - ./interrupt_controller_code_tb \ No newline at end of file + - ./interrupt_controller_code_tb + +rtc_code sim: + tags: + - linux + - iverilog + stage: simulate + artifacts: + paths: + - hw/efinix_fpga/simulation/interrupt_controller_code.vcd + script: + - source init_env.sh + - cd hw/efinix_fpga/simulation + - make clean + - TEST_PROGRAM_NAME=rtc_test make rtc_code_tb + - ./rtc_code_tb \ No newline at end of file diff --git a/hw/efinix_fpga/simulation/Makefile b/hw/efinix_fpga/simulation/Makefile index cdccb0f..3f76c94 100644 --- a/hw/efinix_fpga/simulation/Makefile +++ b/hw/efinix_fpga/simulation/Makefile @@ -10,7 +10,7 @@ TEST_FOLDER?=$(REPO_TOP)/sw/test_code/$(TEST_PROGRAM_NAME) TEST_PROGRAM?=$(REPO_TOP)/sw/test_code/$(TEST_PROGRAM_NAME)/$(TEST_PROGRAM_NAME).hex STANDALONE_TB= interrupt_controller_tb mapper_tb rtc_tb -CODE_TB= interrupt_controller_code_tb mapper_code_tb +CODE_TB= interrupt_controller_code_tb mapper_code_tb rtc_code_tb #TODO implement something like sources.list diff --git a/hw/efinix_fpga/simulation/tbs/rtc_code_tb.sv b/hw/efinix_fpga/simulation/tbs/rtc_code_tb.sv new file mode 100644 index 0000000..6ea1f90 --- /dev/null +++ b/hw/efinix_fpga/simulation/tbs/rtc_code_tb.sv @@ -0,0 +1,23 @@ +`timescale 1ns/1ps + +module rtc_code_tb(); + +sim_top u_sim_top(); + +always begin + if ( + u_sim_top.w_cpu_addr == 16'h0 && + u_sim_top.w_cpu_we == '1 + ) begin + if (u_sim_top.w_cpu_data_from_cpu == 8'h6d) begin + $display("Good finish!"); + $finish(); + end else begin + $display("Bad finish!"); + $finish_and_return(-1); + end + end + # 1; +end + +endmodule \ No newline at end of file diff --git a/hw/efinix_fpga/src/super6502.sv b/hw/efinix_fpga/src/super6502.sv index 5b64c75..6e4d8aa 100644 --- a/hw/efinix_fpga/src/super6502.sv +++ b/hw/efinix_fpga/src/super6502.sv @@ -72,6 +72,8 @@ always @(posedge clk_cpu) begin end +logic w_rtc_irq; + logic w_mapper_cs; logic w_rom_cs; @@ -83,6 +85,7 @@ logic w_divider_cs; logic w_uart_cs; logic w_spi_cs; logic w_irq_cs; +logic w_rtc_cs; logic [7:0] w_rom_data_out; @@ -93,6 +96,7 @@ logic [7:0] w_divider_data_out; logic [7:0] w_uart_data_out; logic [7:0] w_spi_data_out; logic [7:0] w_irq_data_out; +logic [7:0] w_rtc_data_out; logic [7:0] w_sdram_data_out; logic [24:0] w_mapped_addr; @@ -101,6 +105,7 @@ always_comb begin w_mapper_cs = cpu_addr >= 16'h200 && cpu_addr <= 16'h21f; w_rom_cs = w_mapped_addr >= 16'hf000 && w_mapped_addr <= 16'hffff; + w_rtc_cs = w_mapped_addr >= 16'heffe && w_mapped_addr <= 16'hefff; w_irq_cs = w_mapped_addr >= 16'heffc && w_mapped_addr <= 16'heffd; w_timer_cs = w_mapped_addr >= 16'heff8 && w_mapped_addr <= 16'heffb; w_multiplier_cs = w_mapped_addr >= 16'heff0 && w_mapped_addr <= 16'heff7; @@ -117,7 +122,8 @@ always_comb begin w_uart_cs | w_spi_cs | w_leds_cs | - w_irq_cs + w_irq_cs | + w_rtc_cs ); @@ -139,6 +145,8 @@ always_comb begin cpu_data_out = w_spi_data_out; else if (w_irq_cs) cpu_data_out = w_irq_data_out; + else if (w_rtc_cs) + cpu_data_out = w_rtc_cs; else if (w_sdram_cs) cpu_data_out = w_sdram_data_out; else @@ -269,7 +277,9 @@ sdram_adapter u_sdram_adapter( logic w_irq; assign cpu_irqb = ~w_irq; -logic [255:0] int_in; +logic [255:0] w_int_in; + +assign w_int_in[255:1] = 0; interrupt_controller u_interrupt_controller( .clk(clk_cpu), @@ -283,5 +293,17 @@ interrupt_controller u_interrupt_controller( .int_out(w_irq) ); +rtc u_rtc( + .clk(clk_cpu), + .reset(~cpu_resb), + .rwb(cpu_rwb), + .cs(w_rtc_cs), + .addr(w_mapped_addr[0]), + .i_data(cpu_data_in), + .o_data(w_rtc_data_out), + .irq(w_rtc_irq) +); + +assign w_int_in[0] = w_rtc_irq; endmodule diff --git a/sw/test_code/irq_test/main.s b/sw/test_code/irq_test/main.s index 5b1a211..7610350 100644 --- a/sw/test_code/irq_test/main.s +++ b/sw/test_code/irq_test/main.s @@ -2,7 +2,7 @@ .export _init, _nmi_int, _irq_int -.import tmp1 +.importzp tmp1 CMD = $effc DAT = $effd diff --git a/sw/test_code/rtc_test/Makefile b/sw/test_code/rtc_test/Makefile new file mode 100644 index 0000000..4ea5396 --- /dev/null +++ b/sw/test_code/rtc_test/Makefile @@ -0,0 +1,39 @@ +CC=../../cc65/bin/cl65 +LD=../../cc65/bin/cl65 +CFLAGS=-T -t none -I. --cpu "65C02" +LDFLAGS=-C link.ld -m $(NAME).map + +NAME=rtc_test + +BIN=$(NAME).bin +HEX=$(NAME).hex + +LISTS=lists + +SRCS=$(wildcard *.s) $(wildcard *.c) +SRCS+=$(wildcard **/*.s) $(wildcard **/*.c) +OBJS+=$(patsubst %.s,%.o,$(filter %s,$(SRCS))) +OBJS+=$(patsubst %.c,%.o,$(filter %c,$(SRCS))) + +# Make sure the kernel linked to correct address, no relocation! +all: $(HEX) + +$(HEX): $(BIN) + objcopy --input-target=binary --output-target=verilog $(BIN) $(HEX) + +$(BIN): $(OBJS) + $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $@ + +%.o: %.c $(LISTS) + $(CC) $(CFLAGS) -l $(LISTS)/$<.list -c $< -o $@ + +%.o: %.s $(LISTS) + $(CC) $(CFLAGS) -l $(LISTS)/$<.list -c $< -o $@ + +$(LISTS): + mkdir -p $(addprefix $(LISTS)/,$(sort $(dir $(SRCS)))) + +.PHONY: clean +clean: + rm -rf $(OBJS) $(BIN) $(HEX) $(LISTS) $(NAME).map + diff --git a/sw/test_code/rtc_test/link.ld b/sw/test_code/rtc_test/link.ld new file mode 100644 index 0000000..66a42fe --- /dev/null +++ b/sw/test_code/rtc_test/link.ld @@ -0,0 +1,35 @@ +MEMORY +{ + ZP: start = $0, size = $100, type = rw, define = yes; + SDRAM: start = $9200, size = $4d00, type = rw, define = yes; + ROM: start = $F000, size = $1000, file = %O; +} + +SEGMENTS { + ZEROPAGE: load = ZP, type = zp, define = yes; + DATA: load = ROM, type = rw, define = yes, run = SDRAM; + BSS: load = SDRAM, type = bss, define = yes; + HEAP: load = SDRAM, type = bss, optional = yes; + STARTUP: load = ROM, type = ro; + ONCE: load = ROM, type = ro, optional = yes; + CODE: load = ROM, type = ro; + RODATA: load = ROM, type = ro; + VECTORS: load = ROM, type = ro, start = $FFFA; +} + +FEATURES { + CONDES: segment = STARTUP, + type = constructor, + label = __CONSTRUCTOR_TABLE__, + count = __CONSTRUCTOR_COUNT__; + CONDES: segment = STARTUP, + type = destructor, + label = __DESTRUCTOR_TABLE__, + count = __DESTRUCTOR_COUNT__; +} + +SYMBOLS { + # Define the stack size for the application + __STACKSIZE__: value = $0200, type = weak; + __STACKSTART__: type = weak, value = $0800; # 2k stack +} diff --git a/sw/test_code/rtc_test/main.s b/sw/test_code/rtc_test/main.s new file mode 100644 index 0000000..68d7259 --- /dev/null +++ b/sw/test_code/rtc_test/main.s @@ -0,0 +1,57 @@ +.MACPACK generic + +.export _init, _nmi_int, _irq_int + +IRQ_CMD = $effc +IRQ_DAT = $effd + +RTC_CMD = $effe +RTC_DAT = $efff + +.zeropage +finish: .res 1 + +.code + +_nmi_int: +_irq_int: + lda #$6d + sta finish + +_init: + ldx #$ff + txs + + ; Enable irq0 + lda #$20 + sta IRQ_CMD + lda #$01 + sta IRQ_DAT + ; edge type + lda #$40 + sta IRQ_CMD + lda #$00 + sta IRQ_DAT + + ; Set increment + lda #$10 + sta RTC_CMD + lda #$01 + sta RTC_DAT + + ; Set Threshold + lda #$00 + sta RTC_CMD + lda #$07 + sta RTC_DAT + + ; Set IRQ Threshold + lda #$20 + sta RTC_CMD + lda #$02 + sta RTC_DAT + + cli + +wait: + bra wait \ No newline at end of file diff --git a/sw/test_code/rtc_test/vectors.s b/sw/test_code/rtc_test/vectors.s new file mode 100644 index 0000000..81ae6e0 --- /dev/null +++ b/sw/test_code/rtc_test/vectors.s @@ -0,0 +1,14 @@ +; --------------------------------------------------------------------------- +; vectors.s +; --------------------------------------------------------------------------- +; +; Defines the interrupt vector table. + +.import _init +.import _nmi_int, _irq_int + +.segment "VECTORS" + +.addr _nmi_int ; NMI vector +.addr _init ; Reset vector +.addr _irq_int ; IRQ/BRK vector \ No newline at end of file