diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-07-06 03:25:04 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2016-07-06 03:25:22 -0700 |
| commit | a33293e38b42ef0c8ef9f932a2721dfd5b95a622 (patch) | |
| tree | 3e4f05d216e1dac516e609c29335999770f61df7 | |
| parent | 795c81a287bde70c6d8029a812f0a76e83823d68 (diff) | |
| download | riscv-tests-a33293e38b42ef0c8ef9f932a2721dfd5b95a622.zip riscv-tests-a33293e38b42ef0c8ef9f932a2721dfd5b95a622.tar.gz riscv-tests-a33293e38b42ef0c8ef9f932a2721dfd5b95a622.tar.bz2 | |
Update to new PTE format
| m--------- | env | 10 | ||||
| -rw-r--r-- | isa/rv64mi/dirty.S | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/env b/env -Subproject 260b6fff32036dcfc8299aa21dd7cd443b18bb6 +Subproject 5c613fe43d1bc44e6ae408b5356c7d60d93a1ca diff --git a/isa/rv64mi/dirty.S b/isa/rv64mi/dirty.S index 9de358b..66ed5a0 100644 --- a/isa/rv64mi/dirty.S +++ b/isa/rv64mi/dirty.S @@ -44,7 +44,7 @@ RVTEST_CODE_BEGIN # Make sure R and D bits are set lw t0, page_table_2 - li t1, PTE_R | PTE_D + li t1, PTE_A | PTE_D and t0, t0, t1 bne t0, t1, die @@ -58,7 +58,7 @@ stvec_handler: bne TESTNUM, t1, 1f # Make sure R bit is set lw t0, page_table_1 - li t1, PTE_R + li t1, PTE_A and t0, t0, t1 bne t0, t1, die @@ -84,9 +84,9 @@ RVTEST_DATA_BEGIN TEST_DATA .align 12 -page_table_1: .dword (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_TYPE_URX_SRX +page_table_1: .dword (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_U | PTE_R | PTE_X dummy: .dword 0 .align 12 -page_table_2: .dword (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_TYPE_URWX_SRWX +page_table_2: .dword (DRAM_BASE/RISCV_PGSIZE << PTE_PPN_SHIFT) | PTE_V | PTE_U | PTE_R | PTE_X | PTE_W RVTEST_DATA_END |