diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-02-08 00:13:48 -0800 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-02-08 00:13:48 -0800 |
| commit | e671e751982cfa065bb6430a0b5b33cd5f9ddfec (patch) | |
| tree | de3391e3c20d1c8d6d8bafd5f4b8fb01b3f7464f /riscv/decode.h | |
| parent | d8022e9eda1d83211b42c523483f6d9f7da3cefa (diff) | |
| download | spike-e671e751982cfa065bb6430a0b5b33cd5f9ddfec.zip spike-e671e751982cfa065bb6430a0b5b33cd5f9ddfec.tar.gz spike-e671e751982cfa065bb6430a0b5b33cd5f9ddfec.tar.bz2 | |
Use xlen, not xprlen, to refer to x-register width
Diffstat (limited to 'riscv/decode.h')
| -rw-r--r-- | riscv/decode.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/riscv/decode.h b/riscv/decode.h index 274ab2a..6ac465a 100644 --- a/riscv/decode.h +++ b/riscv/decode.h @@ -135,7 +135,7 @@ private: if(rm > 4) throw trap_illegal_instruction(); \ rm; }) -#define xpr64 (xprlen == 64) +#define xpr64 (xlen == 64) #define require_supervisor if(unlikely(!(STATE.sr & SR_S))) throw trap_privileged_instruction() #define require_xpr64 if(unlikely(!xpr64)) throw trap_illegal_instruction() @@ -147,16 +147,16 @@ private: #endif #define require_accelerator if(unlikely(!(STATE.sr & SR_EA))) throw trap_accelerator_disabled() -#define cmp_trunc(reg) (reg_t(reg) << (64-xprlen)) +#define cmp_trunc(reg) (reg_t(reg) << (64-xlen)) #define set_fp_exceptions ({ STATE.fflags |= softfloat_exceptionFlags; \ softfloat_exceptionFlags = 0; }) #define sext32(x) ((sreg_t)(int32_t)(x)) #define zext32(x) ((reg_t)(uint32_t)(x)) -#define sext_xprlen(x) (((sreg_t)(x) << (64-xprlen)) >> (64-xprlen)) -#define zext_xprlen(x) (((reg_t)(x) << (64-xprlen)) >> (64-xprlen)) +#define sext_xlen(x) (((sreg_t)(x) << (64-xlen)) >> (64-xlen)) +#define zext_xlen(x) (((reg_t)(x) << (64-xlen)) >> (64-xlen)) -#define set_pc(x) (npc = sext_xprlen(x)) +#define set_pc(x) (npc = sext_xlen(x)) #define validate_csr(which, write) ({ \ unsigned my_priv = (STATE.sr & SR_S) ? 1 : 0; \ |