Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-11 06:05:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:davidharrishmc/riscv-wally into main

Browse Source
This commit is contained in:
Domenico Ottolia 2021-03-16 23:27:09 -04:00
commit 487b198055
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
wally-pipelined/config/busybear/wally-config.vh
View File

@ -38,6 +38,7 @@
`define U_SUPPORTED ((`MISA >> 20) % 2 == 1) `define U_SUPPORTED ((`MISA >> 20) % 2 == 1)
`define ZCSR_SUPPORTED 1 `define ZCSR_SUPPORTED 1
`define ZCOUNTERS_SUPPORTED 1 `define ZCOUNTERS_SUPPORTED 1
`define COUNTERS 31
// N-mode user-level interrupts are depricated per Andrew Waterman 1/13/21 // N-mode user-level interrupts are depricated per Andrew Waterman 1/13/21
//`define N_SUPPORTED ((MISA >> 13) % 2 == 1) //`define N_SUPPORTED ((MISA >> 13) % 2 == 1)
`define N_SUPPORTED 0 `define N_SUPPORTED 0

11
wally-pipelined/testbench/testbench-busybear.sv
View File

@ -106,6 +106,7 @@ module testbench_busybear();
end end
integer warningCount = 0; integer warningCount = 0;
integer instrs;
//logic[63:0] adrTranslation[4:0]; //logic[63:0] adrTranslation[4:0];
//string translationType[4:0] = {"rf", "writeAdr", "PCW", "PC", "readAdr"}; //string translationType[4:0] = {"rf", "writeAdr", "PCW", "PC", "readAdr"};
@ -249,6 +250,15 @@ module testbench_busybear();
end end
end end
always @(dut.hart.priv.csr.genblk1.csrm.MCAUSE_REGW) begin
if (dut.hart.priv.csr.genblk1.csrm.MCAUSE_REGW == 5 && instrs != 0) begin
$display("!!!!!!illegal (physical) memory access !!!!!!!!!!");
$display("(as a reminder, MCAUSE and MEPC are set by this)");
$display("at %0t ps, instr %0d, HADDR %x", $time, instrs, HADDR);
`ERROR
end
end
`define CHECK_CSR2(CSR, PATH) \ `define CHECK_CSR2(CSR, PATH) \
string CSR; \ string CSR; \
logic [63:0] expected``CSR``; \ logic [63:0] expected``CSR``; \
@ -340,7 +350,6 @@ module testbench_busybear();
end end
string PCtext, PCtext2; string PCtext, PCtext2;
integer instrs;
initial begin initial begin
instrs = 0; instrs = 0;
end end