diff options
| author | Anton Johansson <anjo@rev.ng> | 2023-02-27 14:51:56 +0100 |
|---|---|---|
| committer | Richard Henderson <richard.henderson@linaro.org> | 2023-03-01 07:33:19 -1000 |
| commit | e83cf1c119bcc7a822f124797b30c6e203798d23 (patch) | |
| tree | 3f3e8d8715f3e676aece5bcd08a7c3f1fe4b4a11 /target/loongarch | |
| parent | ca647d4564c91b8f2ba48218d33aebcad7bff12b (diff) | |
| download | qemu-e83cf1c119bcc7a822f124797b30c6e203798d23.zip qemu-e83cf1c119bcc7a822f124797b30c6e203798d23.tar.gz qemu-e83cf1c119bcc7a822f124797b30c6e203798d23.tar.bz2 | |
target/loongarch: 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-22-anjo@rev.ng>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Diffstat (limited to 'target/loongarch')
| -rw-r--r-- | target/loongarch/cpu.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/target/loongarch/cpu.c b/target/loongarch/cpu.c index 290ab4d..e5efe4e 100644 --- a/target/loongarch/cpu.c +++ b/target/loongarch/cpu.c @@ -18,6 +18,7 @@ #include "fpu/softfloat-helpers.h" #include "cpu-csr.h" #include "sysemu/reset.h" +#include "tcg/tcg.h" const char * const regnames[32] = { "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", @@ -321,7 +322,8 @@ static void loongarch_cpu_synchronize_from_tb(CPUState *cs, LoongArchCPU *cpu = LOONGARCH_CPU(cs); CPULoongArchState *env = &cpu->env; - env->pc = tb_pc(tb); + tcg_debug_assert(!(cs->tcg_cflags & CF_PCREL)); + env->pc = tb->pc; } static void loongarch_restore_state_to_opc(CPUState *cs, @@ -599,7 +601,7 @@ static ObjectClass *loongarch_cpu_class_by_name(const char *cpu_model) oc = object_class_by_name(cpu_model); if (!oc) { - g_autofree char *typename + g_autofree char *typename = g_strdup_printf(LOONGARCH_CPU_TYPE_NAME("%s"), cpu_model); oc = object_class_by_name(typename); if (!oc) { |