From c04a30cd882708bbc70112abd6282ab524b13c4e Mon Sep 17 00:00:00 2001
From: Alexandre Joannou <aj443@cam.ac.uk>
Date: Thu, 27 Jun 2019 17:42:03 +0100
Subject: [PATCH] Fold in setAddress fix from svn

---
 CHERICC_Fat.bsv | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHERICC_Fat.bsv b/CHERICC_Fat.bsv
index 2ca3570..f4d43fe 100644
--- a/CHERICC_Fat.bsv
+++ b/CHERICC_Fat.bsv
@@ -660,9 +660,9 @@ function VnD#(CapFat) setAddress(CapFat cap, LCapAddress address, TempFields tf)
                                   t2(False, False): return  0;
                               endcase;
         if (diff != expectedDiff) inRepBounds = False;
-
+        if (e >= resetExp - 3) inRepBounds = True;
         if (!inRepBounds) ret.isCapability = False;
-        return VnD {v: inRepBounds, d: ret};//ret:nullifyCap(ret);
+        return VnD {v: inRepBounds, d: ret};
 endfunction
 
 ///////////////////////////////