[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 07/74] target-lm32: Let cpu_lm32_init() return LM32C
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PATCH 07/74] target-lm32: Let cpu_lm32_init() return LM32CPU |
Date: |
Tue, 5 Jun 2012 03:21:39 +0200 |
Make the include paths for cpu-qom.h consistent to allow using LM32CPU
in cpu.h.
Turn cpu_init macro into a static inline function returning CPULM32State
for backwards compatibility.
Signed-off-by: Andreas Färber <address@hidden>
Acked-by: Michael Walle <address@hidden>
---
target-lm32/cpu.c | 2 +-
target-lm32/cpu.h | 12 ++++++++++--
target-lm32/helper.c | 4 ++--
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/target-lm32/cpu.c b/target-lm32/cpu.c
index 48a5fe3..caa4834 100644
--- a/target-lm32/cpu.c
+++ b/target-lm32/cpu.c
@@ -18,7 +18,7 @@
* <http://www.gnu.org/licenses/lgpl-2.1.html>
*/
-#include "cpu-qom.h"
+#include "cpu.h"
#include "qemu-common.h"
diff --git a/target-lm32/cpu.h b/target-lm32/cpu.h
index 422a55b..da80469 100644
--- a/target-lm32/cpu.h
+++ b/target-lm32/cpu.h
@@ -186,7 +186,7 @@ struct CPULM32State {
#include "cpu-qom.h"
-CPULM32State *cpu_lm32_init(const char *cpu_model);
+LM32CPU *cpu_lm32_init(const char *cpu_model);
void cpu_lm32_list(FILE *f, fprintf_function cpu_fprintf);
int cpu_lm32_exec(CPULM32State *s);
void cpu_lm32_close(CPULM32State *s);
@@ -199,8 +199,16 @@ int cpu_lm32_signal_handler(int host_signum, void *pinfo,
void lm32_translate_init(void);
void cpu_lm32_set_phys_msb_ignore(CPULM32State *env, int value);
+static inline CPULM32State *cpu_init(const char *cpu_model)
+{
+ LM32CPU *cpu = cpu_lm32_init(cpu_model);
+ if (cpu == NULL) {
+ return NULL;
+ }
+ return &cpu->env;
+}
+
#define cpu_list cpu_lm32_list
-#define cpu_init cpu_lm32_init
#define cpu_exec cpu_lm32_exec
#define cpu_gen_code cpu_lm32_gen_code
#define cpu_signal_handler cpu_lm32_signal_handler
diff --git a/target-lm32/helper.c b/target-lm32/helper.c
index d0bc193..3b1cee7 100644
--- a/target-lm32/helper.c
+++ b/target-lm32/helper.c
@@ -192,7 +192,7 @@ static uint32_t cfg_by_def(const LM32Def *def)
return cfg;
}
-CPULM32State *cpu_lm32_init(const char *cpu_model)
+LM32CPU *cpu_lm32_init(const char *cpu_model)
{
LM32CPU *cpu;
CPULM32State *env;
@@ -219,7 +219,7 @@ CPULM32State *cpu_lm32_init(const char *cpu_model)
lm32_translate_init();
}
- return env;
+ return cpu;
}
/* Some soc ignores the MSB on the address bus. Thus creating a shadow memory
--
1.7.7
- [Qemu-devel] [PULL] QOM CPUState, part 3: cpu_state_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 02/74] pxa2xx: Use cpu_arm_init() and store ARMCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 01/74] target-arm: Use cpu_reset() in cpu_arm_init(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 04/74] armv7m: Use cpu_arm_init() to obtain ARMCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 05/74] armv7m: Pass ARMCPU to armv7m_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 06/74] arm_boot: Pass ARMCPU to do_cpu_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 03/74] omap: Use cpu_arm_init() to store ARMCPU in omap_mpu_state_s, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 07/74] target-lm32: Let cpu_lm32_init() return LM32CPU,
Andreas Färber <=
- [Qemu-devel] [PATCH 08/74] lm32_boards: Use cpu_lm32_init() to obtain LM32CPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 09/74] lm32_boards: Store LM32CPU in ResetInfo, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 10/74] milkymist: Use cpu_lm32_init() to obtain LM32CPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 11/74] milkymist: Store LM32 in ResetInfo, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 12/74] target-xtensa: Let cpu_xtensa_init() return XtensaCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 15/74] xtensa_lx60: Use cpu_xtensa_init() to obtain XtensaCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 14/74] xtensa_sim: Pass XtensaCPU to sim_reset(), Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 19/74] axis_dev88: Use cpu_cris_init() to obtain CRISCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 13/74] xtensa_sim: Use cpu_xtensa_init() to obtain XtensaCPU, Andreas Färber, 2012/06/04
- [Qemu-devel] [PATCH 16/74] xtensa_lx60: Pass XtensaCPU to lx60_reset(), Andreas Färber, 2012/06/04