Use XLEN macro for these sources as well.

All tests pass on spike32 and spike64 again.

diff --git a/debug/programs/entry.S b/debug/programs/entry.S
index a2c730413d91d4462cdf953f33401893f3060941..a5e745d181ff8b25ecfddc673da06dbf7488e690 100755 (executable)
--- a/debug/programs/entry.S
+++ b/debug/programs/entry.S
@@ -5,7 +5,7 @@
 
 #define STACK_SIZE 512
 
-#if __riscv_xlen == 64
+#if XLEN == 64
 # define LREG ld
 # define SREG sd
 # define REGBYTES 8

diff --git a/debug/programs/mprv.S b/debug/programs/mprv.S
index 5e216078b3fd6a86dcab81cae9f18ad2cb46fc58..574f32e62a562a69732dd74af4903f6bf6baa841 100644 (file)
--- a/debug/programs/mprv.S
+++ b/debug/programs/mprv.S
@@ -12,7 +12,7 @@ main:
 
         # update mstatus
         csrr    t1, CSR_MSTATUS
-#if __riscv_xlen == 32
+#if XLEN == 32
         li      t0, (MSTATUS_MPRV | (VM_SV32 << 24))
 #else
         li      t0, (MSTATUS_MPRV | (VM_SV39 << 24))
@@ -38,7 +38,7 @@ data:
 
         .balign 0x1000
 page_table:
-#if __riscv_xlen == 32
+#if XLEN == 32
         .word   ((0x80000000 >> 2) | PTE_V | PTE_R | PTE_W | PTE_X | PTE_G | PTE_U)
 #else
         .word   ((0x80000000 >> 2) | PTE_V | PTE_R | PTE_W | PTE_X | PTE_G | PTE_U)

diff --git a/debug/programs/trigger.S b/debug/programs/trigger.S
index 48cd68b024ee46df6ed2b13343a6cfa648ab2a88..d87b71e1fc35ef0f6f587b84075e68a9497f457a 100644 (file)
--- a/debug/programs/trigger.S
+++ b/debug/programs/trigger.S
@@ -1,6 +1,6 @@
 #include "../../env/encoding.h"
 
-#if __riscv_xlen == 64
+#if XLEN == 64
 # define LREG ld
 # define SREG sd
 # define REGBYTES 8