Cheri-research/Toooba
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix interface with special capability register file trap handling.

Browse Source 
Call the correct trap function, and report the correct privilege level.
This commit is contained in:
jon
2020-04-30 11:59:34 +01:00
parent 6dff23f30a
commit 0b68498940
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src_Core/RISCY_OOO/procs/RV64G_OOO/CommitStage.bsv
View File

@@ -729,7 +729,6 @@ module mkCommitStage#(CommitInput inIfc)(CommitStage);
: 1));
csrf.dcsr_cause_write (dcsr_cause);
csrf.dpc_write (trap.pc);
scaprfIfc.trap (trap.pc,?);
// Tell fetch stage to wait for redirect
// Note: rule doCommitTrap_flush may have done this already; redundant call is ok.
@@ -748,7 +747,7 @@ module mkCommitStage#(CommitInput inIfc)(CommitStage);
// trap handling & redirect
CapPipe cp = cast(trap.pc);
let trap_updates <- csrf.trap(trap.trap, getOffset(cp), trap.addr, trap.orig_inst);
let cap_trap_updates <- scaprf.trap(cast(trap.pc), ?);
let cap_trap_updates <- scaprf.trap(cast(trap.pc), csrf.decodeInfo.prv);
CapPipe new_pc = setOffset(cast(cap_trap_updates.new_pcc), trap_updates.new_pc).value;
inIfc.redirectPc(cast(new_pc)
`ifdef RVFI_DII
@@ -897,7 +896,7 @@ module mkCommitStage#(CommitInput inIfc)(CommitStage);
end
else if(x.iType == Mret) begin
RET_Updates ret_updates <- csrf.mret;
Scr_RET_Updates scr_ret_updates <- scaprf.sret;
Scr_RET_Updates scr_ret_updates <- scaprf.mret;
CapPipe tc = setOffset(cast(scr_ret_updates.new_pcc), ret_updates.new_pc).value;
next_pc = cast(tc);
`ifdef INCLUDE_TANDEM_VERIF