projects
/
riscv-tests.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3d28420
)
Fix rv64mi-csr for the case where U-mode is not available. (#86)
author
Richard Xia
<richardxia@richardxia.com>
Fri, 27 Oct 2017 04:33:49 +0000
(21:33 -0700)
committer
Andrew Waterman
<aswaterman@gmail.com>
Fri, 27 Oct 2017 04:33:49 +0000
(21:33 -0700)
isa/rv64si/csr.S
patch
|
blob
|
history
diff --git
a/isa/rv64si/csr.S
b/isa/rv64si/csr.S
index 83e9cae243ae80a9a2bea06d36f545ceb1b306aa..292e298608b8816def05c98ff14a46c898811c4e 100644
(file)
--- a/
isa/rv64si/csr.S
+++ b/
isa/rv64si/csr.S
@@
-26,7
+26,23
@@
RVTEST_CODE_BEGIN
# For RV64, make sure UXL encodes RV64. (UXL does not exist for RV32.)
#if __riscv_xlen == 64
# For RV64, make sure UXL encodes RV64. (UXL does not exist for RV32.)
#if __riscv_xlen == 64
+ # If running in M mode, read misa to check existence of U mode.
+ # Otherwise, if in S mode, then U mode must exist and we don't need to check.
+#ifdef __MACHINE_MODE
+ csrr a0, misa
+ srli a0, a0, 'U' - 'A'
+ andi a0, a0, 1
+ beqz a0, 1f
+#endif
+ # If U mode is present, UXL should be 2 (XLEN = 64-bit)
TEST_CASE(13, a0, SSTATUS_UXL & (SSTATUS_UXL << 1), csrr a0, sstatus; li a1, SSTATUS_UXL; and a0, a0, a1)
TEST_CASE(13, a0, SSTATUS_UXL & (SSTATUS_UXL << 1), csrr a0, sstatus; li a1, SSTATUS_UXL; and a0, a0, a1)
+#ifdef __MACHINE_MODE
+ j 2f
+1:
+ # If U mode is not present, UXL should be 0
+ TEST_CASE(14, a0, 0, csrr a0, sstatus; li a1, SSTATUS_UXL; and a0, a0, a1)
+2:
+#endif
#endif
csrwi sscratch, 3
#endif
csrwi sscratch, 3