From nobody Tue Feb 10 14:33:34 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) client-ip=209.85.221.41; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wr1-f41.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1607971104; cv=none; d=zohomail.com; s=zohoarc; b=fNcFW6EP97/nIiXVtypD4I2F0OQQdR5c5vV+HVc2l1YiKC3UmyDi5zAklP5Agh48CSQssxTqzxL2uJxbRVa+/ii6IXdKXn4o9vm9NEpOgBX+1g9ptGwp7I4rJjNKyDBw8E2yo3/4c6M6yUy0SBVgTxW6UzPNvad3JP6IGkR2L1U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607971104; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=Pxw5yz+fseWQ/dQcwxqgNwkSctI6l6EW+pu9mjED4a0=; b=k0nTgzQmCmRh50Obz9On6LI7PdBLq1aKdWr9OiRj4TVrOnlBkxCZfMwFuQUI/bpkR+emR967Gic4aZufiKTwvzS4LZxgvtZSyPlF668LucuH8wRF+rto1ftd9iHK/Rzo9N+2wTNBBCA8y4kLX+doj1tl7ZDadzqXysRAO8Newdk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.221.41 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mx.zohomail.com with SMTPS id 160797110493171.89804756253261; Mon, 14 Dec 2020 10:38:24 -0800 (PST) Received: by mail-wr1-f41.google.com with SMTP id a11so9707089wrr.13 for ; Mon, 14 Dec 2020 10:38:24 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (101.red-88-21-206.staticip.rima-tde.net. [88.21.206.101]) by smtp.gmail.com with ESMTPSA id e16sm36965915wra.94.2020.12.14.10.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 14 Dec 2020 10:38:22 -0800 (PST) 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=Pxw5yz+fseWQ/dQcwxqgNwkSctI6l6EW+pu9mjED4a0=; b=eG+rZt31DsZsT8XFwZ5zWXKppwa4lzEcEGnNBXebed7vDj4MxqtXSGUsR4eixHW6pm F3ExTzKgY2hVmLcA3Y/+M+pFCCt38W0keXX9wK3Cv3DL94W5Dl+wZkmAM6Q5BYHeC/uq Fw6kUyCzIjcIHR/cjpLO/lBUgMhkO1nTIP/lLf6fINpRKhD1j8odvqEWMT7oO2HPQhWz Y58qS5FvhifFEjWdVGKBIKj8m+/ZChqwnfdRFnXrmdxB+oOvoIuc3J56FVZjwifkdqXQ F2ysxu2Xu+2pRtQQC+DEtw5Mvrl4Tr7Km/4Aal9bAH4Hky2pwOiCzdCS84N6KiU5q0BD NKzw== 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=Pxw5yz+fseWQ/dQcwxqgNwkSctI6l6EW+pu9mjED4a0=; b=MCbwmfh3M7AVg0XcoYklshYS/DLAiy37h0b2vlthCyAkSCEkm2Su2lcfCYCc16gjsf nNKNL/hasqDj1zVSCbuM+cB6HumPaioo2yeyoodr6VV0zXO0XVH38sUWtO19GzaJ6b/c Jmow9owlNn9LF2VVf8ssFT2JhxoQmJX/YDDejJC25uUNLDysbEq7gJSZwUUhRg3vUPm6 xdj4v7yVYzd/P/BcMIOTeZsukLuYiAqi09WL0ABj62Ik5jnJXSbDl9CVkUwv5ApvjlC3 THCvKq/r8SgZkLhc8S5GMpJrQr7B6LczrfuGp3AilWzn4tMYGNGbEY9+u9WC2e20OWsJ erWQ== X-Gm-Message-State: AOAM530z95bguYVBdiXouB6DWTp9mq2wjzHz/sGSyLvSv08TicZk5jZ4 j+rP6HeH2e1kcuZQV6s8Ij8= X-Google-Smtp-Source: ABdhPJziMYXAnUWCqbPBIaNucXK2KRgqogVbVQ+OduRyvXOkAxSuRmEn6ZfGwHWYFMs9FiPSOATzPg== X-Received: by 2002:a5d:43c3:: with SMTP id v3mr6016210wrr.184.1607971102985; Mon, 14 Dec 2020 10:38:22 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Aurelien Jarno , Huacai Chen , Aleksandar Rikalo , Jiaxun Yang , Laurent Vivier , Paolo Bonzini , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Richard Henderson Subject: [PATCH v2 08/16] target/mips: Move mmu_init() functions to tlb_helper.c Date: Mon, 14 Dec 2020 19:37:31 +0100 Message-Id: <20201214183739.500368-9-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201214183739.500368-1-f4bug@amsat.org> References: <20201214183739.500368-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Richard Henderson Message-Id: <20201206233949.3783184-15-f4bug@amsat.org> --- target/mips/internal.h | 1 + target/mips/tlb_helper.c | 46 ++++++++++++++++++++++++++++++ target/mips/translate_init.c.inc | 48 -------------------------------- 3 files changed, 47 insertions(+), 48 deletions(-) diff --git a/target/mips/internal.h b/target/mips/internal.h index c1401492c46..968a3a8db8f 100644 --- a/target/mips/internal.h +++ b/target/mips/internal.h @@ -207,6 +207,7 @@ void cpu_mips_start_count(CPUMIPSState *env); void cpu_mips_stop_count(CPUMIPSState *env); =20 /* helper.c */ +void mmu_init(CPUMIPSState *env, const mips_def_t *def); bool mips_cpu_tlb_fill(CPUState *cs, vaddr address, int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 2e52539a511..94a482e3dbe 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -120,6 +120,52 @@ int r4k_map_address(CPUMIPSState *env, hwaddr *physica= l, int *prot, return TLBRET_NOMATCH; } =20 +static void no_mmu_init(CPUMIPSState *env, const mips_def_t *def) +{ + env->tlb->nb_tlb =3D 1; + env->tlb->map_address =3D &no_mmu_map_address; +} + +static void fixed_mmu_init(CPUMIPSState *env, const mips_def_t *def) +{ + env->tlb->nb_tlb =3D 1; + env->tlb->map_address =3D &fixed_mmu_map_address; +} + +static void r4k_mmu_init(CPUMIPSState *env, const mips_def_t *def) +{ + env->tlb->nb_tlb =3D 1 + ((def->CP0_Config1 >> CP0C1_MMU) & 63); + env->tlb->map_address =3D &r4k_map_address; + env->tlb->helper_tlbwi =3D r4k_helper_tlbwi; + env->tlb->helper_tlbwr =3D r4k_helper_tlbwr; + env->tlb->helper_tlbp =3D r4k_helper_tlbp; + env->tlb->helper_tlbr =3D r4k_helper_tlbr; + env->tlb->helper_tlbinv =3D r4k_helper_tlbinv; + env->tlb->helper_tlbinvf =3D r4k_helper_tlbinvf; +} + +void mmu_init(CPUMIPSState *env, const mips_def_t *def) +{ + env->tlb =3D g_malloc0(sizeof(CPUMIPSTLBContext)); + + switch (def->mmu_type) { + case MMU_TYPE_NONE: + no_mmu_init(env, def); + break; + case MMU_TYPE_R4000: + r4k_mmu_init(env, def); + break; + case MMU_TYPE_FMT: + fixed_mmu_init(env, def); + break; + case MMU_TYPE_R3000: + case MMU_TYPE_R6000: + case MMU_TYPE_R8000: + default: + cpu_abort(env_cpu(env), "MMU type not supported\n"); + } +} + static int is_seg_am_mapped(unsigned int am, bool eu, int mmu_idx) { /* diff --git a/target/mips/translate_init.c.inc b/target/mips/translate_init.= c.inc index ff14502529b..a788f5a6b6d 100644 --- a/target/mips/translate_init.c.inc +++ b/target/mips/translate_init.c.inc @@ -933,54 +933,6 @@ void mips_cpu_list(void) } } =20 -#ifndef CONFIG_USER_ONLY -static void no_mmu_init(CPUMIPSState *env, const mips_def_t *def) -{ - env->tlb->nb_tlb =3D 1; - env->tlb->map_address =3D &no_mmu_map_address; -} - -static void fixed_mmu_init(CPUMIPSState *env, const mips_def_t *def) -{ - env->tlb->nb_tlb =3D 1; - env->tlb->map_address =3D &fixed_mmu_map_address; -} - -static void r4k_mmu_init(CPUMIPSState *env, const mips_def_t *def) -{ - env->tlb->nb_tlb =3D 1 + ((def->CP0_Config1 >> CP0C1_MMU) & 63); - env->tlb->map_address =3D &r4k_map_address; - env->tlb->helper_tlbwi =3D r4k_helper_tlbwi; - env->tlb->helper_tlbwr =3D r4k_helper_tlbwr; - env->tlb->helper_tlbp =3D r4k_helper_tlbp; - env->tlb->helper_tlbr =3D r4k_helper_tlbr; - env->tlb->helper_tlbinv =3D r4k_helper_tlbinv; - env->tlb->helper_tlbinvf =3D r4k_helper_tlbinvf; -} - -static void mmu_init(CPUMIPSState *env, const mips_def_t *def) -{ - env->tlb =3D g_malloc0(sizeof(CPUMIPSTLBContext)); - - switch (def->mmu_type) { - case MMU_TYPE_NONE: - no_mmu_init(env, def); - break; - case MMU_TYPE_R4000: - r4k_mmu_init(env, def); - break; - case MMU_TYPE_FMT: - fixed_mmu_init(env, def); - break; - case MMU_TYPE_R3000: - case MMU_TYPE_R6000: - case MMU_TYPE_R8000: - default: - cpu_abort(env_cpu(env), "MMU type not supported\n"); - } -} -#endif /* CONFIG_USER_ONLY */ - static void fpu_init (CPUMIPSState *env, const mips_def_t *def) { int i; --=20 2.26.2