From 82498cd963317dca51e1ecb46129f268e69bdc52 Mon Sep 17 00:00:00 2001
From: jon <jonwoodruff@gmail.com>
Date: Wed, 13 May 2020 12:48:23 +0100
Subject: [PATCH] Only unseal next_pc after exception checks have been made.

---
 src_Core/RISCY_OOO/procs/lib/Exec.bsv | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src_Core/RISCY_OOO/procs/lib/Exec.bsv b/src_Core/RISCY_OOO/procs/lib/Exec.bsv
index 1339d98..2703054 100755
--- a/src_Core/RISCY_OOO/procs/lib/Exec.bsv
+++ b/src_Core/RISCY_OOO/procs/lib/Exec.bsv
@@ -288,7 +288,7 @@ function CapPipe brAddrCalc(CapPipe pc, CapPipe val, IType iType, Data imm, Bool
             Br      : (taken? branchTarget : pcPlusN);
             default : pcPlusN;
         endcase);
-    return setKind(targetAddr, UNSEALED);
+    return targetAddr;
 endfunction
 /*
 (* noinline *)
@@ -334,12 +334,13 @@ function ExecResult basicExec(DecodedInst dInst, CapPipe rVal1, CapPipe rVal2, C
         rVal1 = cf.nextPc;
         if (!cf.taken) dInst.capChecks.check_enable = False;
     end
-    cf.mispredict = cf.nextPc != ppc;
 
     Maybe#(CSR_XCapCause) capException = capChecks(rVal1, aluVal2, nullCap, dInst.capChecks);
     Maybe#(BoundsCheck) boundsCheck = prepareBoundsCheck(rVal1, aluVal2, pcc,
                                                          nullCap, 0, 0, // These three are only used in the memory pipe
                                                          dInst.capChecks);
+    cf.nextPc = setKind(cf.nextPc, UNSEALED);
+    cf.mispredict = cf.nextPc != ppc;
 
     data = (case (dInst.iType) matches
             St          : rVal2;