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

target/avr: 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-26-anjo@rev.ng>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---

diff --git a/target/avr/cpu.c b/target/avr/cpu.c
index d0139804b9f..a24c23c2476 100644
--- a/target/avr/cpu.c
+++ b/target/avr/cpu.c
@@ -54,7 +54,8 @@ static void avr_cpu_synchronize_from_tb(CPUState *cs,
     AVRCPU *cpu = AVR_CPU(cs);
     CPUAVRState *env = &cpu->env;
 
-    env->pc_w = tb_pc(tb) / 2; /* internally PC points to words */
+    tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL));
+    env->pc_w = tb->pc / 2; /* internally PC points to words */
 }
 
 static void avr_restore_state_to_opc(CPUState *cs,