SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/xtensa: Move has_work() from CPUClass to SysemuCPUOps

Browse Source 
Move has_work() from CPUClass to SysemuCPUOps, simplifying
xtensa_cpu_has_work() by directly using CPU env.

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-Id: <20250125170125.32855-24-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2025-01-21 13:10:30 +01:00
parent d55ea95f25
commit f37799c6c1
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
target/xtensa/cpu.c
View File

@ -63,16 +63,14 @@ static void xtensa_restore_state_to_opc(CPUState *cs,
cpu->env.pc = data[0]; cpu->env.pc = data[0];
} }
#ifndef CONFIG_USER_ONLY
static bool xtensa_cpu_has_work(CPUState *cs) static bool xtensa_cpu_has_work(CPUState *cs)
{ {
#ifndef CONFIG_USER_ONLY CPUXtensaState *env = cpu_env(cs);
XtensaCPU *cpu = XTENSA_CPU(cs);
return !cpu->env.runstall && cpu->env.pending_irq_level; return !env->runstall && env->pending_irq_level;
#else
return true;
#endif
} }
#endif /* !CONFIG_USER_ONLY */
static int xtensa_cpu_mmu_index(CPUState *cs, bool ifetch) static int xtensa_cpu_mmu_index(CPUState *cs, bool ifetch)
{ {
@ -226,6 +224,7 @@ static const VMStateDescription vmstate_xtensa_cpu = {
#include "hw/core/sysemu-cpu-ops.h" #include "hw/core/sysemu-cpu-ops.h"
static const struct SysemuCPUOps xtensa_sysemu_ops = { static const struct SysemuCPUOps xtensa_sysemu_ops = {
.has_work = xtensa_cpu_has_work,
.get_phys_page_debug = xtensa_cpu_get_phys_page_debug, .get_phys_page_debug = xtensa_cpu_get_phys_page_debug,
}; };
#endif #endif
@ -263,7 +262,6 @@ static void xtensa_cpu_class_init(ObjectClass *oc, void *data)
&xcc->parent_phases); &xcc->parent_phases);
cc->class_by_name = xtensa_cpu_class_by_name; cc->class_by_name = xtensa_cpu_class_by_name;
cc->has_work = xtensa_cpu_has_work;
cc->mmu_index = xtensa_cpu_mmu_index; cc->mmu_index = xtensa_cpu_mmu_index;
cc->dump_state = xtensa_cpu_dump_state; cc->dump_state = xtensa_cpu_dump_state;
cc->set_pc = xtensa_cpu_set_pc; cc->set_pc = xtensa_cpu_set_pc;