From: Anton Johansson <anjo@rev.ng>
Date: Mon, 27 Feb 2023 13:51:57 +0000 (+0100)
Subject: target/i386: Replace `tb_pc()` with `tb->pc`
X-Git-Tag: v8.0.0-rc0~40^2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=v7.2.0-1854-g34a39c2443;p=thirdparty%2Fqemu.git

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

Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230227135202.9710-23-anjo@rev.ng>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/i386/tcg/tcg-cpu.c b/target/i386/tcg/tcg-cpu.c
index c090ce152bb..b942c306d60 100644
--- a/target/i386/tcg/tcg-cpu.c
+++ b/target/i386/tcg/tcg-cpu.c
@@ -52,7 +52,7 @@ static void x86_cpu_synchronize_from_tb(CPUState *cs,
     /* The instruction pointer is always up to date with CF_PCREL. */
     if (!(tb_cflags(tb) & CF_PCREL)) {
         CPUX86State *env = cs->env_ptr;
-        env->eip = tb_pc(tb) - tb->cs_base;
+        env->eip = tb->pc - tb->cs_base;
     }
 }