aboutsummaryrefslogtreecommitdiff
path: root/machine/emulation.c
diff options
context:
space:
mode:
authorAndrew Waterman <andrew@sifive.com>2016-12-06 15:49:59 -0800
committerAndrew Waterman <andrew@sifive.com>2016-12-06 15:49:59 -0800
commitf6b2274af4a91763ecdb94600d7d54d5f7f262b5 (patch)
tree0f4ad8f1df69ea97bb2626573c80854a1838cf53 /machine/emulation.c
parente5ed1d115c178b87807a9d7c966dbaa2b3d3a92e (diff)
downloadpk-f6b2274af4a91763ecdb94600d7d54d5f7f262b5.zip
pk-f6b2274af4a91763ecdb94600d7d54d5f7f262b5.tar.gz
pk-f6b2274af4a91763ecdb94600d7d54d5f7f262b5.tar.bz2
avoid non-standard predefined macros
Diffstat (limited to 'machine/emulation.c')
-rw-r--r--machine/emulation.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/machine/emulation.c b/machine/emulation.c
index d8e0f1e..882daa1 100644
--- a/machine/emulation.c
+++ b/machine/emulation.c
@@ -35,7 +35,7 @@ void illegal_insn_trap(uintptr_t* regs, uintptr_t mcause, uintptr_t mepc)
" .word truly_illegal_insn\n"
#endif
" .word truly_illegal_insn\n"
-#if !defined(__riscv_muldiv) && defined(__riscv64)
+#if !defined(__riscv_muldiv) && __riscv_xlen >= 64
" .word emulate_mul_div32\n"
#else
" .word truly_illegal_insn\n"
@@ -99,7 +99,7 @@ static inline int emulate_read_csr(int num, uintptr_t mstatus, uintptr_t* result
return -1;
*result = *mtime;
return 0;
-#ifdef __riscv32
+#if __riscv_xlen == 32
case CSR_TIMEH:
if (!((counteren >> (CSR_TIME - CSR_CYCLE)) & 1))
return -1;