From: Yunsup Lee <yunsup@cs.berkeley.edu>
Date: Mon, 22 Apr 2013 22:00:10 +0000 (-0700)
Subject: get rid of RVTEST_PASS_NOFP
X-Git-Url: https://git.libre-soc.org/?p=riscv-tests.git;a=commitdiff_plain;h=d6df54dfc3deecde86b4314e84fc0904607290f6

get rid of RVTEST_PASS_NOFP
---

diff --git a/env/p/riscv_test.h b/env/p/riscv_test.h
index a4f9668..480811d 100644
--- 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 102e6e0..357fd3d 100644
--- 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 4c42803..b0ec8d7 100644
--- 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 4d9cceb..e37ec05 100644
--- 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 37ef19e..7e1e570 100644
--- 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);