[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 46/47] target/xtensa: Convert to tcg_ops restore_state_to_opc
From: |
Richard Henderson |
Subject: |
[PULL 46/47] target/xtensa: Convert to tcg_ops restore_state_to_opc |
Date: |
Wed, 26 Oct 2022 12:11:15 +1000 |
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/xtensa/cpu.c | 10 ++++++++++
target/xtensa/translate.c | 6 ------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c
index cbbe0e84a2..09923301c4 100644
--- a/target/xtensa/cpu.c
+++ b/target/xtensa/cpu.c
@@ -51,6 +51,15 @@ static vaddr xtensa_cpu_get_pc(CPUState *cs)
return cpu->env.pc;
}
+static void xtensa_restore_state_to_opc(CPUState *cs,
+ const TranslationBlock *tb,
+ const uint64_t *data)
+{
+ XtensaCPU *cpu = XTENSA_CPU(cs);
+
+ cpu->env.pc = data[0];
+}
+
static bool xtensa_cpu_has_work(CPUState *cs)
{
#ifndef CONFIG_USER_ONLY
@@ -215,6 +224,7 @@ static const struct SysemuCPUOps xtensa_sysemu_ops = {
static const struct TCGCPUOps xtensa_tcg_ops = {
.initialize = xtensa_translate_init,
.debug_excp_handler = xtensa_breakpoint_handler,
+ .restore_state_to_opc = xtensa_restore_state_to_opc,
#ifndef CONFIG_USER_ONLY
.tlb_fill = xtensa_cpu_tlb_fill,
diff --git a/target/xtensa/translate.c b/target/xtensa/translate.c
index bdd4690a5c..77bcd71030 100644
--- a/target/xtensa/translate.c
+++ b/target/xtensa/translate.c
@@ -1355,12 +1355,6 @@ void xtensa_cpu_dump_state(CPUState *cs, FILE *f, int
flags)
}
}
-void restore_state_to_opc(CPUXtensaState *env, TranslationBlock *tb,
- target_ulong *data)
-{
- env->pc = data[0];
-}
-
static void translate_abs(DisasContext *dc, const OpcodeArg arg[],
const uint32_t par[])
{
--
2.34.1
- [PULL 36/47] target/mips: Convert to tcg_ops restore_state_to_opc, (continued)
- [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
- [PULL 47/47] accel/tcg: Remove restore_state_to_opc function, Richard Henderson, 2022/10/25
- [PULL 46/47] target/xtensa: Convert to tcg_ops restore_state_to_opc,
Richard Henderson <=
- [PULL 44/47] target/sparc: Convert to tcg_ops restore_state_to_opc, Richard Henderson, 2022/10/25
- Re: [PULL 00/47] tcg patch queue, Stefan Hajnoczi, 2022/10/26