Revert to old AUIPC definition

diff --git a/isa/Makefile b/isa/Makefile
index 8cecab932071674272f6d7327151090b314221d8..b876406bc6ebbb428a8f023fae24d9b91d94b54c 100644 (file)
--- a/isa/Makefile
+++ b/isa/Makefile
@@ -19,7 +19,7 @@ default: all
 #--------------------------------------------------------------------
 
 RISCV_GCC = riscv-gcc
-RISCV_GCC_OPTS = -nostdlib -nostartfiles -Wa,-march=RVIMAFDXhwacha
+RISCV_GCC_OPTS = -fpic -nostdlib -nostartfiles -Wa,-march=RVIMAFDXhwacha
 RISCV_OBJDUMP = riscv-objdump --disassemble-all --section=.text --section=.data --section=.bss
 RISCV_SIM = spike --extension=hwacha
 

diff --git a/isa/rv32ui/auipc.S b/isa/rv32ui/auipc.S
index b5dbf88bec10bc3542ffc9b4e7b62f8e74211f02..cca7781d7a1cd461da9de97298ffc6c8afacda84 100644 (file)
--- a/isa/rv32ui/auipc.S
+++ b/isa/rv32ui/auipc.S
@@ -11,22 +11,18 @@
 RVTEST_RV32U
 RVTEST_CODE_BEGIN
 
-  TEST_CASE(2, a0, 1<<12, \
+  TEST_CASE(2, a0, 10000, \
     .align 3; \
-    auipc a0, 0x00001; \
+    lla a0, 1f + 10000; \
     jal a1, 1f; \
-    1: srl a1, a1, 12; \
-    sll a1, a1, 12; \
-    sub a0, a0, a1; \
+    1: sub a0, a0, a1; \
   )
 
-  TEST_CASE(3, a0, -1<<12, \
+  TEST_CASE(3, a0, -10000, \
     .align 3; \
-    auipc a0, 0xfffff; \
+    lla a0, 1f - 10000; \
     jal a1, 1f; \
-    1: srl a1, a1, 12; \
-    sll a1, a1, 12; \
-    sub a0, a0, a1; \
+    1: sub a0, a0, a1; \
   )
 
   TEST_PASSFAIL

diff --git a/isa/rv64ui/auipc.S b/isa/rv64ui/auipc.S
index c2b51578dff61de6cf5581f5300adeca37e90955..f5d28ec8687b71832d2cb7146eec2339cb6676d2 100644 (file)
--- a/isa/rv64ui/auipc.S
+++ b/isa/rv64ui/auipc.S
@@ -11,22 +11,18 @@
 RVTEST_RV64U
 RVTEST_CODE_BEGIN
 
-  TEST_CASE(2, a0, 1<<12, \
+  TEST_CASE(2, a0, 10000, \
     .align 3; \
-    auipc a0, 0x00001; \
+    lla a0, 1f + 10000; \
     jal a1, 1f; \
-    1: srl a1, a1, 12; \
-    sll a1, a1, 12; \
-    sub a0, a0, a1; \
+    1: sub a0, a0, a1; \
   )
 
-  TEST_CASE(3, a0, -1<<12, \
+  TEST_CASE(3, a0, -10000, \
     .align 3; \
-    auipc a0, 0xfffff; \
+    lla a0, 1f - 10000; \
     jal a1, 1f; \
-    1: srl a1, a1, 12; \
-    sll a1, a1, 12; \
-    sub a0, a0, a1; \
+    1: sub a0, a0, a1; \
   )
 
   TEST_PASSFAIL