get rid of RVTEST_PASS_NOFP

diff --git a/env/p/riscv_test.h b/env/p/riscv_test.h
index a4f96687581ea3d06a6f96df5b8036967d86d8b6..480811da79027700f22a4fed876dff843d4c40a5 100644 (file)
--- a/env/p/riscv_test.h
+++ b/env/p/riscv_test.h
@@ -17,12 +17,6 @@
   mtfsr x0;                                                             \
 1:
 
-#define RVTEST_PASS_NOFP                                                \
-  RVTEST_FP_ENABLE                                                      \
-  bnez a0, 2f;                                                          \
-  RVTEST_PASS                                                           \
-2:                                                                      \
-
 #define RVTEST_VEC_ENABLE                                               \
   mfpcr a0, cr0;                                                        \
   ori   a0, a0, 4;                                                      \

diff --git a/env/pm/riscv_test.h b/env/pm/riscv_test.h
index 102e6e0036e9e36cf52c9cbb445c689680ebb87e..357fd3d4990e7727d225c5f8107041f268f2cf7f 100644 (file)
--- a/env/pm/riscv_test.h
+++ b/env/pm/riscv_test.h
@@ -17,12 +17,6 @@
   mtfsr x0;                                                             \
 1:
 
-#define RVTEST_PASS_NOFP                                                \
-  RVTEST_FP_ENABLE                                                      \
-  bnez a0, 2f;                                                          \
-  RVTEST_PASS                                                           \
-2:                                                                      \
-
 #define RVTEST_VEC_ENABLE                                               \
   mfpcr a0, cr0;                                                        \
   ori   a0, a0, 4;                                                      \

diff --git a/env/pt/riscv_test.h b/env/pt/riscv_test.h
index 4c42803cf2ea2ea99217f9c039914a9ab3a1d4da..b0ec8d7f17d50dd6cd9f2056ce2eb413b384e586 100644 (file)
--- a/env/pt/riscv_test.h
+++ b/env/pt/riscv_test.h
@@ -17,12 +17,6 @@
   mtfsr x0;                                                             \
 1:
 
-#define RVTEST_PASS_NOFP                                                \
-  RVTEST_FP_ENABLE                                                      \
-  bnez a0, 2f;                                                          \
-  RVTEST_PASS                                                           \
-2:                                                                      \
-
 #define RVTEST_VEC_ENABLE                                               \
   mfpcr a0, cr0;                                                        \
   ori   a0, a0, 4;                                                      \

diff --git a/env/v/riscv_test.h b/env/v/riscv_test.h
index 4d9cceb83193791ad153405df2e2921e2aa7558d..e37ec05b7c1cdaff779dd71fdc1b706ae897c2d2 100644 (file)
--- a/env/v/riscv_test.h
+++ b/env/v/riscv_test.h
@@ -41,8 +41,6 @@ userstart:                                                              \
 #define RVTEST_PASS li a0, 1; syscall;
 #define RVTEST_FAIL sll a0, x28, 1; 1:beqz a0, 1b; or a0, a0, 1; syscall;
 
-#define RVTEST_PASS_NOFP li a0, 1234; syscall;
-
 //-----------------------------------------------------------------------
 // Data Section Macro
 //-----------------------------------------------------------------------

diff --git a/env/v/vm.c b/env/v/vm.c
index 37ef19e0e102359bcb9dfe5f1d181ab773528ea5..7e1e570b908c41a7f2a9b7be7f47b64b116580e9 100644 (file)
--- a/env/v/vm.c
+++ b/env/v/vm.c
@@ -176,15 +176,6 @@ void handle_trap(trapframe_t* tf)
   if (tf->cause == CAUSE_SYSCALL)
   {
     int n = tf->gpr[18];
-    if (n == 1234) // TEST_PASS_NOFP
-    {
-      if (mfpcr(PCR_SR) & SR_EF)
-      {
-        tf->epc += 4;
-        goto out;
-      }
-      n = 1;
-    }
 
     for (long i = 1; i < MAX_TEST_PAGES; i++)
       evict(i*PGSIZE);