From 7f5d59f657b25bdd5bebdc6c8875c8cd629dd330 Mon Sep 17 00:00:00 2001
From: Andrew Waterman <andrew@sifive.com>
Date: Thu, 9 Mar 2017 12:43:01 -0800
Subject: [PATCH 1/1] Check mbadaddr in ma_addr test

---
 env                  | 2 +-
 isa/rv64mi/ma_addr.S | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/env b/env
index 9e219c9..00d8922 160000
--- a/env
+++ b/env
@@ -1 +1 @@
-Subproject commit 9e219c9ca70459bfda9067d637bb8bf52c5f0326
+Subproject commit 00d8922398c202c13d6eb5da07e92be6364309a1
diff --git a/isa/rv64mi/ma_addr.S b/isa/rv64mi/ma_addr.S
index be3572f..ba96606 100644
--- a/isa/rv64mi/ma_addr.S
+++ b/isa/rv64mi/ma_addr.S
@@ -22,6 +22,7 @@ RVTEST_CODE_BEGIN
 
 #define MISALIGNED_LDST_TEST(testnum, insn, base, offset) \
   li TESTNUM, testnum; \
+  addi t1, base, offset; \
   insn x0, offset(base); \
   j fail \
 
@@ -70,6 +71,9 @@ mtvec_handler:
   csrr t0, mcause
   bne t0, s1, fail
 
+  csrr t0, mbadaddr
+  bne t0, t1, fail
+
   csrr t0, mepc
   addi t0, t0, 8
   csrw mepc, t0
-- 
2.30.2