mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-15 14:13:31 -06:00
accel/tcg: Introduce TCGCPUOps.cpu_exec_reset
Initialize all instances with cpu_reset(), so that there is no functional change. Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
81ef6a2295
commit
9181ab4528
21 changed files with 23 additions and 1 deletions
|
@ -834,7 +834,7 @@ static inline bool cpu_handle_interrupt(CPUState *cpu,
|
||||||
#else
|
#else
|
||||||
else if (interrupt_request & CPU_INTERRUPT_RESET) {
|
else if (interrupt_request & CPU_INTERRUPT_RESET) {
|
||||||
replay_interrupt();
|
replay_interrupt();
|
||||||
cpu_reset(cpu);
|
cpu->cc->tcg_ops->cpu_exec_reset(cpu);
|
||||||
bql_unlock();
|
bql_unlock();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -1070,6 +1070,7 @@ bool tcg_exec_realizefn(CPUState *cpu, Error **errp)
|
||||||
#ifndef CONFIG_USER_ONLY
|
#ifndef CONFIG_USER_ONLY
|
||||||
assert(tcg_ops->cpu_exec_halt);
|
assert(tcg_ops->cpu_exec_halt);
|
||||||
assert(tcg_ops->cpu_exec_interrupt);
|
assert(tcg_ops->cpu_exec_interrupt);
|
||||||
|
assert(tcg_ops->cpu_exec_reset);
|
||||||
#endif /* !CONFIG_USER_ONLY */
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
assert(tcg_ops->translate_code);
|
assert(tcg_ops->translate_code);
|
||||||
assert(tcg_ops->mmu_index);
|
assert(tcg_ops->mmu_index);
|
||||||
|
|
|
@ -155,6 +155,8 @@ struct TCGCPUOps {
|
||||||
void (*do_interrupt)(CPUState *cpu);
|
void (*do_interrupt)(CPUState *cpu);
|
||||||
/** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */
|
/** @cpu_exec_interrupt: Callback for processing interrupts in cpu_exec */
|
||||||
bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request);
|
bool (*cpu_exec_interrupt)(CPUState *cpu, int interrupt_request);
|
||||||
|
/** @cpu_exec_reset: Callback for reset in cpu_exec. */
|
||||||
|
void (*cpu_exec_reset)(CPUState *cpu);
|
||||||
/**
|
/**
|
||||||
* @cpu_exec_halt: Callback for handling halt in cpu_exec.
|
* @cpu_exec_halt: Callback for handling halt in cpu_exec.
|
||||||
*
|
*
|
||||||
|
|
|
@ -251,6 +251,7 @@ static const TCGCPUOps alpha_tcg_ops = {
|
||||||
.tlb_fill = alpha_cpu_tlb_fill,
|
.tlb_fill = alpha_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = alpha_cpu_exec_interrupt,
|
.cpu_exec_interrupt = alpha_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = alpha_cpu_has_work,
|
.cpu_exec_halt = alpha_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = alpha_cpu_do_interrupt,
|
.do_interrupt = alpha_cpu_do_interrupt,
|
||||||
.do_transaction_failed = alpha_cpu_do_transaction_failed,
|
.do_transaction_failed = alpha_cpu_do_transaction_failed,
|
||||||
.do_unaligned_access = alpha_cpu_do_unaligned_access,
|
.do_unaligned_access = alpha_cpu_do_unaligned_access,
|
||||||
|
|
|
@ -2705,6 +2705,7 @@ static const TCGCPUOps arm_tcg_ops = {
|
||||||
.tlb_fill_align = arm_cpu_tlb_fill_align,
|
.tlb_fill_align = arm_cpu_tlb_fill_align,
|
||||||
.cpu_exec_interrupt = arm_cpu_exec_interrupt,
|
.cpu_exec_interrupt = arm_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = arm_cpu_exec_halt,
|
.cpu_exec_halt = arm_cpu_exec_halt,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = arm_cpu_do_interrupt,
|
.do_interrupt = arm_cpu_do_interrupt,
|
||||||
.do_transaction_failed = arm_cpu_do_transaction_failed,
|
.do_transaction_failed = arm_cpu_do_transaction_failed,
|
||||||
.do_unaligned_access = arm_cpu_do_unaligned_access,
|
.do_unaligned_access = arm_cpu_do_unaligned_access,
|
||||||
|
|
|
@ -250,6 +250,7 @@ static const TCGCPUOps arm_v7m_tcg_ops = {
|
||||||
.tlb_fill_align = arm_cpu_tlb_fill_align,
|
.tlb_fill_align = arm_cpu_tlb_fill_align,
|
||||||
.cpu_exec_interrupt = arm_v7m_cpu_exec_interrupt,
|
.cpu_exec_interrupt = arm_v7m_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = arm_cpu_exec_halt,
|
.cpu_exec_halt = arm_cpu_exec_halt,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = arm_v7m_cpu_do_interrupt,
|
.do_interrupt = arm_v7m_cpu_do_interrupt,
|
||||||
.do_transaction_failed = arm_cpu_do_transaction_failed,
|
.do_transaction_failed = arm_cpu_do_transaction_failed,
|
||||||
.do_unaligned_access = arm_cpu_do_unaligned_access,
|
.do_unaligned_access = arm_cpu_do_unaligned_access,
|
||||||
|
|
|
@ -232,6 +232,7 @@ static const TCGCPUOps avr_tcg_ops = {
|
||||||
.mmu_index = avr_cpu_mmu_index,
|
.mmu_index = avr_cpu_mmu_index,
|
||||||
.cpu_exec_interrupt = avr_cpu_exec_interrupt,
|
.cpu_exec_interrupt = avr_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = avr_cpu_has_work,
|
.cpu_exec_halt = avr_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.tlb_fill = avr_cpu_tlb_fill,
|
.tlb_fill = avr_cpu_tlb_fill,
|
||||||
.do_interrupt = avr_cpu_do_interrupt,
|
.do_interrupt = avr_cpu_do_interrupt,
|
||||||
};
|
};
|
||||||
|
|
|
@ -271,6 +271,7 @@ static const TCGCPUOps hppa_tcg_ops = {
|
||||||
.tlb_fill_align = hppa_cpu_tlb_fill_align,
|
.tlb_fill_align = hppa_cpu_tlb_fill_align,
|
||||||
.cpu_exec_interrupt = hppa_cpu_exec_interrupt,
|
.cpu_exec_interrupt = hppa_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = hppa_cpu_has_work,
|
.cpu_exec_halt = hppa_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = hppa_cpu_do_interrupt,
|
.do_interrupt = hppa_cpu_do_interrupt,
|
||||||
.do_unaligned_access = hppa_cpu_do_unaligned_access,
|
.do_unaligned_access = hppa_cpu_do_unaligned_access,
|
||||||
.do_transaction_failed = hppa_cpu_do_transaction_failed,
|
.do_transaction_failed = hppa_cpu_do_transaction_failed,
|
||||||
|
|
|
@ -147,6 +147,7 @@ const TCGCPUOps x86_tcg_ops = {
|
||||||
.do_interrupt = x86_cpu_do_interrupt,
|
.do_interrupt = x86_cpu_do_interrupt,
|
||||||
.cpu_exec_halt = x86_cpu_exec_halt,
|
.cpu_exec_halt = x86_cpu_exec_halt,
|
||||||
.cpu_exec_interrupt = x86_cpu_exec_interrupt,
|
.cpu_exec_interrupt = x86_cpu_exec_interrupt,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_unaligned_access = x86_cpu_do_unaligned_access,
|
.do_unaligned_access = x86_cpu_do_unaligned_access,
|
||||||
.debug_excp_handler = breakpoint_handler,
|
.debug_excp_handler = breakpoint_handler,
|
||||||
.debug_check_breakpoint = x86_debug_check_breakpoint,
|
.debug_check_breakpoint = x86_debug_check_breakpoint,
|
||||||
|
|
|
@ -877,6 +877,7 @@ static const TCGCPUOps loongarch_tcg_ops = {
|
||||||
.tlb_fill = loongarch_cpu_tlb_fill,
|
.tlb_fill = loongarch_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = loongarch_cpu_exec_interrupt,
|
.cpu_exec_interrupt = loongarch_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = loongarch_cpu_has_work,
|
.cpu_exec_halt = loongarch_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = loongarch_cpu_do_interrupt,
|
.do_interrupt = loongarch_cpu_do_interrupt,
|
||||||
.do_transaction_failed = loongarch_cpu_do_transaction_failed,
|
.do_transaction_failed = loongarch_cpu_do_transaction_failed,
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -602,6 +602,7 @@ static const TCGCPUOps m68k_tcg_ops = {
|
||||||
.tlb_fill = m68k_cpu_tlb_fill,
|
.tlb_fill = m68k_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = m68k_cpu_exec_interrupt,
|
.cpu_exec_interrupt = m68k_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = m68k_cpu_has_work,
|
.cpu_exec_halt = m68k_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = m68k_cpu_do_interrupt,
|
.do_interrupt = m68k_cpu_do_interrupt,
|
||||||
.do_transaction_failed = m68k_cpu_transaction_failed,
|
.do_transaction_failed = m68k_cpu_transaction_failed,
|
||||||
#endif /* !CONFIG_USER_ONLY */
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
|
|
|
@ -440,6 +440,7 @@ static const TCGCPUOps mb_tcg_ops = {
|
||||||
.tlb_fill = mb_cpu_tlb_fill,
|
.tlb_fill = mb_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = mb_cpu_exec_interrupt,
|
.cpu_exec_interrupt = mb_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = mb_cpu_has_work,
|
.cpu_exec_halt = mb_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = mb_cpu_do_interrupt,
|
.do_interrupt = mb_cpu_do_interrupt,
|
||||||
.do_transaction_failed = mb_cpu_transaction_failed,
|
.do_transaction_failed = mb_cpu_transaction_failed,
|
||||||
.do_unaligned_access = mb_cpu_do_unaligned_access,
|
.do_unaligned_access = mb_cpu_do_unaligned_access,
|
||||||
|
|
|
@ -563,6 +563,7 @@ static const TCGCPUOps mips_tcg_ops = {
|
||||||
.tlb_fill = mips_cpu_tlb_fill,
|
.tlb_fill = mips_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = mips_cpu_exec_interrupt,
|
.cpu_exec_interrupt = mips_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = mips_cpu_has_work,
|
.cpu_exec_halt = mips_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = mips_cpu_do_interrupt,
|
.do_interrupt = mips_cpu_do_interrupt,
|
||||||
.do_transaction_failed = mips_cpu_do_transaction_failed,
|
.do_transaction_failed = mips_cpu_do_transaction_failed,
|
||||||
.do_unaligned_access = mips_cpu_do_unaligned_access,
|
.do_unaligned_access = mips_cpu_do_unaligned_access,
|
||||||
|
|
|
@ -255,6 +255,7 @@ static const TCGCPUOps openrisc_tcg_ops = {
|
||||||
.tlb_fill = openrisc_cpu_tlb_fill,
|
.tlb_fill = openrisc_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = openrisc_cpu_exec_interrupt,
|
.cpu_exec_interrupt = openrisc_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = openrisc_cpu_has_work,
|
.cpu_exec_halt = openrisc_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = openrisc_cpu_do_interrupt,
|
.do_interrupt = openrisc_cpu_do_interrupt,
|
||||||
#endif /* !CONFIG_USER_ONLY */
|
#endif /* !CONFIG_USER_ONLY */
|
||||||
};
|
};
|
||||||
|
|
|
@ -7492,6 +7492,7 @@ static const TCGCPUOps ppc_tcg_ops = {
|
||||||
.tlb_fill = ppc_cpu_tlb_fill,
|
.tlb_fill = ppc_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = ppc_cpu_exec_interrupt,
|
.cpu_exec_interrupt = ppc_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = ppc_cpu_has_work,
|
.cpu_exec_halt = ppc_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.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,
|
||||||
|
|
|
@ -153,6 +153,7 @@ const TCGCPUOps riscv_tcg_ops = {
|
||||||
.tlb_fill = riscv_cpu_tlb_fill,
|
.tlb_fill = riscv_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = riscv_cpu_exec_interrupt,
|
.cpu_exec_interrupt = riscv_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = riscv_cpu_has_work,
|
.cpu_exec_halt = riscv_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = riscv_cpu_do_interrupt,
|
.do_interrupt = riscv_cpu_do_interrupt,
|
||||||
.do_transaction_failed = riscv_cpu_do_transaction_failed,
|
.do_transaction_failed = riscv_cpu_do_transaction_failed,
|
||||||
.do_unaligned_access = riscv_cpu_do_unaligned_access,
|
.do_unaligned_access = riscv_cpu_do_unaligned_access,
|
||||||
|
|
|
@ -217,6 +217,7 @@ static const TCGCPUOps rx_tcg_ops = {
|
||||||
|
|
||||||
.cpu_exec_interrupt = rx_cpu_exec_interrupt,
|
.cpu_exec_interrupt = rx_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = rx_cpu_has_work,
|
.cpu_exec_halt = rx_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = rx_cpu_do_interrupt,
|
.do_interrupt = rx_cpu_do_interrupt,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -365,6 +365,7 @@ static const TCGCPUOps s390_tcg_ops = {
|
||||||
.tlb_fill = s390_cpu_tlb_fill,
|
.tlb_fill = s390_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = s390_cpu_exec_interrupt,
|
.cpu_exec_interrupt = s390_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = s390_cpu_has_work,
|
.cpu_exec_halt = s390_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = s390_cpu_do_interrupt,
|
.do_interrupt = s390_cpu_do_interrupt,
|
||||||
.debug_excp_handler = s390x_cpu_debug_excp_handler,
|
.debug_excp_handler = s390x_cpu_debug_excp_handler,
|
||||||
.do_unaligned_access = s390x_cpu_do_unaligned_access,
|
.do_unaligned_access = s390x_cpu_do_unaligned_access,
|
||||||
|
|
|
@ -275,6 +275,7 @@ static const TCGCPUOps superh_tcg_ops = {
|
||||||
.tlb_fill = superh_cpu_tlb_fill,
|
.tlb_fill = superh_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = superh_cpu_exec_interrupt,
|
.cpu_exec_interrupt = superh_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = superh_cpu_has_work,
|
.cpu_exec_halt = superh_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = superh_cpu_do_interrupt,
|
.do_interrupt = superh_cpu_do_interrupt,
|
||||||
.do_unaligned_access = superh_cpu_do_unaligned_access,
|
.do_unaligned_access = superh_cpu_do_unaligned_access,
|
||||||
.io_recompile_replay_branch = superh_io_recompile_replay_branch,
|
.io_recompile_replay_branch = superh_io_recompile_replay_branch,
|
||||||
|
|
|
@ -1034,6 +1034,7 @@ static const TCGCPUOps sparc_tcg_ops = {
|
||||||
.tlb_fill = sparc_cpu_tlb_fill,
|
.tlb_fill = sparc_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = sparc_cpu_exec_interrupt,
|
.cpu_exec_interrupt = sparc_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = sparc_cpu_has_work,
|
.cpu_exec_halt = sparc_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = sparc_cpu_do_interrupt,
|
.do_interrupt = sparc_cpu_do_interrupt,
|
||||||
.do_transaction_failed = sparc_cpu_do_transaction_failed,
|
.do_transaction_failed = sparc_cpu_do_transaction_failed,
|
||||||
.do_unaligned_access = sparc_cpu_do_unaligned_access,
|
.do_unaligned_access = sparc_cpu_do_unaligned_access,
|
||||||
|
|
|
@ -182,6 +182,7 @@ static const TCGCPUOps tricore_tcg_ops = {
|
||||||
.tlb_fill = tricore_cpu_tlb_fill,
|
.tlb_fill = tricore_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = tricore_cpu_exec_interrupt,
|
.cpu_exec_interrupt = tricore_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = tricore_cpu_has_work,
|
.cpu_exec_halt = tricore_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
};
|
};
|
||||||
|
|
||||||
static void tricore_cpu_class_init(ObjectClass *c, const void *data)
|
static void tricore_cpu_class_init(ObjectClass *c, const void *data)
|
||||||
|
|
|
@ -246,6 +246,7 @@ static const TCGCPUOps xtensa_tcg_ops = {
|
||||||
.tlb_fill = xtensa_cpu_tlb_fill,
|
.tlb_fill = xtensa_cpu_tlb_fill,
|
||||||
.cpu_exec_interrupt = xtensa_cpu_exec_interrupt,
|
.cpu_exec_interrupt = xtensa_cpu_exec_interrupt,
|
||||||
.cpu_exec_halt = xtensa_cpu_has_work,
|
.cpu_exec_halt = xtensa_cpu_has_work,
|
||||||
|
.cpu_exec_reset = cpu_reset,
|
||||||
.do_interrupt = xtensa_cpu_do_interrupt,
|
.do_interrupt = xtensa_cpu_do_interrupt,
|
||||||
.do_transaction_failed = xtensa_cpu_do_transaction_failed,
|
.do_transaction_failed = xtensa_cpu_do_transaction_failed,
|
||||||
.do_unaligned_access = xtensa_cpu_do_unaligned_access,
|
.do_unaligned_access = xtensa_cpu_do_unaligned_access,
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue