colin
/
cores-swerv-el2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17 from danielmlynek/riviera_support_fixes 

Fixes in riviera support which was pushed onto 1.3 version
Apologies for the shoddy manual merge in 1.3.
This commit is contained in:
Ajay Nath 2020-11-20 14:44:26 -05:00 committed by GitHub
parent ebfb8abf88 9755d8f94a
commit ae8be27b34
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
design/dec/el2_dec_decode_ctl.sv
View File

@ -602,7 +602,6 @@ end // else: !if(pt.BTB_ENABLE==1)
always_comb begin always_comb begin
found = 0; found = 0;
cam_wen[NBLOAD_SIZE_MSB:0] = '0;
for (int i=0; i<NBLOAD_SIZE; i++) begin for (int i=0; i<NBLOAD_SIZE; i++) begin
if (~found) begin if (~found) begin
if (~cam[i].valid) begin if (~cam[i].valid) begin
@ -618,7 +617,6 @@ end // else: !if(pt.BTB_ENABLE==1)
end end
end end
assign cam_write = lsu_nonblock_load_valid_m; assign cam_write = lsu_nonblock_load_valid_m;
assign cam_write_tag[NBLOAD_TAG_MSB:0] = lsu_nonblock_load_tag_m[NBLOAD_TAG_MSB:0]; assign cam_write_tag[NBLOAD_TAG_MSB:0] = lsu_nonblock_load_tag_m[NBLOAD_TAG_MSB:0];

4
tools/Makefile
View File

@ -34,7 +34,7 @@ IRUN = xrun
VCS = vcs VCS = vcs
VLOG = qverilog VLOG = qverilog
VERILATOR = verilator VERILATOR = verilator
RIVEIRA = riviera RIVIERA = riviera
GCC_PREFIX = riscv64-unknown-elf GCC_PREFIX = riscv64-unknown-elf
BUILD_DIR = snapshots/${snapshot} BUILD_DIR = snapshots/${snapshot}
TBDIR = ${RV_ROOT}/testbench TBDIR = ${RV_ROOT}/testbench
@ -103,7 +103,7 @@ all: clean verilator
clean: clean:
rm -rf *.log *.s *.hex *.dis *.tbl irun* vcs* simv* snapshots swerv* \ rm -rf *.log *.s *.hex *.dis *.tbl irun* vcs* simv* snapshots swerv* \
verilator* *.exe obj* *.o ucli.key vc_hdrs.h csrc *.csv work\ verilator* *.exe obj* *.o ucli.key vc_hdrs.h csrc *.csv work\
work dataset.asdb library.cfg vsimsa.cfg riviera-build wave.asdb dataset.asdb library.cfg vsimsa.cfg riviera-build wave.asdb