From 057b1432679ded5dce4149797fa624205baee62e Mon Sep 17 00:00:00 2001
From: Andrew Waterman <waterman@cs.berkeley.edu>
Date: Thu, 10 Mar 2016 14:47:44 -0800
Subject: Add missing rv32mi/rv32si tests

---
 isa/rv32mi/Makefrag |  3 +++
 isa/rv32mi/dirty.S  | 10 ++++++++++
 isa/rv32mi/mcsr.S   |  7 +++++++
 isa/rv32mi/wfi.S    |  8 ++++++++
 4 files changed, 28 insertions(+)
 create mode 100644 isa/rv32mi/dirty.S
 create mode 100644 isa/rv32mi/mcsr.S
 create mode 100644 isa/rv32mi/wfi.S

(limited to 'isa/rv32mi')

diff --git a/isa/rv32mi/Makefrag b/isa/rv32mi/Makefrag
index 3a5b376..66a0e39 100644
--- a/isa/rv32mi/Makefrag
+++ b/isa/rv32mi/Makefrag
@@ -4,13 +4,16 @@
 
 rv32mi_sc_tests = \
 	csr \
+	dirty \
 	illegal \
 	ma_fetch \
 	ma_addr \
+	mcsr \
 	scall \
 	sbreak \
 	shamt \
 	timer \
+	wfi \
 
 rv32mi_mc_tests = \
 	ipi \
diff --git a/isa/rv32mi/dirty.S b/isa/rv32mi/dirty.S
new file mode 100644
index 0000000..c1f9d19
--- /dev/null
+++ b/isa/rv32mi/dirty.S
@@ -0,0 +1,10 @@
+# See LICENSE for license details.
+
+#include "riscv_test.h"
+#undef RVTEST_RV64M
+#define RVTEST_RV64M RVTEST_RV32M
+
+#undef VM_SV39
+#define VM_SV39 VM_SV32
+
+#include "../rv64mi/dirty.S"
diff --git a/isa/rv32mi/mcsr.S b/isa/rv32mi/mcsr.S
new file mode 100644
index 0000000..0d5a5cd
--- /dev/null
+++ b/isa/rv32mi/mcsr.S
@@ -0,0 +1,7 @@
+# See LICENSE for license details.
+
+#include "riscv_test.h"
+#undef RVTEST_RV64M
+#define RVTEST_RV64M RVTEST_RV32M
+
+#include "../rv64mi/mcsr.S"
diff --git a/isa/rv32mi/wfi.S b/isa/rv32mi/wfi.S
new file mode 100644
index 0000000..d5cb3cb
--- /dev/null
+++ b/isa/rv32mi/wfi.S
@@ -0,0 +1,8 @@
+# See LICENSE for license details.
+
+#include "riscv_test.h"
+#undef RVTEST_RV64S
+#define RVTEST_RV64S RVTEST_RV32M
+#define __MACHINE_MODE
+
+#include "../rv64si/wfi.S"
-- 
cgit v1.1