diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-03-24 19:30:14 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-03-24 19:30:14 -0700 |
| commit | a398a9baeccebbf7b8c7bd04edaac5e0d02cd7bf (patch) | |
| tree | b62af6af4660f612f4a810ae77dd45eba2f23f24 | |
| parent | c3378e8d37d38432947451ab26a93bb5ae7eb3a1 (diff) | |
| download | riscv-tests-a398a9baeccebbf7b8c7bd04edaac5e0d02cd7bf.zip riscv-tests-a398a9baeccebbf7b8c7bd04edaac5e0d02cd7bf.tar.gz riscv-tests-a398a9baeccebbf7b8c7bd04edaac5e0d02cd7bf.tar.bz2 | |
Don't assume PRV1/2 and IE1/2 are reset
| m--------- | env | 10 | ||||
| -rw-r--r-- | isa/rv64si/dirty.S | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/env b/env -Subproject afef768f9fef1c224130583fae2b54f92818a79 +Subproject 104ce71726ee9ae95f920b42462afb30baeeb36 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 |