Xavi/cvw
1
0
Fork 0
forked from Github_Repos/cvw
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Harris 2021-01-28 21:40:57 -05:00
commit fd2f854a69
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wally-pipelined/regression/wally-busybear.do
View File

@ -54,6 +54,7 @@ add wave -hex /testbench_busybear/MemRWM[0]
add wave -hex /testbench_busybear/MemRWM[1]
add wave -hex /testbench_busybear/ByteMaskM
add wave -hex /testbench_busybear/WriteDataM
add wave -hex /testbench_busybear/ReadDataM
add wave -hex /testbench_busybear/DataAdrM
add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[1]
add wave -hex /testbench_busybear/dut/ieu/dp/regf/rf[2]
@ -130,6 +131,6 @@ add wave /testbench_busybear/InstrWName
#set DefaultRadix hexadecimal
#
#-- Run the Simulation
run 3850
run 129812
#run -all
##quit

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

@ -170,8 +170,8 @@ module testbench_busybear();
scan_file_PC = $fscanf(data_file_PC, "%x\n", InstrF);
// then expected PC value
scan_file_PC = $fscanf(data_file_PC, "%x\n", pcExpected);
if (instrs < 10 || (instrs < 100 && instrs % 10 == 0) ||
(instrs < 1000 && instrs % 50 == 0) || instrs > 205) begin
if (instrs <= 10 || (instrs <= 100 && instrs % 10 == 0) ||
(instrs <= 1000 && instrs % 100 == 0) || (instrs <= 10000 && instrs % 1000 == 0)) begin
$display("loaded %0d instructions", instrs);
end
instrs += 1;
@ -180,6 +180,8 @@ module testbench_busybear();
16'bXXXXXXXXX1101111, // JAL
16'bXXXXXXXXX1100111, // JALR
16'bXXXXXXXXX1100011, // B
16'b110XXXXXXXXXXX01, // C.BEQZ
16'b111XXXXXXXXXXX01, // C.BNEZ
16'b101XXXXXXXXXXX01: // C.J
speculative = 1;
16'b1001000000000010: // C.EBREAK: