Rename to xtensa_cpu_debug_excp_handler, since it also handles watchpoints, and that's the name of the tcg_ops cpu hook.
Signed-off-by: Richard Henderson <[email protected]> --- target/xtensa/cpu.h | 2 +- target/xtensa/cpu.c | 2 +- target/xtensa/helper.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 119a0b8187..928d300772 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -592,7 +592,7 @@ void xtensa_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, MemTxResult response, uintptr_t retaddr); hwaddr xtensa_cpu_get_phys_addr_debug(CPUState *cpu, vaddr addr); bool xtensa_debug_check_breakpoint(CPUState *cs, CPUBreakpoint *bp); -void xtensa_breakpoint_handler(CPUState *cs, CPUBreakpoint *hit); +void xtensa_cpu_debug_excp_handler(CPUState *cs, CPUBreakpoint *hit); #endif void xtensa_cpu_dump_state(CPUState *cpu, FILE *f, int flags); void xtensa_count_regs(const XtensaConfig *config, diff --git a/target/xtensa/cpu.c b/target/xtensa/cpu.c index eb6758b694..82b7493ff4 100644 --- a/target/xtensa/cpu.c +++ b/target/xtensa/cpu.c @@ -330,7 +330,7 @@ static const TCGCPUOps xtensa_tcg_ops = { .do_transaction_failed = xtensa_cpu_do_transaction_failed, .do_unaligned_access = xtensa_cpu_do_unaligned_access, .debug_check_breakpoint = xtensa_debug_check_breakpoint, - .debug_excp_handler = xtensa_breakpoint_handler, + .debug_excp_handler = xtensa_cpu_debug_excp_handler, #endif /* !CONFIG_USER_ONLY */ }; diff --git a/target/xtensa/helper.c b/target/xtensa/helper.c index aa012068de..7643e97b2c 100644 --- a/target/xtensa/helper.c +++ b/target/xtensa/helper.c @@ -220,7 +220,7 @@ static uint32_t check_hw_breakpoints(CPUXtensaState *env) return 0; } -void xtensa_breakpoint_handler(CPUState *cs, CPUBreakpoint *hit) +void xtensa_cpu_debug_excp_handler(CPUState *cs, CPUBreakpoint *hit) { CPUXtensaState *env = cpu_env(cs); -- 2.43.0
