From 60e314e4d2a776b9356e47aef4f9fe5863a0c799 Mon Sep 17 00:00:00 2001
From: Paul Donahue <48959409+pdonahue-ventana@users.noreply.github.com>
Date: Fri, 6 Mar 2020 16:24:17 -0800
Subject: Don't assume reset state of mscratch (#254)

* Bump riscv-test-env

* Merge master

* Don't assume that mscratch is initialized to a particular value on reset
---
 env              | 2 +-
 isa/rv64si/csr.S | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/env b/env
index e7010df..500b89f 160000
--- a/env
+++ b/env
@@ -1 +1 @@
-Subproject commit e7010dffc1f0c7152b99d89598534c8963300549
+Subproject commit 500b89fb41ae857f5a1a0d6df382812cfce0b82e
diff --git a/isa/rv64si/csr.S b/isa/rv64si/csr.S
index 2860c8d..3355723 100644
--- a/isa/rv64si/csr.S
+++ b/isa/rv64si/csr.S
@@ -46,8 +46,8 @@ RVTEST_CODE_BEGIN
 #endif
 #endif
 
-  TEST_CASE(15, a0,         0, csrrwi a0, sscratch, 0; csrrwi a0, sscratch, 0xF);
   TEST_CASE(16, a0,         0, csrw sscratch, zero; csrr a0, sscratch);
+  TEST_CASE(15, a0,         0, csrrwi a0, sscratch, 0; csrrwi a0, sscratch, 0xF);
 
   csrwi sscratch, 3
   TEST_CASE( 2, a0,         3, csrr a0, sscratch);
-- 
cgit v1.1