[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/6] target-unicore32: Make uc32_cpu_init() return Un
From: |
Andreas Färber |
Subject: |
[Qemu-devel] [PULL 3/6] target-unicore32: Make uc32_cpu_init() return UniCore32CPU |
Date: |
Tue, 10 Mar 2015 19:22:17 +0100 |
From: Eduardo Habkost <address@hidden>
This way, the cpu_init() function in target-unicore32 will follow the
same pattern used on all other architectures.
Signed-off-by: Eduardo Habkost <address@hidden>
Signed-off-by: Andreas Färber <address@hidden>
---
target-unicore32/cpu.h | 14 ++++++++++++--
target-unicore32/helper.c | 10 ++--------
2 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/target-unicore32/cpu.h b/target-unicore32/cpu.h
index 50972f9..11d76dc 100644
--- a/target-unicore32/cpu.h
+++ b/target-unicore32/cpu.h
@@ -122,11 +122,9 @@ void cpu_asr_write(CPUUniCore32State *env1, target_ulong
val, target_ulong mask)
#define UC32_HWCAP_CMOV 4 /* 1 << 2 */
#define UC32_HWCAP_UCF64 8 /* 1 << 3 */
-#define cpu_init uc32_cpu_init
#define cpu_exec uc32_cpu_exec
#define cpu_signal_handler uc32_cpu_signal_handler
-CPUUniCore32State *uc32_cpu_init(const char *cpu_model);
int uc32_cpu_exec(CPUUniCore32State *s);
int uc32_cpu_signal_handler(int host_signum, void *pinfo, void *puc);
@@ -143,6 +141,18 @@ static inline int cpu_mmu_index(CPUUniCore32State *env)
#include "cpu-qom.h"
#include "exec/exec-all.h"
+UniCore32CPU *uc32_cpu_init(const char *cpu_model);
+
+static inline CPUUniCore32State *cpu_init(const char *cpu_model)
+{
+ UniCore32CPU *cpu = uc32_cpu_init(cpu_model);
+ if (cpu == NULL) {
+ return NULL;
+ }
+ return &cpu->env;
+
+}
+
static inline void cpu_get_tb_cpu_state(CPUUniCore32State *env, target_ulong
*pc,
target_ulong *cs_base, int *flags)
{
diff --git a/target-unicore32/helper.c b/target-unicore32/helper.c
index b4654fa..ae63277 100644
--- a/target-unicore32/helper.c
+++ b/target-unicore32/helper.c
@@ -25,15 +25,9 @@
#define DPRINTF(fmt, ...) do {} while (0)
#endif
-CPUUniCore32State *uc32_cpu_init(const char *cpu_model)
+UniCore32CPU *uc32_cpu_init(const char *cpu_model)
{
- UniCore32CPU *cpu;
-
- cpu = UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));
- if (cpu == NULL) {
- return NULL;
- }
- return &cpu->env;
+ return UNICORE32_CPU(cpu_generic_init(TYPE_UNICORE32_CPU, cpu_model));
}
uint32_t HELPER(clo)(uint32_t x)
--
2.1.4
- [Qemu-devel] [PULL 0/6] QOM CPUState patch queue 2015-03-10, Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 1/6] cpu: Add missing documentation for some CPUClass methods, Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 5/6] unicore32: Use uc32_cpu_init(), Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 6/6] cpu: Make cpu_init() return QOM CPUState object, Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 4/6] m68k: Use cpu_m68k_init(), Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 2/6] target-i386: Clean up misuse of qdev_init() in realize method, Andreas Färber, 2015/03/10
- [Qemu-devel] [PULL 3/6] target-unicore32: Make uc32_cpu_init() return UniCore32CPU,
Andreas Färber <=
- Re: [Qemu-devel] [PULL 0/6] QOM CPUState patch queue 2015-03-10, Peter Maydell, 2015/03/11