diff options
| author | Richard Henderson | 2022-08-15 22:16:06 +0200 |
|---|---|---|
| committer | Richard Henderson | 2022-10-04 21:13:12 +0200 |
| commit | fbf59aad178d98afe193fa872a2d880266a75269 (patch) | |
| tree | 05d5fb4a7118f1a70eb0a09a1269f859f822502e /target/mips | |
| parent | hw/core: Add CPUClass.get_pc (diff) | |
| download | qemu-fbf59aad178d98afe193fa872a2d880266a75269.tar.gz qemu-fbf59aad178d98afe193fa872a2d880266a75269.tar.xz qemu-fbf59aad178d98afe193fa872a2d880266a75269.zip | |
accel/tcg: Introduce tb_pc and log_pc
The availability of tb->pc will shortly be conditional.
Introduce accessor functions to minimize ifdefs.
Pass around a known pc to places like tcg_gen_code,
where the caller must already have the value.
Reviewed-by: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/mips')
| -rw-r--r-- | target/mips/tcg/exception.c | 2 | ||||
| -rw-r--r-- | target/mips/tcg/sysemu/special_helper.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/target/mips/tcg/exception.c b/target/mips/tcg/exception.c index 2bd77a61de..96e61170e6 100644 --- a/target/mips/tcg/exception.c +++ b/target/mips/tcg/exception.c @@ -82,7 +82,7 @@ void mips_cpu_synchronize_from_tb(CPUState *cs, const TranslationBlock *tb) MIPSCPU *cpu = MIPS_CPU(cs); CPUMIPSState *env = &cpu->env; - env->active_tc.PC = tb->pc; + env->active_tc.PC = tb_pc(tb); env->hflags &= ~MIPS_HFLAG_BMASK; env->hflags |= tb->flags & MIPS_HFLAG_BMASK; } diff --git a/target/mips/tcg/sysemu/special_helper.c b/target/mips/tcg/sysemu/special_helper.c index f4f8fe8afc..3c5f35c759 100644 --- a/target/mips/tcg/sysemu/special_helper.c +++ b/target/mips/tcg/sysemu/special_helper.c @@ -94,7 +94,7 @@ bool mips_io_recompile_replay_branch(CPUState *cs, const TranslationBlock *tb) CPUMIPSState *env = &cpu->env; if ((env->hflags & MIPS_HFLAG_BMASK) != 0 - && env->active_tc.PC != tb->pc) { + && env->active_tc.PC != tb_pc(tb)) { env->active_tc.PC -= (env->hflags & MIPS_HFLAG_B16 ? 2 : 4); env->hflags &= ~MIPS_HFLAG_BMASK; return true; |