target/s390x: Move has_work() from CPUClass to SysemuCPUOps
Move has_work() from CPUClass to SysemuCPUOps, move s390_cpu_has_work() to cpu-system.c so it is only build for system emulation binaries, restrict functions not used anymore on user emulation in interrupt.c. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20250125170125.32855-20-philmd@linaro.org>
This commit is contained in:
parent
0df9781074
commit
f54c047e86
@ -39,6 +39,23 @@
|
|||||||
#include "system/tcg.h"
|
#include "system/tcg.h"
|
||||||
#include "hw/core/sysemu-cpu-ops.h"
|
#include "hw/core/sysemu-cpu-ops.h"
|
||||||
|
|
||||||
|
bool s390_cpu_has_work(CPUState *cs)
|
||||||
|
{
|
||||||
|
S390CPU *cpu = S390_CPU(cs);
|
||||||
|
|
||||||
|
/* STOPPED cpus can never wake up */
|
||||||
|
if (s390_cpu_get_state(cpu) != S390_CPU_STATE_LOAD &&
|
||||||
|
s390_cpu_get_state(cpu) != S390_CPU_STATE_OPERATING) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return s390_cpu_has_int(cpu);
|
||||||
|
}
|
||||||
|
|
||||||
/* S390CPUClass::load_normal() */
|
/* S390CPUClass::load_normal() */
|
||||||
static void s390_cpu_load_normal(CPUState *s)
|
static void s390_cpu_load_normal(CPUState *s)
|
||||||
{
|
{
|
||||||
@ -158,6 +175,7 @@ void s390_cpu_finalize(Object *obj)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static const struct SysemuCPUOps s390_sysemu_ops = {
|
static const struct SysemuCPUOps s390_sysemu_ops = {
|
||||||
|
.has_work = s390_cpu_has_work,
|
||||||
.get_phys_page_debug = s390_cpu_get_phys_page_debug,
|
.get_phys_page_debug = s390_cpu_get_phys_page_debug,
|
||||||
.get_crash_info = s390_cpu_get_crash_info,
|
.get_crash_info = s390_cpu_get_crash_info,
|
||||||
.write_elf64_note = s390_cpu_write_elf64_note,
|
.write_elf64_note = s390_cpu_write_elf64_note,
|
||||||
|
@ -126,23 +126,6 @@ static vaddr s390_cpu_get_pc(CPUState *cs)
|
|||||||
return cpu->env.psw.addr;
|
return cpu->env.psw.addr;
|
||||||
}
|
}
|
||||||
|
|
||||||
static bool s390_cpu_has_work(CPUState *cs)
|
|
||||||
{
|
|
||||||
S390CPU *cpu = S390_CPU(cs);
|
|
||||||
|
|
||||||
/* STOPPED cpus can never wake up */
|
|
||||||
if (s390_cpu_get_state(cpu) != S390_CPU_STATE_LOAD &&
|
|
||||||
s390_cpu_get_state(cpu) != S390_CPU_STATE_OPERATING) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!(cs->interrupt_request & CPU_INTERRUPT_HARD)) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return s390_cpu_has_int(cpu);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int s390x_cpu_mmu_index(CPUState *cs, bool ifetch)
|
static int s390x_cpu_mmu_index(CPUState *cs, bool ifetch)
|
||||||
{
|
{
|
||||||
return s390x_env_mmu_index(cpu_env(cs), ifetch);
|
return s390x_env_mmu_index(cpu_env(cs), ifetch);
|
||||||
@ -395,7 +378,6 @@ static void s390_cpu_class_init(ObjectClass *oc, void *data)
|
|||||||
&scc->parent_phases);
|
&scc->parent_phases);
|
||||||
|
|
||||||
cc->class_by_name = s390_cpu_class_by_name,
|
cc->class_by_name = s390_cpu_class_by_name,
|
||||||
cc->has_work = s390_cpu_has_work;
|
|
||||||
cc->mmu_index = s390x_cpu_mmu_index;
|
cc->mmu_index = s390x_cpu_mmu_index;
|
||||||
cc->dump_state = s390_cpu_dump_state;
|
cc->dump_state = s390_cpu_dump_state;
|
||||||
cc->query_cpu_fast = s390_query_cpu_fast;
|
cc->query_cpu_fast = s390_query_cpu_fast;
|
||||||
|
@ -30,6 +30,7 @@ void trigger_pgm_exception(CPUS390XState *env, uint32_t code)
|
|||||||
/* env->int_pgm_ilen is already set, or will be set during unwinding */
|
/* env->int_pgm_ilen is already set, or will be set during unwinding */
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
void s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t ra)
|
void s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t ra)
|
||||||
{
|
{
|
||||||
if (kvm_enabled()) {
|
if (kvm_enabled()) {
|
||||||
@ -41,7 +42,6 @@ void s390_program_interrupt(CPUS390XState *env, uint32_t code, uintptr_t ra)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#if !defined(CONFIG_USER_ONLY)
|
|
||||||
void cpu_inject_clock_comparator(S390CPU *cpu)
|
void cpu_inject_clock_comparator(S390CPU *cpu)
|
||||||
{
|
{
|
||||||
CPUS390XState *env = &cpu->env;
|
CPUS390XState *env = &cpu->env;
|
||||||
@ -225,11 +225,9 @@ bool s390_cpu_has_stop_int(S390CPU *cpu)
|
|||||||
|
|
||||||
return env->pending_int & INTERRUPT_STOP;
|
return env->pending_int & INTERRUPT_STOP;
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
bool s390_cpu_has_int(S390CPU *cpu)
|
bool s390_cpu_has_int(S390CPU *cpu)
|
||||||
{
|
{
|
||||||
#ifndef CONFIG_USER_ONLY
|
|
||||||
if (!tcg_enabled()) {
|
if (!tcg_enabled()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@ -238,7 +236,5 @@ bool s390_cpu_has_int(S390CPU *cpu)
|
|||||||
s390_cpu_has_io_int(cpu) ||
|
s390_cpu_has_io_int(cpu) ||
|
||||||
s390_cpu_has_restart_int(cpu) ||
|
s390_cpu_has_restart_int(cpu) ||
|
||||||
s390_cpu_has_stop_int(cpu);
|
s390_cpu_has_stop_int(cpu);
|
||||||
#else
|
|
||||||
return false;
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
|
@ -245,6 +245,7 @@ bool s390_cpu_system_realize(DeviceState *dev, Error **errp);
|
|||||||
void s390_cpu_finalize(Object *obj);
|
void s390_cpu_finalize(Object *obj);
|
||||||
void s390_cpu_system_class_init(CPUClass *cc);
|
void s390_cpu_system_class_init(CPUClass *cc);
|
||||||
void s390_cpu_machine_reset_cb(void *opaque);
|
void s390_cpu_machine_reset_cb(void *opaque);
|
||||||
|
bool s390_cpu_has_work(CPUState *cs);
|
||||||
|
|
||||||
#else
|
#else
|
||||||
static inline unsigned int s390_cpu_halt(S390CPU *cpu)
|
static inline unsigned int s390_cpu_halt(S390CPU *cpu)
|
||||||
@ -341,6 +342,7 @@ void cpu_unmap_lowcore(LowCore *lowcore);
|
|||||||
|
|
||||||
/* interrupt.c */
|
/* interrupt.c */
|
||||||
void trigger_pgm_exception(CPUS390XState *env, uint32_t code);
|
void trigger_pgm_exception(CPUS390XState *env, uint32_t code);
|
||||||
|
#ifndef CONFIG_USER_ONLY
|
||||||
void cpu_inject_clock_comparator(S390CPU *cpu);
|
void cpu_inject_clock_comparator(S390CPU *cpu);
|
||||||
void cpu_inject_cpu_timer(S390CPU *cpu);
|
void cpu_inject_cpu_timer(S390CPU *cpu);
|
||||||
void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr);
|
void cpu_inject_emergency_signal(S390CPU *cpu, uint16_t src_cpu_addr);
|
||||||
@ -353,6 +355,7 @@ bool s390_cpu_has_restart_int(S390CPU *cpu);
|
|||||||
bool s390_cpu_has_stop_int(S390CPU *cpu);
|
bool s390_cpu_has_stop_int(S390CPU *cpu);
|
||||||
void cpu_inject_restart(S390CPU *cpu);
|
void cpu_inject_restart(S390CPU *cpu);
|
||||||
void cpu_inject_stop(S390CPU *cpu);
|
void cpu_inject_stop(S390CPU *cpu);
|
||||||
|
#endif /* CONFIG_USER_ONLY */
|
||||||
|
|
||||||
|
|
||||||
/* ioinst.c */
|
/* ioinst.c */
|
||||||
|
Loading…
x
Reference in New Issue
Block a user