summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Waterman <aswaterman@gmail.com>2015-01-04 21:30:39 -0800
committerAndrew Waterman <aswaterman@gmail.com>2015-01-04 21:30:39 -0800
commit1a95807a08d3d87e3fb9176f275a5ca6bfbd0afe (patch)
tree6e4b1a24a39d57364e58ee9478a264857f084952
parent9be35353ecb3252ec62b86d446c43ba89843b0b4 (diff)
downloadenv-1a95807a08d3d87e3fb9176f275a5ca6bfbd0afe.zip
env-1a95807a08d3d87e3fb9176f275a5ca6bfbd0afe.tar.gz
env-1a95807a08d3d87e3fb9176f275a5ca6bfbd0afe.tar.bz2
Avoid deprecated "b" pseudo-op; use "j" instead
-rw-r--r--p/riscv_test.h4
-rw-r--r--pt/riscv_test.h6
2 files changed, 5 insertions, 5 deletions
diff --git a/p/riscv_test.h b/p/riscv_test.h
index dd5c1b8..d92f2fe 100644
--- a/p/riscv_test.h
+++ b/p/riscv_test.h
@@ -102,7 +102,7 @@ _start: \
#define RVTEST_PASS \
fence; \
csrw tohost, 1; \
-1: b 1b; \
+1: j 1b; \
#define TESTNUM x28
#define RVTEST_FAIL \
@@ -111,7 +111,7 @@ _start: \
sll TESTNUM, TESTNUM, 1; \
or TESTNUM, TESTNUM, 1; \
csrw tohost, TESTNUM; \
-1: b 1b; \
+1: j 1b; \
//-----------------------------------------------------------------------
// Data Section Macro
diff --git a/pt/riscv_test.h b/pt/riscv_test.h
index 3370ec2..ebe8109 100644
--- a/pt/riscv_test.h
+++ b/pt/riscv_test.h
@@ -6,7 +6,7 @@
#undef EXTRA_INIT_TIMER
#define EXTRA_INIT_TIMER \
ENABLE_TIMER_INTERRUPT; \
- b 6f; \
+ j 6f; \
XCPT_HANDLER; \
6:
@@ -74,14 +74,14 @@ _handler: \
_pass: \
fence; \
csrw tohost, 1; \
-1: b 1b; \
+1: j 1b; \
_fail: \
fence; \
beqz TESTNUM, 1f; \
sll TESTNUM, TESTNUM, 1; \
or TESTNUM, TESTNUM, 1; \
csrw tohost, TESTNUM; \
-1: b 1b; \
+1: j 1b; \
_cont: \
csrr a0,impl; \
li a1,IMPL_ROCKET; \