[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 17/27] target/riscv: Replace `tb_pc()` with `tb->pc`
From: |
Anton Johansson |
Subject: |
[PATCH v3 17/27] target/riscv: Replace `tb_pc()` with `tb->pc` |
Date: |
Mon, 27 Feb 2023 14:51:52 +0100 |
Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
target/riscv/cpu.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/target/riscv/cpu.c b/target/riscv/cpu.c
index 93b52b826c..9eb748a283 100644
--- 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;
}
}
--
2.39.1
- [PATCH v3 11/27] accel/tcg: Move jmp-cache `CF_PCREL` checks to caller, (continued)
- [PATCH v3 11/27] accel/tcg: Move jmp-cache `CF_PCREL` checks to caller, Anton Johansson, 2023/02/27
- [PATCH v3 15/27] target/sh4: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 23/27] target/hppa: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 24/27] target/hexagon: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 14/27] target/sparc: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 22/27] target/i386: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 20/27] target/microblaze: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 13/27] target/tricore: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 16/27] target/rx: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 17/27] target/riscv: Replace `tb_pc()` with `tb->pc`,
Anton Johansson <=
- [PATCH v3 18/27] target/openrisc: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 27/27] include/exec: Remove `tb_pc()`, Anton Johansson, 2023/02/27
- [PATCH v3 21/27] target/loongarch: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 25/27] target/avr: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 26/27] target/arm: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- [PATCH v3 19/27] target/mips: Replace `tb_pc()` with `tb->pc`, Anton Johansson, 2023/02/27
- Re: [PATCH v3 00/27] Replace TARGET_TB_PCREL with CF_PCREL, Richard Henderson, 2023/02/27