Switch mips/cheri over to using memory ea/val for writes. Tag is now first byte of value for capability writes. Still need TAGw for now but should kill eventually.

1 files changed, 7 insertions, 3 deletions

diff --git a/mips/mips_wrappers.sail b/mips/mips_wrappers.sail
index cda96b2c..a620f5f3 100644
--- a/mips/mips_wrappers.sail
+++ b/mips/mips_wrappers.sail
@@ -40,12 +40,16 @@ function unit effect {wmem} MEMw_wrapper(addr, size, data) =
       {
         UART_WDATA   := data[31..24];
         UART_WRITTEN := 1;
+      } else {
+        MEMea(addr, size);
+        MEMval(addr, size, data);
       }
-    else
-      MEMw(addr, size, data)
 
 function bool effect {wmem} MEMw_conditional_wrapper(addr, size, data) =
-  MEMw_conditional(addr, size, data)
+    {
+      MEMea_conditional(addr, size);
+      MEMval_conditional(addr, size, data)
+    }
 
 function bit[64] addrWrapper((bit[64]) addr, (MemAccessType) accessType, (WordType) width) =
     addr