From nobody Mon Feb 9 04:46:19 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1500040546539788.5446979338076; Fri, 14 Jul 2017 06:55:46 -0700 (PDT) Received: from localhost ([::1]:38138 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW14I-0004e7-3z for importer@patchew.org; Fri, 14 Jul 2017 09:55:42 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41073) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dW11H-0001Bw-0n for qemu-devel@nongnu.org; Fri, 14 Jul 2017 09:52:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dW11F-00017a-BC for qemu-devel@nongnu.org; Fri, 14 Jul 2017 09:52:35 -0400 Received: from mx1.redhat.com ([209.132.183.28]:42526) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dW11F-00017M-24 for qemu-devel@nongnu.org; Fri, 14 Jul 2017 09:52:33 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E685F7CE1D; Fri, 14 Jul 2017 13:52:31 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by smtp.corp.redhat.com (Postfix) with ESMTP id D890B6BF68; Fri, 14 Jul 2017 13:52:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com E685F7CE1D Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=imammedo@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com E685F7CE1D From: Igor Mammedov To: qemu-devel@nongnu.org Date: Fri, 14 Jul 2017 15:51:52 +0200 Message-Id: <1500040339-119465-2-git-send-email-imammedo@redhat.com> In-Reply-To: <1500040339-119465-1-git-send-email-imammedo@redhat.com> References: <1500040339-119465-1-git-send-email-imammedo@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 14 Jul 2017 13:52:32 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 01/28] mips: cpu: move mmu/fpu/mvp_init to realize time 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: Yongbok Kim , Peter Maydell , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Aurelien Jarno , Eduardo Habkost Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" it will help to replace custom cpu_mips_init() with cpu_generic_init(). Signed-off-by: Igor Mammedov Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- CC: Aurelien Jarno CC: Yongbok Kim --- target/mips/cpu.h | 3 +++ target/mips/cpu.c | 9 +++++++++ target/mips/translate.c | 7 ------- target/mips/translate_init.c | 6 +++--- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/target/mips/cpu.h b/target/mips/cpu.h index 4a4747a..9c32228 100644 --- a/target/mips/cpu.h +++ b/target/mips/cpu.h @@ -1070,4 +1070,7 @@ static inline void QEMU_NORETURN do_raise_exception(C= PUMIPSState *env, do_raise_exception_err(env, exception, 0, pc); } =20 +void mips_cpu_mmu_init(CPUMIPSState *env, const mips_def_t *def); +void mips_cpu_fpu_init(CPUMIPSState *env, const mips_def_t *def); +void mips_cpu_mvp_init(CPUMIPSState *env, const mips_def_t *def); #endif /* MIPS_CPU_H */ diff --git a/target/mips/cpu.c b/target/mips/cpu.c index 1bb66b7..82afdaa 100644 --- a/target/mips/cpu.c +++ b/target/mips/cpu.c @@ -122,9 +122,18 @@ static void mips_cpu_disas_set_info(CPUState *s, disas= semble_info *info) { static void mips_cpu_realizefn(DeviceState *dev, Error **errp) { CPUState *cs =3D CPU(dev); + MIPSCPU *cpu =3D MIPS_CPU(dev); + CPUMIPSState *env =3D &cpu->env; MIPSCPUClass *mcc =3D MIPS_CPU_GET_CLASS(dev); Error *local_err =3D NULL; =20 + env->exception_base =3D (int32_t)0xBFC00000; +#ifndef CONFIG_USER_ONLY + mips_cpu_mmu_init(env, env->cpu_model); +#endif + mips_cpu_fpu_init(env, env->cpu_model); + mips_cpu_mvp_init(env, env->cpu_model); + cpu_exec_realizefn(cs, &local_err); if (local_err !=3D NULL) { error_propagate(errp, local_err); diff --git a/target/mips/translate.c b/target/mips/translate.c index 559f8fe..7b3ae81 100644 --- a/target/mips/translate.c +++ b/target/mips/translate.c @@ -20203,13 +20203,6 @@ MIPSCPU *cpu_mips_init(const char *cpu_model) cpu =3D MIPS_CPU(object_new(TYPE_MIPS_CPU)); env =3D &cpu->env; env->cpu_model =3D def; - env->exception_base =3D (int32_t)0xBFC00000; - -#ifndef CONFIG_USER_ONLY - mmu_init(env, def); -#endif - fpu_init(env, def); - mvp_init(env, def); =20 object_property_set_bool(OBJECT(cpu), true, "realized", NULL); =20 diff --git a/target/mips/translate_init.c b/target/mips/translate_init.c index 6ae23e4..c771ff1 100644 --- a/target/mips/translate_init.c +++ b/target/mips/translate_init.c @@ -851,7 +851,7 @@ static void r4k_mmu_init (CPUMIPSState *env, const mips= _def_t *def) env->tlb->helper_tlbinvf =3D r4k_helper_tlbinvf; } =20 -static void mmu_init (CPUMIPSState *env, const mips_def_t *def) +void mips_cpu_mmu_init(CPUMIPSState *env, const mips_def_t *def) { MIPSCPU *cpu =3D mips_env_get_cpu(env); =20 @@ -876,7 +876,7 @@ static void mmu_init (CPUMIPSState *env, const mips_def= _t *def) } #endif /* CONFIG_USER_ONLY */ =20 -static void fpu_init (CPUMIPSState *env, const mips_def_t *def) +void mips_cpu_fpu_init(CPUMIPSState *env, const mips_def_t *def) { int i; =20 @@ -886,7 +886,7 @@ static void fpu_init (CPUMIPSState *env, const mips_def= _t *def) memcpy(&env->active_fpu, &env->fpus[0], sizeof(env->active_fpu)); } =20 -static void mvp_init (CPUMIPSState *env, const mips_def_t *def) +void mips_cpu_mvp_init(CPUMIPSState *env, const mips_def_t *def) { env->mvp =3D g_malloc0(sizeof(CPUMIPSMVPContext)); =20 --=20 2.7.4