diff options
| author | Yunsup Lee <yunsup@cs.berkeley.edu> | 2013-04-22 15:00:10 -0700 |
|---|---|---|
| committer | Yunsup Lee <yunsup@cs.berkeley.edu> | 2013-04-22 15:00:10 -0700 |
| commit | d6df54dfc3deecde86b4314e84fc0904607290f6 (patch) | |
| tree | 4f02903c52ace21eaf932b58ed3e2ae1c0c65019 | |
| parent | 81ad66f25ce4c15180e558696961bd8eaf967fea (diff) | |
| download | riscv-tests-d6df54dfc3deecde86b4314e84fc0904607290f6.zip riscv-tests-d6df54dfc3deecde86b4314e84fc0904607290f6.tar.gz riscv-tests-d6df54dfc3deecde86b4314e84fc0904607290f6.tar.bz2 | |
get rid of RVTEST_PASS_NOFP
| -rw-r--r-- | env/p/riscv_test.h | 6 | ||||
| -rw-r--r-- | env/pm/riscv_test.h | 6 | ||||
| -rw-r--r-- | env/pt/riscv_test.h | 6 | ||||
| -rw-r--r-- | env/v/riscv_test.h | 2 | ||||
| -rw-r--r-- | env/v/vm.c | 9 |
5 files changed, 0 insertions, 29 deletions
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 //----------------------------------------------------------------------- @@ -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); |