target/ppc: Restrict cpu_exec_interrupt() handler to sysemu
Restrict cpu_exec_interrupt() and its callees to sysemu. Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Reviewed-by: Warner Losh <imp@bsdimp.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Acked-by: David Gibson <david@gibson.dropbear.id.au> Message-Id: <20210911165434.531552-18-f4bug@amsat.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
250ae6dfc7
commit
f725245c52
|
@ -1254,8 +1254,6 @@ DECLARE_OBJ_CHECKERS(PPCVirtualHypervisor, PPCVirtualHypervisorClass,
|
||||||
PPC_VIRTUAL_HYPERVISOR, TYPE_PPC_VIRTUAL_HYPERVISOR)
|
PPC_VIRTUAL_HYPERVISOR, TYPE_PPC_VIRTUAL_HYPERVISOR)
|
||||||
#endif /* CONFIG_USER_ONLY */
|
#endif /* CONFIG_USER_ONLY */
|
||||||
|
|
||||||
void ppc_cpu_do_interrupt(CPUState *cpu);
|
|
||||||
bool ppc_cpu_exec_interrupt(CPUState *cpu, int int_req);
|
|
||||||
void ppc_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
|
void ppc_cpu_dump_state(CPUState *cpu, FILE *f, int flags);
|
||||||
hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
|
hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);
|
||||||
int ppc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
|
int ppc_cpu_gdb_read_register(CPUState *cpu, GByteArray *buf, int reg);
|
||||||
|
@ -1271,6 +1269,8 @@ int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,
|
||||||
int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
|
int ppc32_cpu_write_elf32_note(WriteCoreDumpFunction f, CPUState *cs,
|
||||||
int cpuid, void *opaque);
|
int cpuid, void *opaque);
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
void ppc_cpu_do_interrupt(CPUState *cpu);
|
||||||
|
bool ppc_cpu_exec_interrupt(CPUState *cpu, int int_req);
|
||||||
void ppc_cpu_do_system_reset(CPUState *cs);
|
void ppc_cpu_do_system_reset(CPUState *cs);
|
||||||
void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector);
|
void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector);
|
||||||
extern const VMStateDescription vmstate_ppc_cpu;
|
extern const VMStateDescription vmstate_ppc_cpu;
|
||||||
|
|
|
@ -9014,10 +9014,10 @@ static const struct SysemuCPUOps ppc_sysemu_ops = {
|
||||||
|
|
||||||
static const struct TCGCPUOps ppc_tcg_ops = {
|
static const struct TCGCPUOps ppc_tcg_ops = {
|
||||||
.initialize = ppc_translate_init,
|
.initialize = ppc_translate_init,
|
||||||
.cpu_exec_interrupt = ppc_cpu_exec_interrupt,
|
|
||||||
.tlb_fill = ppc_cpu_tlb_fill,
|
.tlb_fill = ppc_cpu_tlb_fill,
|
||||||
|
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
|
.cpu_exec_interrupt = ppc_cpu_exec_interrupt,
|
||||||
.do_interrupt = ppc_cpu_do_interrupt,
|
.do_interrupt = ppc_cpu_do_interrupt,
|
||||||
.cpu_exec_enter = ppc_cpu_exec_enter,
|
.cpu_exec_enter = ppc_cpu_exec_enter,
|
||||||
.cpu_exec_exit = ppc_cpu_exec_exit,
|
.cpu_exec_exit = ppc_cpu_exec_exit,
|
||||||
|
|
|
@ -40,24 +40,8 @@
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
/* Exception processing */
|
/* Exception processing */
|
||||||
#if defined(CONFIG_USER_ONLY)
|
#if !defined(CONFIG_USER_ONLY)
|
||||||
void ppc_cpu_do_interrupt(CPUState *cs)
|
|
||||||
{
|
|
||||||
PowerPCCPU *cpu = POWERPC_CPU(cs);
|
|
||||||
CPUPPCState *env = &cpu->env;
|
|
||||||
|
|
||||||
cs->exception_index = POWERPC_EXCP_NONE;
|
|
||||||
env->error_code = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void ppc_hw_interrupt(CPUPPCState *env)
|
|
||||||
{
|
|
||||||
CPUState *cs = env_cpu(env);
|
|
||||||
|
|
||||||
cs->exception_index = POWERPC_EXCP_NONE;
|
|
||||||
env->error_code = 0;
|
|
||||||
}
|
|
||||||
#else /* defined(CONFIG_USER_ONLY) */
|
|
||||||
static inline void dump_syscall(CPUPPCState *env)
|
static inline void dump_syscall(CPUPPCState *env)
|
||||||
{
|
{
|
||||||
qemu_log_mask(CPU_LOG_INT, "syscall r0=%016" PRIx64
|
qemu_log_mask(CPU_LOG_INT, "syscall r0=%016" PRIx64
|
||||||
|
@ -1113,7 +1097,6 @@ void ppc_cpu_do_fwnmi_machine_check(CPUState *cs, target_ulong vector)
|
||||||
|
|
||||||
powerpc_set_excp_state(cpu, vector, msr);
|
powerpc_set_excp_state(cpu, vector, msr);
|
||||||
}
|
}
|
||||||
#endif /* !CONFIG_USER_ONLY */
|
|
||||||
|
|
||||||
bool ppc_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
|
bool ppc_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
|
||||||
{
|
{
|
||||||
|
@ -1130,6 +1113,8 @@ bool ppc_cpu_exec_interrupt(CPUState *cs, int interrupt_request)
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
|
|
||||||
#if defined(DEBUG_OP)
|
#if defined(DEBUG_OP)
|
||||||
static void cpu_dump_rfi(target_ulong RA, target_ulong msr)
|
static void cpu_dump_rfi(target_ulong RA, target_ulong msr)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue