brendanhaines/cpu
1
0
Fork 0
mirror of https://gitlab.com/brendanhaines/cpu.git synced 2024-12-26 11:06:50 -07:00
Code Issues Packages Projects Releases Wiki Activity

clean up core_tb.v a little

Browse Source
This commit is contained in:
Brendan Haines 2021-07-02 03:20:38 -06:00
parent 07d317eb6e
commit 69e4ea9204
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
hdl/tb/core_tb.v
View File

@ -25,36 +25,23 @@ localparam DATA_INVALID = 32'hdeadbeef;
reg clk, reset; reg clk, reset;
// Instruction memory // Memory
reg [31:0] mem [0:MEM_LENGTH-1]; reg [31:0] mem [0:MEM_LENGTH-1];
initial $readmemh("text.hex", mem);
// Instruction Memory
wire [31:0] mem_inst_addr; wire [31:0] mem_inst_addr;
wire [31:0] mem_inst_idx = mem_inst_addr >> 2; wire [31:0] mem_inst_idx = mem_inst_addr >> 2;
wire [31:0] mem_inst_data = mem_inst_idx < MEM_LENGTH ? mem[mem_inst_idx] : INST_NOP; wire [31:0] mem_inst_data = mem_inst_idx < MEM_LENGTH ? mem[mem_inst_idx] : INST_NOP;
initial begin: mem_init
// integer i;
// for (i=0; i<MEM_LENGTH; i=i+1) begin
// mem[i] = INST_NOP;
// end
$readmemh("text.hex", mem);
end
// Data memory // Data memory
// reg [31:0] mem_data [0:MEM_DATA_LENGTH-1];
wire [31:0] mem_data_addr; wire [31:0] mem_data_addr;
reg [31:0] mem_data_rdata; wire [31:0] mem_data_idx = (mem_data_addr) >> 2;
wire [31:0] mem_data_rdata = mem_data_idx < MEM_LENGTH ? mem[mem_data_idx] : DATA_INVALID;
wire [31:0] mem_data_wdata; wire [31:0] mem_data_wdata;
wire [3:0] mem_data_wmask; wire [3:0] mem_data_wmask;
wire mem_data_we; wire mem_data_we;
// initial begin: mem_data_init
// integer i;
// for (i=0; i<MEM_DATA_LENGTH; i=i+1) begin
// mem_data[i] = DATA_DEFAULT;
// end
// $readmemh("data.hex", mem_data);
// end
initial begin initial begin
#0 #0
clk = 0; clk = 0;
@ -150,15 +137,6 @@ core dut(
// .WB_RREADY() // .WB_RREADY()
// ); // );
wire [31:0] mem_data_idx = (mem_data_addr) >> 2;
always @(*) begin
if (mem_data_idx < MEM_LENGTH) begin
mem_data_rdata = mem[mem_data_idx];
end else begin
mem_data_rdata = DATA_INVALID;
end
end
always @(posedge clk) begin always @(posedge clk) begin
if (mem_data_idx < MEM_LENGTH && mem_data_idx >= MEM_ROM_LENGTH) begin if (mem_data_idx < MEM_LENGTH && mem_data_idx >= MEM_ROM_LENGTH) begin
if (mem_data_we) begin if (mem_data_we) begin

6
test/test.S
View File

@ -372,6 +372,12 @@ test_jalr:
.data .data
someint: someint:
.word 0xfedcba98 .word 0xfedcba98
someint16:
.byte 0x1122
someint8:
.byte 0xaa
anotherint8:
.byte 0xbb
.bss .bss
anotherint: anotherint: