From patchwork Sun Aug 1 17:37:03 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Herv=C3=A9_Poussineau?= X-Patchwork-Id: 60472 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id A86B61007D1 for ; Mon, 2 Aug 2010 04:14:56 +1000 (EST) Received: from localhost ([127.0.0.1]:46207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofd3l-00006u-4h for incoming@patchwork.ozlabs.org; Sun, 01 Aug 2010 14:14:53 -0400 Received: from [140.186.70.92] (port=41718 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ofczh-0006iB-3h for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:10:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1Ofczf-0005rg-Kb for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:10:40 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:42831) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1Ofcze-0005rO-V1 for qemu-devel@nongnu.org; Sun, 01 Aug 2010 14:10:39 -0400 Received: from localhost.localdomain (unknown [88.171.126.33]) by smtp5-g21.free.fr (Postfix) with ESMTP id 7E073D4802A; Sun, 1 Aug 2010 20:10:32 +0200 (CEST) From: =?UTF-8?q?Herv=C3=A9=20Poussineau?= To: qemu-devel@nongnu.org Date: Sun, 1 Aug 2010 19:37:03 +0200 Message-Id: <1280684242-19611-1-git-send-email-hpoussin@reactos.org> X-Mailer: git-send-email 1.7.1.GIT In-Reply-To: <4C5579DA.8050508@reactos.org> References: <4C5579DA.8050508@reactos.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) Cc: =?UTF-8?q?Herv=C3=A9=20Poussineau?= Subject: [Qemu-devel] [PATCH 01/20] [MIPS] cpu: add a init inplace method X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Signed-off-by: Hervé Poussineau --- target-mips/cpu.h | 1 + target-mips/translate.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/target-mips/cpu.h b/target-mips/cpu.h index b8e6fee..b75e1e6 100644 --- a/target-mips/cpu.h +++ b/target-mips/cpu.h @@ -586,6 +586,7 @@ enum { int cpu_mips_exec(CPUMIPSState *s); CPUMIPSState *cpu_mips_init(const char *cpu_model); +int cpu_mips_init_inplace(CPUMIPSState *env, const char *cpu_model); //~ uint32_t cpu_mips_get_clock (void); int cpu_mips_signal_handler(int host_signum, void *pinfo, void *puc); diff --git a/target-mips/translate.c b/target-mips/translate.c index 20b66a8..558f6ac 100644 --- a/target-mips/translate.c +++ b/target-mips/translate.c @@ -12580,15 +12580,13 @@ static void mips_tcg_init(void) #include "translate_init.c" -CPUMIPSState *cpu_mips_init (const char *cpu_model) +int cpu_mips_init_inplace(CPUMIPSState *env, const char *cpu_model) { - CPUMIPSState *env; const mips_def_t *def; def = cpu_mips_find_by_name(cpu_model); if (!def) - return NULL; - env = qemu_mallocz(sizeof(CPUMIPSState)); + return -1; env->cpu_model = def; env->cpu_model_str = cpu_model; @@ -12601,6 +12599,16 @@ CPUMIPSState *cpu_mips_init (const char *cpu_model) mips_tcg_init(); cpu_reset(env); qemu_init_vcpu(env); + return 0; +} + +CPUMIPSState *cpu_mips_init (const char *cpu_model) +{ + CPUMIPSState *env; + + env = qemu_mallocz(sizeof(CPUMIPSState)); + if (!cpu_mips_init_inplace(env, cpu_model)) + return NULL; return env; }