projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8023d1a
)
target/riscv: Replace `tb_pc()` with `tb->pc`
author
Anton Johansson
<anjo@rev.ng>
Mon, 27 Feb 2023 13:51:52 +0000
(14:51 +0100)
committer
Richard Henderson
<richard.henderson@linaro.org>
Wed, 1 Mar 2023 17:33:14 +0000
(07:33 -1000)
Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Palmer Dabbelt <palmer@rivosinc.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <
20230227135202
.9710-18-anjo@rev.ng>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
target/riscv/cpu.c
patch
|
blob
|
history
diff --git
a/target/riscv/cpu.c
b/target/riscv/cpu.c
index 93b52b826c7d057b7e24761fef879f6f8e1747a4..9eb748a283f15fc9748c854ca07a17e3e988eadc 100644
(file)
--- a/
target/riscv/cpu.c
+++ b/
target/riscv/cpu.c
@@
-34,6
+34,7
@@
#include "fpu/softfloat-helpers.h"
#include "sysemu/kvm.h"
#include "kvm_riscv.h"
+#include "tcg/tcg.h"
/* RISC-V CPU definitions */
@@
-533,10
+534,12
@@
static void riscv_cpu_synchronize_from_tb(CPUState *cs,
CPURISCVState *env = &cpu->env;
RISCVMXL xl = FIELD_EX32(tb->flags, TB_FLAGS, XL);
+ tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL));
+
if (xl == MXL_RV32) {
- env->pc = (int32_t)
tb_pc(tb)
;
+ env->pc = (int32_t)
tb->pc
;
} else {
- env->pc = tb
_pc(tb)
;
+ env->pc = tb
->pc
;
}
}