[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH for-next 46/74] target-xtensa: Let cpu_xtensa_init()
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH for-next 46/74] target-xtensa: Let cpu_xtensa_init() return XtensaCPU |
Date: |
Sun, 6 May 2012 17:34:46 +0200 |
Make the include paths for cpu-qom.h consistent to allow using XtensaCPU
in cpu.h.
Let cpu_init() return CPUXtensaState for backwards compatibility.
Signed-off-by: Andreas Färber <address@hidden>
---
target-xtensa/cpu.c | 2 +-
target-xtensa/cpu.h | 7 ++++---
target-xtensa/helper.c | 4 ++--
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/target-xtensa/cpu.c b/target-xtensa/cpu.c
index 97deacb..9d01983 100644
--- a/target-xtensa/cpu.c
+++ b/target-xtensa/cpu.c
@@ -28,7 +28,7 @@
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "cpu-qom.h"
+#include "cpu.h"
#include "qemu-common.h"
diff --git a/target-xtensa/cpu.h b/target-xtensa/cpu.h
index 6d0ea7c..10e242c 100644
--- a/target-xtensa/cpu.h
+++ b/target-xtensa/cpu.h
@@ -344,13 +344,15 @@ typedef struct CPUXtensaState {
CPU_COMMON
} CPUXtensaState;
-#define cpu_init cpu_xtensa_init
+#include "cpu-qom.h"
+
+#define cpu_init(model) (&cpu_xtensa_init(model)->env)
#define cpu_exec cpu_xtensa_exec
#define cpu_gen_code cpu_xtensa_gen_code
#define cpu_signal_handler cpu_xtensa_signal_handler
#define cpu_list xtensa_cpu_list
-CPUXtensaState *cpu_xtensa_init(const char *cpu_model);
+XtensaCPU *cpu_xtensa_init(const char *cpu_model);
void xtensa_translate_init(void);
int cpu_xtensa_exec(CPUXtensaState *s);
void xtensa_register_core(XtensaConfigList *node);
@@ -471,7 +473,6 @@ static inline void cpu_get_tb_cpu_state(CPUXtensaState
*env, target_ulong *pc,
}
#include "cpu-all.h"
-#include "cpu-qom.h"
#include "exec-all.h"
static inline int cpu_has_work(CPUXtensaState *env)
diff --git a/target-xtensa/helper.c b/target-xtensa/helper.c
index 2094227..e6cb3fe 100644
--- a/target-xtensa/helper.c
+++ b/target-xtensa/helper.c
@@ -80,7 +80,7 @@ static void breakpoint_handler(CPUXtensaState *env)
}
}
-CPUXtensaState *cpu_xtensa_init(const char *cpu_model)
+XtensaCPU *cpu_xtensa_init(const char *cpu_model)
{
static int tcg_inited;
static int debug_handler_inited;
@@ -116,7 +116,7 @@ CPUXtensaState *cpu_xtensa_init(const char *cpu_model)
xtensa_irq_init(env);
qemu_init_vcpu(env);
- return env;
+ return cpu;
}
--
1.7.7
- Re: [Qemu-devel] [PATCH for-next 41/74] target-lm32: Let cpu_lm32_init() return LM32CPU, (continued)
- [Qemu-devel] [PATCH for-next 40/74] r2d: Store SuperHCPU in ResetData, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 38/74] target-sh4: Let cpu_sh4_init() return SuperHCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 45/74] milkymist: Store LM32 in ResetInfo, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 53/74] axis_dev88: Use cpu_cris_init() to obtain CRISCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 50/74] xtensa_lx60: Pass XtensaCPU to lx60_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 42/74] lm32_boards: Use cpu_lm32_init() to obtain LM32CPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 48/74] xtensa_sim: Pass XtensaCPU to sim_reset(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 46/74] target-xtensa: Let cpu_xtensa_init() return XtensaCPU,
Andreas Färber <=
- [Qemu-devel] [PATCH for-next 47/74] xtensa_sim: Use cpu_xtensa_init() to obtain XtensaCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 52/74] target-cris: Let cpu_cris_init() return CRISCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 51/74] target-cris: Reindent cpu_cris_init(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 43/74] lm32_boards: Store LM32CPU in ResetInfo, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 55/74] cris-boot: Pass CRISCPU to main_cpu_reset()., Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 60/74] target-mips: Use cpu_reset() in do_interrupt(), Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 57/74] petalogix_ml605: Use cpu_mb_init() to obtain MicroBlazeCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 56/74] target-microblaze: Let cpu_mb_init() return MicroBlazeCPU, Andreas Färber, 2012/05/06
- [Qemu-devel] [PATCH for-next 62/74] mips_fulong2e: Use cpu_mips_cpu() to obtain MIPSCPU, Andreas Färber, 2012/05/06