[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 34/47] target/m68k: Convert to tcg_ops restore_state_to_opc
From: |
Richard Henderson |
Subject: |
[PULL 34/47] target/m68k: Convert to tcg_ops restore_state_to_opc |
Date: |
Wed, 26 Oct 2022 12:11:03 +1000 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/m68k/cpu.c | 14 ++++++++++++++
target/m68k/translate.c | 10 ----------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
index 1e902e1ef0..b67ddea2ae 100644
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -38,6 +38,19 @@ static vaddr m68k_cpu_get_pc(CPUState *cs)
return cpu->env.pc;
}
+static void m68k_restore_state_to_opc(CPUState *cs,
+ const TranslationBlock *tb,
+ const uint64_t *data)
+{
+ M68kCPU *cpu = M68K_CPU(cs);
+ int cc_op = data[1];
+
+ cpu->env.pc = data[0];
+ if (cc_op != CC_OP_DYNAMIC) {
+ cpu->env.cc_op = cc_op;
+ }
+}
+
static bool m68k_cpu_has_work(CPUState *cs)
{
return cs->interrupt_request & CPU_INTERRUPT_HARD;
@@ -524,6 +537,7 @@ static const struct SysemuCPUOps m68k_sysemu_ops = {
static const struct TCGCPUOps m68k_tcg_ops = {
.initialize = m68k_tcg_init,
+ .restore_state_to_opc = m68k_restore_state_to_opc,
#ifndef CONFIG_USER_ONLY
.tlb_fill = m68k_cpu_tlb_fill,
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index 9df17aa4b2..5cbde4be34 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -6479,13 +6479,3 @@ void m68k_cpu_dump_state(CPUState *cs, FILE *f, int
flags)
env->mmu.mmusr, env->mmu.ar);
#endif
}
-
-void restore_state_to_opc(CPUM68KState *env, TranslationBlock *tb,
- target_ulong *data)
-{
- int cc_op = data[1];
- env->pc = data[0];
- if (cc_op != CC_OP_DYNAMIC) {
- env->cc_op = cc_op;
- }
-}
--
2.34.1
- [PULL 24/47] accel/tcg: Simplify page_get/alloc_target_data, (continued)
- [PULL 24/47] accel/tcg: Simplify page_get/alloc_target_data, Richard Henderson, 2022/10/25
- [PULL 25/47] accel/tcg: Add restore_state_to_opc to TCGCPUOps, Richard Henderson, 2022/10/25
- [PULL 26/47] target/alpha: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 27/47] target/arm: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 28/47] target/avr: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 29/47] target/cris: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 30/47] target/hexagon: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 31/47] target/hppa: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 32/47] target/i386: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 33/47] target/loongarch: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 34/47] target/m68k: Convert to tcg_ops restore_state_to_opc,
Richard Henderson <=
- [PULL 35/47] target/microblaze: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 36/47] target/mips: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 37/47] target/nios2: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 38/47] target/openrisc: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 39/47] target/ppc: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 40/47] target/riscv: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 41/47] target/rx: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 42/47] target/s390x: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 43/47] target/sh4: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- [PULL 45/47] target/tricore: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25