From 68591c3c451dca19d4751eb62861367f2a3e58b5 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Tue, 1 Mar 2011 13:12:31 -0800 Subject: [PATCH] [xcc,sim] branches are pc-relative (not pc+4) again --- riscv/decode.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/riscv/decode.h b/riscv/decode.h index 40b8b5e..d0b92dd 100644 --- 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)) -- 2.30.2