diff options
| author | Andrew Waterman <andrew@sifive.com> | 2016-12-06 17:04:14 -0800 |
|---|---|---|
| committer | Andrew Waterman <andrew@sifive.com> | 2016-12-06 17:04:14 -0800 |
| commit | 56f46aa0f9688c87ce9ebd7658e19b884b018b6b (patch) | |
| tree | 516d33de0c78bab0968f8548f7223160d8bba6fb /debug/programs | |
| parent | b68b39031a730ecc155ed87fba2ed5f111d0ab07 (diff) | |
| download | riscv-tests-56f46aa0f9688c87ce9ebd7658e19b884b018b6b.zip riscv-tests-56f46aa0f9688c87ce9ebd7658e19b884b018b6b.tar.gz riscv-tests-56f46aa0f9688c87ce9ebd7658e19b884b018b6b.tar.bz2 | |
avoid non-standard predefined macros
Diffstat (limited to 'debug/programs')
| -rwxr-xr-x | debug/programs/entry.S | 2 | ||||
| -rw-r--r-- | debug/programs/mprv.S | 4 | ||||
| -rw-r--r-- | debug/programs/regs.S | 2 | ||||
| -rw-r--r-- | debug/programs/trigger.S | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/debug/programs/entry.S b/debug/programs/entry.S index 6dc694f..a2c7304 100755 --- a/debug/programs/entry.S +++ b/debug/programs/entry.S @@ -5,7 +5,7 @@ #define STACK_SIZE 512 -#ifdef __riscv64 +#if __riscv_xlen == 64 # define LREG ld # define SREG sd # define REGBYTES 8 diff --git a/debug/programs/mprv.S b/debug/programs/mprv.S index 115ccb5..5e21607 100644 --- a/debug/programs/mprv.S +++ b/debug/programs/mprv.S @@ -12,7 +12,7 @@ main: # update mstatus csrr t1, CSR_MSTATUS -#ifdef __riscv32 +#if __riscv_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: -#ifdef __riscv32 +#if __riscv_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/regs.S b/debug/programs/regs.S index 2cacd4f..5c4f462 100644 --- a/debug/programs/regs.S +++ b/debug/programs/regs.S @@ -1,4 +1,4 @@ -#ifdef __riscv64 +#if __riscv_xlen == 64 # define LREG ld # define SREG sd # define REGBYTES 8 diff --git a/debug/programs/trigger.S b/debug/programs/trigger.S index 1efafc7..48cd68b 100644 --- a/debug/programs/trigger.S +++ b/debug/programs/trigger.S @@ -1,6 +1,6 @@ #include "../../env/encoding.h" -#ifdef __riscv64 +#if __riscv_xlen == 64 # define LREG ld # define SREG sd # define REGBYTES 8 @@ -12,7 +12,7 @@ #undef MCONTROL_TYPE #undef MCONTROL_DMODE -#ifdef __riscv64 +#if __riscv_xlen == 64 # define MCONTROL_TYPE (0xf<<(64-4)) # define MCONTROL_DMODE (1<<(64-5)) #else |