From patchwork Thu Aug 17 04:30:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 802324 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="rFWt18OB"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xXtbh3x24z9sPt for ; Thu, 17 Aug 2017 14:32:16 +1000 (AEST) Received: from localhost ([::1]:56533 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diCTe-0000XO-2u for incoming@patchwork.ozlabs.org; Thu, 17 Aug 2017 00:32:14 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diCSu-0000Ui-2V for qemu-devel@nongnu.org; Thu, 17 Aug 2017 00:31:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diCSt-0004yy-4L for qemu-devel@nongnu.org; Thu, 17 Aug 2017 00:31:28 -0400 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:36643) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1diCSs-0004yf-Vs for qemu-devel@nongnu.org; Thu, 17 Aug 2017 00:31:27 -0400 Received: by mail-qk0-x242.google.com with SMTP id d21so3741553qke.3 for ; Wed, 16 Aug 2017 21:31:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Ufgy7imhu89KSAhK96N1A+30LzFHlgYENFQ1ftcpK5o=; b=rFWt18OBvI6bi66U5HdeBBq0b3q7to9/1Wl80Fpo7whibmDV+mfc/U410hqTq21s3q SFyAzWYZGcvumkxtZ1zG0eSllatKB7ZVZ+DnIeF+UhJTLaRcR7H2n0pXacFaSPY2yHTH PAVWERV4bC1bS2atxB4oxANFgsZE/NGNNJvXumI+Pg07MbfhlWhcwWYdX8ry4ZaHupx5 PoGTdF14cSq2pA1y8qBxDcrwLqOej9sCA4gx2yAEZlsDM5F9uSom1WsUSHraW2f2CLHl SrP7Dat89PRen0Swz2A2Qgh/mrV3nf6hBk3Y+yVaYP8UwGDSHnFAK0iXm70pY1AH7C+6 wUtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Ufgy7imhu89KSAhK96N1A+30LzFHlgYENFQ1ftcpK5o=; b=fJERk18gzUfj7ZF+MJZ9NOmYtxipgIoBmQt6lym6VmdoMU4vtx0fqlFvC5WMqe2Yg2 nL6YfVRalQrASfi90l/xzcfb07sb82cVg0NukP7diInFEUIovXdssLGjulCfR3csb8Iu pbBms1Cofy9pvlpbNt1R9OJTOzCCJ0LvcVtwV6JptGjiuz8BFMJkbvqtSqlkSedKsnhM NKIiuqstqAz940aePuVZAbO4E3YHm7OsMPaMq0C64TxqgDa6SK5JrU6mnEvfqyr7bgDy HbWhC582d3GeHkToa/pzoTF/zsGBwi8999XV+Gu6Zy4TdDcr+r6nlPDFdNFPssw1Je+q 0Kbw== X-Gm-Message-State: AHYfb5h1kA8kuJICemAo75nBy6CDvpIR6D3iphf8T+9EiNg22dOGCB5D ZXKDHL+nyo6pSQ== X-Received: by 10.55.109.5 with SMTP id i5mr5222975qkc.69.1502944286535; Wed, 16 Aug 2017 21:31:26 -0700 (PDT) Received: from yoga.offpageads.com (host21.190-139-16.telecom.net.ar. [190.139.16.21]) by smtp.gmail.com with ESMTPSA id l11sm1748738qtl.24.2017.08.16.21.31.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2017 21:31:26 -0700 (PDT) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Igor Mammedov , =?UTF-8?q?Herv=C3=A9=20Poussineau?= , Aurelien Jarno , Yongbok Kim Date: Thu, 17 Aug 2017 01:30:57 -0300 Message-Id: <20170817043102.6322-4-f4bug@amsat.org> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170817043102.6322-1-f4bug@amsat.org> References: <20170817043102.6322-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH 3/8] mips: split cpu_mips_realize_env() out of cpu_mips_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , James Hogan , Eduardo Habkost , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" so it can be used in mips_cpu_realizefn() in the next commit Signed-off-by: Philippe Mathieu-Daudé --- target/mips/internal.h | 1 + target/mips/translate.c | 19 ++++++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index 91c2df4537..cf4c9db427 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -132,6 +132,7 @@ void mips_tcg_init(void); /* TODO QOM'ify CPU reset and remove */ void cpu_state_reset(CPUMIPSState *s); +void cpu_mips_realize_env(CPUMIPSState *env); /* cp0_timer.c */ uint32_t cpu_mips_get_random(CPUMIPSState *env); diff --git a/target/mips/translate.c b/target/mips/translate.c index f0febaf1b2..5fc7979ac5 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -20512,6 +20512,17 @@ void mips_tcg_init(void) #include "translate_init.c" +void cpu_mips_realize_env(CPUMIPSState *env) +{ + env->exception_base = (int32_t)0xBFC00000; + +#ifndef CONFIG_USER_ONLY + mmu_init(env, env->cpu_model); +#endif + fpu_init(env, env->cpu_model); + mvp_init(env, env->cpu_model); +} + MIPSCPU *cpu_mips_init(const char *cpu_model) { MIPSCPU *cpu; @@ -20524,13 +20535,7 @@ MIPSCPU *cpu_mips_init(const char *cpu_model) cpu = MIPS_CPU(object_new(TYPE_MIPS_CPU)); env = &cpu->env; env->cpu_model = def; - env->exception_base = (int32_t)0xBFC00000; - -#ifndef CONFIG_USER_ONLY - mmu_init(env, def); -#endif - fpu_init(env, def); - mvp_init(env, def); + cpu_mips_realize_env(env); object_property_set_bool(OBJECT(cpu), true, "realized", NULL);