In loading caps w/o cap authority, shed tag sooner

FIXES #13
CHERIoT-Platform · Mar 1, 2024 · 13df603 · 13df603
1 parent 37fa2e0
commit 13df603
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/cheri_insts.sail b/src/cheri_insts.sail
@@ -798,6 +798,9 @@ function clause execute LoadCapImm(cd, cs1, imm) = {
       match c {
         MemValue(v) => {
           var cr = v;
+          if ptw_info.ptw_lc == PTW_LC_CLEAR  | not(auth_val.permit_load_store_cap) then {
+            cr.tag = false;
+          };
           if cr.tag & not(auth_val.permit_load_global) then {
             /* Without load-global authority, the loaded cap is always local */
             cr.global = false;
@@ -825,9 +828,6 @@ function clause execute LoadCapImm(cd, cs1, imm) = {
             cr.permit_store = false;
             cr.permit_load_mutable = false;
           };
-          if ptw_info.ptw_lc == PTW_LC_CLEAR  | not(auth_val.permit_load_store_cap) then {
-            cr.tag = false;
-          };
           /* Sealing capabilities are excluded from revocation */
           let isSealingCap = cr.permit_seal | cr.permit_unseal | cr.perm_user0;
           if (cr.tag & not(isSealingCap)) then {