OSDN Git Service

target/openrisc: Replace `tb_pc()` with `tb->pc`
authorAnton Johansson <anjo@rev.ng>
Mon, 27 Feb 2023 13:51:53 +0000 (14:51 +0100)
committerRichard Henderson <richard.henderson@linaro.org>
Wed, 1 Mar 2023 17:33:15 +0000 (07:33 -1000)
Signed-off-by: Anton Johansson <anjo@rev.ng>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Message-Id: <20230227135202.9710-19-anjo@rev.ng>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
target/openrisc/cpu.c

index 4c11a1f..0ce4f79 100644 (file)
@@ -22,6 +22,7 @@
 #include "qemu/qemu-print.h"
 #include "cpu.h"
 #include "exec/exec-all.h"
+#include "tcg/tcg.h"
 
 static void openrisc_cpu_set_pc(CPUState *cs, vaddr value)
 {
@@ -43,7 +44,8 @@ static void openrisc_cpu_synchronize_from_tb(CPUState *cs,
 {
     OpenRISCCPU *cpu = OPENRISC_CPU(cs);
 
-    cpu->env.pc = tb_pc(tb);
+    tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL));
+    cpu->env.pc = tb->pc;
 }
 
 static void openrisc_restore_state_to_opc(CPUState *cs,