diff options
| author | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-10-29 13:08:32 -0700 |
|---|---|---|
| committer | Andrew Waterman <waterman@cs.berkeley.edu> | 2015-11-12 17:52:56 -0800 |
| commit | a7bde15c2b79de12484748b462e511e0d1c2eca5 (patch) | |
| tree | 7f4e6c79a93a3d4b7a0be727ddd0736c53b067b5 /riscv/decode.h | |
| parent | 0e3fde1bb5db23a4235cf3a3ec8ef5ccb8b104b6 (diff) | |
| download | riscv-isa-sim-a7bde15c2b79de12484748b462e511e0d1c2eca5.zip riscv-isa-sim-a7bde15c2b79de12484748b462e511e0d1c2eca5.tar.gz riscv-isa-sim-a7bde15c2b79de12484748b462e511e0d1c2eca5.tar.bz2 | |
Access FP regs through a macro
This makes it easier to hook into them.
Diffstat (limited to 'riscv/decode.h')
| -rw-r--r-- | riscv/decode.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/riscv/decode.h b/riscv/decode.h index 5cb4ed3..a9713f4 100644 --- a/riscv/decode.h +++ b/riscv/decode.h @@ -122,6 +122,7 @@ private: #define MMU (*p->get_mmu()) #define STATE (*p->get_state()) #define READ_REG(reg) STATE.XPR[reg] +#define READ_FREG(reg) STATE.FPR[reg] #define RS1 READ_REG(insn.rs1()) #define RS2 READ_REG(insn.rs2()) #define WRITE_RD(value) WRITE_REG(insn.rd(), value) @@ -150,14 +151,14 @@ private: #define RVC_RS2 READ_REG(insn.rvc_rs2()) #define RVC_RS1S READ_REG(insn.rvc_rs1s()) #define RVC_RS2S READ_REG(insn.rvc_rs2s()) -#define RVC_FRS2 STATE.FPR[insn.rvc_rs2()] -#define RVC_FRS2S STATE.FPR[insn.rvc_rs2s()] +#define RVC_FRS2 READ_FREG(insn.rvc_rs2()) +#define RVC_FRS2S READ_FREG(insn.rvc_rs2s()) #define RVC_SP READ_REG(X_SP) // FPU macros -#define FRS1 STATE.FPR[insn.rs1()] -#define FRS2 STATE.FPR[insn.rs2()] -#define FRS3 STATE.FPR[insn.rs3()] +#define FRS1 READ_FREG(insn.rs1()) +#define FRS2 READ_FREG(insn.rs2()) +#define FRS3 READ_FREG(insn.rs3()) #define dirty_fp_state (STATE.mstatus |= MSTATUS_FS | (xlen == 64 ? MSTATUS64_SD : MSTATUS32_SD)) #define dirty_ext_state (STATE.mstatus |= MSTATUS_XS | (xlen == 64 ? MSTATUS64_SD : MSTATUS32_SD)) #define DO_WRITE_FREG(reg, value) (STATE.FPR.write(reg, value), dirty_fp_state) |