From patchwork Sat Feb 16 15:45:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Andreas_F=C3=A4rber?= X-Patchwork-Id: 220995 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6AB8D2C007B for ; Sun, 17 Feb 2013 04:17:39 +1100 (EST) Received: from localhost ([::1]:46965 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6lOL-00056m-CV for incoming@patchwork.ozlabs.org; Sat, 16 Feb 2013 12:17:37 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39122) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6k17-0005Er-03 for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:49:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1U6k13-0002RP-DR for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:49:32 -0500 Received: from cantor2.suse.de ([195.135.220.15]:40410 helo=mx2.suse.de) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1U6k13-0002RD-73 for qemu-devel@nongnu.org; Sat, 16 Feb 2013 10:49:29 -0500 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id B17D1A398D; Sat, 16 Feb 2013 16:49:28 +0100 (CET) From: =?UTF-8?q?Andreas=20F=C3=A4rber?= To: qemu-devel@nongnu.org Date: Sat, 16 Feb 2013 16:45:25 +0100 Message-Id: <1361029542-8412-31-git-send-email-afaerber@suse.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1361029542-8412-1-git-send-email-afaerber@suse.de> References: <1361029542-8412-1-git-send-email-afaerber@suse.de> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4.x X-Received-From: 195.135.220.15 Cc: =?UTF-8?q?Andreas=20F=C3=A4rber?= , Paul Brook Subject: [Qemu-devel] [PATCH 30/47] target-m68k: Return M68kCPU from cpu_m68k_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Turn cpu_init() into a static inline function for backwards compatibility. Signed-off-by: Andreas Färber --- target-m68k/cpu.h | 12 ++++++++++-- target-m68k/helper.c | 4 ++-- 2 Dateien geändert, 12 Zeilen hinzugefügt(+), 4 Zeilen entfernt(-) diff --git a/target-m68k/cpu.h b/target-m68k/cpu.h index 94937c4..ed9be80 100644 --- a/target-m68k/cpu.h +++ b/target-m68k/cpu.h @@ -117,7 +117,7 @@ typedef struct CPUM68KState { void m68k_tcg_init(void); void m68k_cpu_init_gdb(M68kCPU *cpu); -CPUM68KState *cpu_m68k_init(const char *cpu_model); +M68kCPU *cpu_m68k_init(const char *cpu_model); int cpu_m68k_exec(CPUM68KState *s); void do_interrupt(CPUM68KState *env1); void do_interrupt_m68k_hardirq(CPUM68KState *env1); @@ -215,7 +215,15 @@ void register_m68k_insns (CPUM68KState *env); #define TARGET_PHYS_ADDR_SPACE_BITS 32 #define TARGET_VIRT_ADDR_SPACE_BITS 32 -#define cpu_init cpu_m68k_init +static inline CPUM68KState *cpu_init(const char *cpu_model) +{ + M68kCPU *cpu = cpu_m68k_init(cpu_model); + if (cpu == NULL) { + return NULL; + } + return &cpu->env; +} + #define cpu_exec cpu_m68k_exec #define cpu_gen_code cpu_m68k_gen_code #define cpu_signal_handler cpu_m68k_signal_handler diff --git a/target-m68k/helper.c b/target-m68k/helper.c index 6030807..7d3fd94 100644 --- a/target-m68k/helper.c +++ b/target-m68k/helper.c @@ -98,7 +98,7 @@ static int fpu_gdb_set_reg(CPUM68KState *env, uint8_t *mem_buf, int n) return 0; } -CPUM68KState *cpu_m68k_init(const char *cpu_model) +M68kCPU *cpu_m68k_init(const char *cpu_model) { M68kCPU *cpu; CPUM68KState *env; @@ -116,7 +116,7 @@ CPUM68KState *cpu_m68k_init(const char *cpu_model) object_property_set_bool(OBJECT(cpu), true, "realized", NULL); - return env; + return cpu; } void m68k_cpu_init_gdb(M68kCPU *cpu)