updating pmp setup macro

riscv-non-isa · Aug 4, 2023 · 0102159 · 0102159
1 parent 826dbdc
commit 0102159
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/riscv-test-suite/env/test_macros.h b/riscv-test-suite/env/test_macros.h
@@ -987,18 +987,22 @@ RVTEST_SIGUPD_F(swreg,destreg,flagreg)
 #define SETUP_PMP_SVADU_TEST(swreg, offset, TR0, TR1, TR2) \
   li TR0, -1                                 ;\
   csrw pmpaddr0, TR0                         ;\
+  j PMP_exist                                ;\
+  li TR0, 0                                  ;\
+  li TR1, 0                                  ;\
+  j Mend_PMP                                 ;\
+PMP_exist:                                   ;\
   li TR1, PMP_TOR | PMP_X | PMP_W | PMP_R    ;\
   csrw pmpcfg0, TR1                          ;\
   csrr TR2, pmpcfg0                          ;\
-  RVTEST_SIGUPD(x1,TR0,offset)               ;\
-  RVTEST_SIGUPD(x1,TR1,offset)               ;\
-  beq TR1, TR2, M1                           ;\
+  beq TR1, TR2, Mend_PMP                     ;\
+no_TOR_try_NAPOT:                            ;\
   li TR1, PMP_NAPOT | PMP_X | PMP_W | PMP_R  ;\
   csrw pmpcfg0, TR1                          ;\
   csrr TR2, pmpcfg0                          ;\
+Mend_PMP:                                    ;\
   RVTEST_SIGUPD(x1,TR0,offset)               ;\
   RVTEST_SIGUPD(x1,TR1,offset)               ;\
-M1:
 
 #define TEST_SVADU(swreg, PTE_ADDR, VA, offset, menvcfgaddr, hade_bit) \
     sfence.vma                                                                          ;\

diff --git a/riscv-test-suite/rv32i_m/Svadu/src/svadu_sv32.S b/riscv-test-suite/rv32i_m/Svadu/src/svadu_sv32.S
@@ -25,7 +25,6 @@ RVTEST_CODE_BEGIN
 
   # Setup PMP to cover 4G of address space
   SETUP_PMP_SVADU_TEST(x1, offset, t0, t1, t2)
-  bne t1, t2, 1f
 
   # Identity map the page_4k
   la t1, page_4k
@@ -37,7 +36,6 @@ RVTEST_CODE_BEGIN
 
   # test svadu
   TEST_SVADU(x1, s2, page_4k, offset, 0x31a, MENVCFGH_HADE)
-1:
   RVMODEL_HALT
 
 #endif

diff --git a/riscv-test-suite/rv64i_m/Svadu/src/svadu_sv39.S b/riscv-test-suite/rv64i_m/Svadu/src/svadu_sv39.S
@@ -25,7 +25,6 @@ RVTEST_CODE_BEGIN
 
   # Setup PMP to cover 4G of address space
   SETUP_PMP_SVADU_TEST(x1, offset, t0, t1, t2)
-  bne t1, t2, 1f
 
   # Idenity map the page_4k
   la t1, page_4k
@@ -37,7 +36,6 @@ RVTEST_CODE_BEGIN
 
   # test svadu
   TEST_SVADU(x1, s2, page_4k, offset, 0x30a, MENVCFG_HADE)
-1:
   RVMODEL_HALT
 #endif
 RVTEST_CODE_END

diff --git a/riscv-test-suite/rv64i_m/Svadu/src/svadu_sv48.S b/riscv-test-suite/rv64i_m/Svadu/src/svadu_sv48.S
@@ -25,7 +25,6 @@ RVTEST_CODE_BEGIN
 
   # Setup PMP to cover 4G of address space
   SETUP_PMP_SVADU_TEST(x1, offset, t0, t1, t2)
-  bne t1, t2, 1f
 
   # Identity map the page_4k
   la t1, page_4k
@@ -37,7 +36,6 @@ RVTEST_CODE_BEGIN
 
   # test svadu
   TEST_SVADU(x1, s2, page_4k, offset, 0x30a, MENVCFG_HADE)
-1:
   RVMODEL_HALT
 #endif
 RVTEST_CODE_END

diff --git a/riscv-test-suite/rv64i_m/Svadu/src/svadu_sv57.S b/riscv-test-suite/rv64i_m/Svadu/src/svadu_sv57.S
@@ -25,7 +25,6 @@ RVTEST_CODE_BEGIN
 
   # Setup PMP to cover 4G of address space
   SETUP_PMP_SVADU_TEST(x1, offset, t0, t1, t2)
-  bne t1, t2, 1f
 
   # Identity map the page_4k
   la t1, page_4k
@@ -37,7 +36,6 @@ RVTEST_CODE_BEGIN
 
   # test svadu
   TEST_SVADU(x1, s2, page_4k, offset, 0x30a, MENVCFG_HADE)
-1:
   RVMODEL_HALT
 #endif
 RVTEST_CODE_END