From d65d53cecc077a1171c35fda326f30bb0b6425a3 Mon Sep 17 00:00:00 2001
From: Robert Norton
Date: Tue, 7 Jun 2016 15:03:31 +0100
Subject: Merge register access violation exception codes. ISA is evolving and
 is a little loose at the moment (does not specify what to do with deprecated
 permission bits).

---
 cheri/cheri_prelude.sail | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/cheri/cheri_prelude.sail b/cheri/cheri_prelude.sail
index f9b33f35..eee1ac65 100644
--- a/cheri/cheri_prelude.sail
+++ b/cheri/cheri_prelude.sail
@@ -303,11 +303,11 @@ function (bit[8]) CapExCode((CapEx) ex) =
     case CapEx_PermitStoreCapViolation      -> 0x15
     case CapEx_PermitStoreLocalCapViolation -> 0x16
     case CapEx_PermitSealViolation          -> 0x17
-    case CapEx_AccessEPCCViolation          -> 0x1a
-    case CapEx_AccessKDCViolation           -> 0x1b
-    case CapEx_AccessKCCViolation           -> 0x1c
-    case CapEx_AccessKR1CViolation          -> 0x1d
-    case CapEx_AccessKR2CViolation          -> 0x1e
+    case CapEx_AccessEPCCViolation          -> 0x18
+    case CapEx_AccessKDCViolation           -> 0x18
+    case CapEx_AccessKCCViolation           -> 0x18
+    case CapEx_AccessKR1CViolation          -> 0x18
+    case CapEx_AccessKR2CViolation          -> 0x18
   }
 
 typedef CapCauseReg = register bits [15:0] {
-- 
cgit v1.2.3