[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 28/47] target-xtensa: Move TCG initialization to Xte
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 28/47] target-xtensa: Move TCG initialization to XtensaCPU initfn |
Date: |
Sat, 16 Feb 2013 16:45:23 +0100 |
Combine this with breakpoint handler registration, guarding both with
tcg_enabled() to suppress also TCG init for qtest. Rename the handler to
xtensa_breakpoint_handler() since it needs to become global.
Signed-off-by: Andreas Färber <address@hidden>
---
target-xtensa/cpu.c | 7 +++++++
target-xtensa/cpu.h | 1 +
target-xtensa/helper.c | 14 +-------------
3 Dateien geändert, 9 Zeilen hinzugefügt(+), 13 Zeilen entfernt(-)
diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c
index d3706a3..309bb16 100644
--- a/target-xtensa/cpu.c
+++ b/target-xtensa/cpu.c
@@ -71,8 +71,15 @@ static void xtensa_cpu_initfn(Object *obj)
{
XtensaCPU *cpu = XTENSA_CPU(obj);
CPUXtensaState *env = &cpu->env;
+ static bool tcg_inited;
cpu_exec_init(env);
+
+ if (tcg_enabled() && !tcg_inited) {
+ tcg_inited = true;
+ xtensa_translate_init();
+ cpu_set_debug_excp_handler(xtensa_breakpoint_handler);
+ }
}
static const VMStateDescription vmstate_xtensa_cpu = {
diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h
index 5acf78c..dece224 100644
--- a/target-xtensa/cpu.h
+++ b/target-xtensa/cpu.h
@@ -385,6 +385,7 @@ static inline CPUXtensaState *cpu_init(const char
*cpu_model)
}
void xtensa_translate_init(void);
+void xtensa_breakpoint_handler(CPUXtensaState *env);
int cpu_xtensa_exec(CPUXtensaState *s);
void xtensa_register_core(XtensaConfigList *node);
void do_interrupt(CPUXtensaState *s);
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index 14bcc7e..a8a6493 100644
--- a/target-xtensa/helper.c
+++ b/target-xtensa/helper.c
@@ -54,7 +54,7 @@ static uint32_t check_hw_breakpoints(CPUXtensaState *env)
return 0;
}
-static void breakpoint_handler(CPUXtensaState *env)
+void xtensa_breakpoint_handler(CPUXtensaState *env)
{
if (env->watchpoint_hit) {
if (env->watchpoint_hit->flags & BP_CPU) {
@@ -72,8 +72,6 @@ static void breakpoint_handler(CPUXtensaState *env)
XtensaCPU *cpu_xtensa_init(const char *cpu_model)
{
- static int tcg_inited;
- static int debug_handler_inited;
XtensaCPU *cpu;
CPUXtensaState *env;
const XtensaConfig *config = NULL;
@@ -93,16 +91,6 @@ XtensaCPU *cpu_xtensa_init(const char *cpu_model)
env = &cpu->env;
env->config = config;
- if (!tcg_inited) {
- tcg_inited = 1;
- xtensa_translate_init();
- }
-
- if (!debug_handler_inited && tcg_enabled()) {
- debug_handler_inited = 1;
- cpu_set_debug_excp_handler(breakpoint_handler);
- }
-
xtensa_irq_init(env);
object_property_set_bool(OBJECT(cpu), true, "realized", NULL);
--
1.7.10.4
- [Qemu-devel] [PATCH 33/47] target-m68k: Pass M68kCPU to m68k_set_irq_level(), (continued)
- [Qemu-devel] [PATCH 33/47] target-m68k: Pass M68kCPU to m68k_set_irq_level(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 41/47] e500: Replace open-coded loop with qemu_get_cpu(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 35/47] cpu: Move host_tid field to CPUState, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 39/47] cputlb: Pass CPUState to cpu_unlink_tb(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 37/47] cpu: Move exit_request field to CPUState, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 44/47] target-s390x: Drop unused cpu_s390x_close() prototype, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 34/47] target-cris: Introduce CRISCPU subclasses, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 40/47] cpu: Add CPUArchState pointer to CPUState, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 38/47] cpu: Move current_tb field to CPUState, Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 42/47] ppce500_spin: Replace open-coded CPU loop with qemu_get_cpu(), Andreas Färber, 2013/02/16
- [Qemu-devel] [PATCH 28/47] target-xtensa: Move TCG initialization to XtensaCPU initfn,
Andreas Färber <=
- [Qemu-devel] [PATCH 32/47] mcf_intc: Pass M68kCPU to mcf_intc_init(), Andreas Färber, 2013/02/16