Add PMP checks to physical memory accesses.

- unify AccessType and ReadType since they were essentially redundant,
  making it easier to implement PMP checks for ReadWrite/atomic accesses.
- add command line options to enable PMP in the platform
- also fix the matching for the case when all entries are off

1 files changed, 5 insertions, 5 deletions

diff --git a/model/riscv_vmem_rv64.sail b/model/riscv_vmem_rv64.sail
index cb2d1e5..e3cca0b 100644
--- a/model/riscv_vmem_rv64.sail
+++ b/model/riscv_vmem_rv64.sail
@@ -33,11 +33,11 @@ function translationMode(priv) = {
 
 /* Top-level address translation dispatcher */
 
-val translateAddr : (xlenbits, AccessType, ReadType) -> TR_Result(xlenbits, ExceptionType) effect {escape, rmem, rreg, wmv, wmvt, wreg}
-function translateAddr(vAddr, ac, rt) = {
-  let effPriv : Privilege = match rt {
-    Instruction => cur_privilege,
-    Data        => effectivePrivilege(mstatus, cur_privilege)
+val translateAddr : (xlenbits, AccessType) -> TR_Result(xlenbits, ExceptionType) effect {escape, rmem, rreg, wmv, wmvt, wreg}
+function translateAddr(vAddr, ac) = {
+  let effPriv : Privilege = match ac {
+    Execute => cur_privilege,
+    _       => effectivePrivilege(mstatus, cur_privilege)
   };
   let mxr    : bool   = mstatus.MXR() == true;
   let do_sum : bool   = mstatus.SUM() == true;