[xcc,sim] branches are pc-relative (not pc+4) again

diff --git a/riscv/decode.h b/riscv/decode.h
index 40b8b5e668a1ea8d7387365dca0698178aeb5cb4..d0b92ddc470f7ff8f858b50b6bb4e56cccd827a5 100644 (file)
--- a/riscv/decode.h
+++ b/riscv/decode.h
@@ -178,8 +178,8 @@ private:
 #define SHAMT (insn.itype.imm12 & 0x3F)
 #define SHAMTW (insn.itype.imm12 & 0x1F)
 #define TARGET insn.jtype.target
-#define BRANCH_TARGET (npc + (BIMM << BRANCH_ALIGN_BITS))
-#define JUMP_TARGET (npc + (TARGET << JUMP_ALIGN_BITS))
+#define BRANCH_TARGET (pc + (BIMM << BRANCH_ALIGN_BITS))
+#define JUMP_TARGET (pc + (TARGET << JUMP_ALIGN_BITS))
 #define RM ((insn.ftype.rm != 7) ? insn.ftype.rm : \
             ((fsr & FSR_RD) >> FSR_RD_SHIFT))