diff --git a/sim/questa/imperas.ic b/sim/questa/imperas.ic index 51344b75a..af15cb972 100644 --- a/sim/questa/imperas.ic +++ b/sim/questa/imperas.ic @@ -15,8 +15,8 @@ # bit manipulation --override cpu/add_Extensions=B -#--override cpu/add_implicit_Extensions=B --override cpu/bitmanip_version=1.0.0 +--override cpu/misa_B_Zba_Zbb_Zbs=T # More extensions --override cpu/Zcb=T @@ -60,17 +60,11 @@ --override cpu/misa_Extensions_mask=0x0 # MISA not writable --override cpu/Sstc=T -# unsuccessfully attempt to add B extension (DH 12/21/23) -#--override cpu/add_Extensions="B" -#--override cpu/misa_Extensions=0x0014112F - # Enable SVADU hardware update of A/D bits when menvcfg.ADUE=1 --override cpu/Svadu=T #--override cpu/updatePTEA=F #--override cpu/updatePTED=F - -# THIS NEEDS FIXING to 16 --override cpu/PMP_registers=16 --override cpu/PMP_undefined=T diff --git a/testbench/Makefile b/testbench/Makefile index 8ad71f522..87870b451 100644 --- a/testbench/Makefile +++ b/testbench/Makefile @@ -3,7 +3,7 @@ # SPDX-License-Identifier: Apache-2.0 WITH SHL-2.1 %.elf.memfile: %.elf - riscv64-unknown-elf-elf2hex --bit-width 64 --input $< --output $@ + riscv64-unknown-elf-elf2hex --bit-width $(if $(findstring rv32,$*),32,64) --input $< --output $@ %.elf.objdump.addr: %.elf.objdump extractFunctionRadix.sh $< diff --git a/testbench/testbench.sv b/testbench/testbench.sv index 003d4d9ae..f167482b9 100644 --- a/testbench/testbench.sv +++ b/testbench/testbench.sv @@ -941,7 +941,7 @@ task automatic updateProgramAddrLabelArray; string cmd; // if memfile, label, or addr files are out of date or don't exist, generate them - cmd = {"make -f ", WALLY_DIR, "/testbench/Makefile ", memfilename, " ", ProgramAddrMapFile}; + cmd = {"make -s -f ", WALLY_DIR, "/testbench/Makefile ", memfilename, " ", ProgramAddrMapFile}; $system(cmd); ProgramLabelMapFP = $fopen(ProgramLabelMapFile, "r");