From ec4eacac9c2523af6b6d6265bbe298fc2bd6fd7d Mon Sep 17 00:00:00 2001
From: Peter Rugg <pdr32@cam.ac.uk>
Date: Mon, 26 Jun 2023 18:01:56 +0100
Subject: [PATCH] Fix CSetAddr tag clear bug

---
 src_Core/RISCY_OOO/procs/lib/Exec.bsv | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src_Core/RISCY_OOO/procs/lib/Exec.bsv b/src_Core/RISCY_OOO/procs/lib/Exec.bsv
index a072729..c408936 100644
--- a/src_Core/RISCY_OOO/procs/lib/Exec.bsv
+++ b/src_Core/RISCY_OOO/procs/lib/Exec.bsv
@@ -253,7 +253,7 @@ function CapPipe capModify(CapPipe a, CapPipe b, CapModifyFunc func);
                       tagged EPC ._: nullWithAddr(getOffset(b));
                    endcase
             tagged SetAddr .addrSource    :
-                clearTagIf(setAddr(b_mut, (addrSource == Src1Type) ? a_type : getAddr(a) ).value, a_res);
+                clearTagIf(setAddr(b_mut, (addrSource == Src1Type) ? a_type : getAddr(a) ).value, (addrSource == Src1Type) ? a_res : False);
             tagged SealEntry              :
                 setKind(a_mut, SENTRY);
             tagged Seal                   :