Nicely display compile failures.

[riscv-tests.git] / isa / rv64ui / jal.S

diff --git a/isa/rv64ui/jal.S b/isa/rv64ui/jal.S
index f51ce1b2c4aee3eb527698940ef10406498184b9..f7f299d210277694f5a9056db6eb1ef770386c53 100644 (file)
--- a/isa/rv64ui/jal.S
+++ b/isa/rv64ui/jal.S
@@ -1,3 +1,5 @@
+# See LICENSE for license details.
+
 #*****************************************************************************
 # jal.S
 #-----------------------------------------------------------------------------
@@ -16,11 +18,11 @@ RVTEST_CODE_BEGIN
   #-------------------------------------------------------------
 
 test_2:
-  li  x28, 2
+  li  TESTNUM, 2
   li  ra, 0
 
+  jal x3, target_2
 linkaddr_2:
-  jal target_2
   nop
   nop
 
@@ -28,22 +30,21 @@ linkaddr_2:
 
 target_2:
   la  x2, linkaddr_2
-  addi x2, x2, 4
-  bne x2, ra, fail
+  bne x2, x3, fail
 
   #-------------------------------------------------------------
   # Test delay slot instructions not executed nor bypassed
   #-------------------------------------------------------------
 
-  TEST_CASE( 3, x2, 3, \
-    li  x2, 1; \
-    jal 1f; \
-    addi x2, x2, 1; \
-    addi x2, x2, 1; \
-    addi x2, x2, 1; \
-    addi x2, x2, 1; \
-1:  addi x2, x2, 1; \
-    addi x2, x2, 1; \
+  TEST_CASE( 3, ra, 3, \
+    li  ra, 1; \
+    jal x0, 1f; \
+    addi ra, ra, 1; \
+    addi ra, ra, 1; \
+    addi ra, ra, 1; \
+    addi ra, ra, 1; \
+1:  addi ra, ra, 1; \
+    addi ra, ra, 1; \
   )
 
   TEST_PASSFAIL