diff options
| author | Blue Swirl <blauwirbel@gmail.com> | 2012-08-09 18:44:49 +0000 |
|---|---|---|
| committer | Blue Swirl <blauwirbel@gmail.com> | 2012-08-09 18:44:49 +0000 |
| commit | d3da41e32bc6d6fac80d402aa1cc0f1d30539d98 (patch) | |
| tree | 6c19d94ccf6f054ae6fc6d26d94131a1dd577519 /target-xtensa | |
| parent | 8227421e0476d9caf2a9a089465bb40c23834e33 (diff) | |
| parent | d65e9815b1ff90dff35e4e679bfb231c24e408f7 (diff) | |
Merge branch 'x86cpu_qom_tcg_v2' of git://github.com/imammedo/qemu
* 'x86cpu_qom_tcg_v2' of git://github.com/imammedo/qemu:
target-i386: move tcg initialization into x86_cpu_initfn()
cleanup cpu_set_debug_excp_handler
target-xtensa: drop usage of prev_debug_excp_handler
target-i386: drop usage of prev_debug_excp_handler
Diffstat (limited to 'target-xtensa')
| -rw-r--r-- | target-xtensa/helper.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c index 044ce18364..d5bb171fcd 100644 --- a/target-xtensa/helper.c +++ b/target-xtensa/helper.c @@ -54,8 +54,6 @@ static uint32_t check_hw_breakpoints(CPUXtensaState *env) return 0; } -static CPUDebugExcpHandler *prev_debug_excp_handler; - static void breakpoint_handler(CPUXtensaState *env) { if (env->watchpoint_hit) { @@ -70,9 +68,6 @@ static void breakpoint_handler(CPUXtensaState *env) cpu_resume_from_signal(env, NULL); } } - if (prev_debug_excp_handler) { - prev_debug_excp_handler(env); - } } XtensaCPU *cpu_xtensa_init(const char *cpu_model) @@ -105,8 +100,7 @@ XtensaCPU *cpu_xtensa_init(const char *cpu_model) if (!debug_handler_inited && tcg_enabled()) { debug_handler_inited = 1; - prev_debug_excp_handler = - cpu_set_debug_excp_handler(breakpoint_handler); + cpu_set_debug_excp_handler(breakpoint_handler); } xtensa_irq_init(env); |