motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-14 21:52:18 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

target/hppa: Replace tb_pc() with tb->pc

Browse source 
Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230227135202.9710-24-anjo@rev.ng>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Anton Johansson 2023-02-27 14:51:58 +01:00 • committed by Richard Henderson
parent 34a39c2443
commit 2554f80f38
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
target/hppa/cpu.c
View file

@ -26,7 +26,7 @@
#include "qemu/module.h" #include "qemu/module.h"
#include "exec/exec-all.h" #include "exec/exec-all.h"
#include "fpu/softfloat.h" #include "fpu/softfloat.h"
#include "tcg/tcg.h"
static void hppa_cpu_set_pc(CPUState *cs, vaddr value) static void hppa_cpu_set_pc(CPUState *cs, vaddr value)
{ {
@ -48,8 +48,10 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs,
{ {
HPPACPU *cpu = HPPA_CPU(cs); HPPACPU *cpu = HPPA_CPU(cs);
tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL));
#ifdef CONFIG_USER_ONLY #ifdef CONFIG_USER_ONLY
cpu->env.iaoq_f = tb_pc(tb); cpu->env.iaoq_f = tb->pc;
cpu->env.iaoq_b = tb->cs_base; cpu->env.iaoq_b = tb->cs_base;
#else #else
/* Recover the IAOQ values from the GVA + PRIV. */ /* Recover the IAOQ values from the GVA + PRIV. */
@ -59,7 +61,7 @@ static void hppa_cpu_synchronize_from_tb(CPUState *cs,
int32_t diff = cs_base; int32_t diff = cs_base;
cpu->env.iasq_f = iasq_f; cpu->env.iasq_f = iasq_f;
cpu->env.iaoq_f = (tb_pc(tb) & ~iasq_f) + priv; cpu->env.iaoq_f = (tb->pc & ~iasq_f) + priv;
if (diff) { if (diff) {
cpu->env.iaoq_b = cpu->env.iaoq_f + diff; cpu->env.iaoq_b = cpu->env.iaoq_f + diff;
} }