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