From a398a9baeccebbf7b8c7bd04edaac5e0d02cd7bf Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Tue, 24 Mar 2015 19:30:14 -0700
Subject: [PATCH] Don't assume PRV1/2 and IE1/2 are reset

---
 env                | 2 +-
 isa/rv64si/dirty.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/env b/env
index afef768..104ce71 160000
--- a/env
+++ b/env
@@ -1 +1 @@
-Subproject commit afef768f9fef1c224130583fae2b54f92818a794
+Subproject commit 104ce71726ee9ae95f920b42462afb30baeeb36c
diff --git a/isa/rv64si/dirty.S b/isa/rv64si/dirty.S
index 78e333b..e5f4db6 100644
--- a/isa/rv64si/dirty.S
+++ b/isa/rv64si/dirty.S
@@ -19,7 +19,7 @@ RVTEST_CODE_BEGIN
   la a1, page_table_1
   csrw sptbr, a1
   sfence.vm
-  li a1, (MSTATUS_VM & ~(MSTATUS_VM<<1)) * VM_SV43
+  li a1, ((MSTATUS_VM & ~(MSTATUS_VM<<1)) * VM_SV43) | ((MSTATUS_PRV1 & ~(MSTATUS_PRV1<<1)) * PRV_S)
   csrs mstatus, a1
   la a1, 1f
   csrw mepc, a1
-- 
2.30.2