From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:36218) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiUy-0002VL-NC for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:23:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SbiUv-0008Dm-Bw for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:23:52 -0400 Received: from cantor2.suse.de ([195.135.220.15]:52693 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SbiUv-0008D2-0Q for qemu-devel@nongnu.org; Mon, 04 Jun 2012 21:23:49 -0400 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Tue, 5 Jun 2012 03:21:50 +0200 Message-Id: <1338859366-20689-19-git-send-email-afaerber@suse.de> In-Reply-To: <1338859366-20689-1-git-send-email-afaerber@suse.de> References: <1338859366-20689-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Subject: [Qemu-devel] [PATCH 18/74] target-cris: Let cpu_cris_init() return CRISCPU List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: "Edgar E. Iglesias" , =?UTF-8?q?Andreas=20F=C3=A4rber?= Turn cpu_init macro into a static inline function returning CPUCRISState for backwards compatibility. Signed-off-by: Andreas F=C3=A4rber Acked-by: Edgar E. Iglesias --- target-cris/cpu.h | 12 ++++++++++-- target-cris/translate.c | 8 ++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/target-cris/cpu.h b/target-cris/cpu.h index 5449cc4..a760367 100644 --- a/target-cris/cpu.h +++ b/target-cris/cpu.h @@ -171,7 +171,7 @@ typedef struct CPUCRISState { =20 #include "cpu-qom.h" =20 -CPUCRISState *cpu_cris_init(const char *cpu_model); +CRISCPU *cpu_cris_init(const char *cpu_model); int cpu_cris_exec(CPUCRISState *s); void cpu_cris_close(CPUCRISState *s); void do_interrupt(CPUCRISState *env); @@ -216,7 +216,15 @@ enum { #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 =20 -#define cpu_init cpu_cris_init +static inline CPUCRISState *cpu_init(const char *cpu_model) +{ + CRISCPU *cpu =3D cpu_cris_init(cpu_model); + if (cpu =3D=3D NULL) { + return NULL; + } + return &cpu->env; +} + #define cpu_exec cpu_cris_exec #define cpu_gen_code cpu_cris_gen_code #define cpu_signal_handler cpu_cris_signal_handler diff --git a/target-cris/translate.c b/target-cris/translate.c index a398057..eed03d3 100644 --- a/target-cris/translate.c +++ b/target-cris/translate.c @@ -3503,7 +3503,7 @@ static uint32_t vr_by_name(const char *name) return 32; } =20 -CPUCRISState *cpu_cris_init (const char *cpu_model) +CRISCPU *cpu_cris_init(const char *cpu_model) { CRISCPU *cpu; CPUCRISState *env; @@ -3519,7 +3519,7 @@ CPUCRISState *cpu_cris_init (const char *cpu_model) qemu_init_vcpu(env); =20 if (tcg_initialized) { - return env; + return cpu; } =20 tcg_initialized =3D 1; @@ -3529,7 +3529,7 @@ CPUCRISState *cpu_cris_init (const char *cpu_model) =20 if (env->pregs[PR_VR] < 32) { cpu_crisv10_init(env); - return env; + return cpu; } =20 =20 @@ -3573,7 +3573,7 @@ CPUCRISState *cpu_cris_init (const char *cpu_model) pregnames[i]); } =20 - return env; + return cpu; } =20 void cpu_state_reset(CPUCRISState *env) --=20 1.7.7