From nobody Mon Nov 17 15:41:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) client-ip=209.85.128.52; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f52.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 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=1604912672; cv=none; d=zohomail.com; s=zohoarc; b=i3AgiYW/5AsfPYT8nkW8enaivrHj2wEJQVHMrY2mZZ/bYzFu2y+WTueEvc2wG0x29tclnmI/itHB5qOthNmqT7Bkm16tejLky/ZpVcCRPeUoE5qnhW+AbykT+hyNYORHjmcO7Imw0Q+m8Gyj97/IGQMKKiHLQuiFaJf9IWS9ffw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604912672; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=5aSUYg2Mch9yEMUswE4iSf091+MmmBptqeNiWdRkEPc=; b=S2Gxk/feOHcdRZEAm1/9hnsGgN7zA5yDwUyxcYq6e9dwzM4Ek6Eu02U5AOZyPe3WsMFo5RLfAtK3RbuMX8S7Hi8A1cNkcEaBoJP4sx5hNaL8DH1nQLSx3cp2bt874WLw1NoNJZn8zkVpEpCGfnXSb6U2uIBcaj7xlHWX5tRyV0I= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.52 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.zohomail.com with SMTPS id 1604912672145746.2000794899914; Mon, 9 Nov 2020 01:04:32 -0800 (PST) Received: by mail-wm1-f52.google.com with SMTP id w24so4705266wmi.0 for ; Mon, 09 Nov 2020 01:04:31 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id v189sm12897575wmg.14.2020.11.09.01.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 01:04:29 -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=5aSUYg2Mch9yEMUswE4iSf091+MmmBptqeNiWdRkEPc=; b=lIZv3aY3Gz3khvYeiLr4vLd86FdoG938AtFtCLgew6LAQ5QhOK7PTxqQixdcYRP/sS OZcDa5WQaiTQQeHp8wFGLbTDiSg8H9eOqEBF1aqY4C+XzmFY5ImG/NnHLy+vw3buQVkE WTtU6319QNwHVreMiXuWJJPMSA01Ox++vmlL77sxy+tok/sMeSO9eHo1nhUogXHmBQF9 +zPO1B44Bu/t8PKqvCIUtjJoUq/Gtdbo4hizV9O28lilTMW/d2pvtoDT9ZFY2bhLzTva ZY4sgezZolGpKVyetOu27ErIyhxcXbQtovZ0TrZVD3xPAcNGpYne4z8d+e4XI4k6DThq UKCQ== 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=5aSUYg2Mch9yEMUswE4iSf091+MmmBptqeNiWdRkEPc=; b=Dk+5uTxSPwreM+/2C3xkqGF5fYAmBhoiiTaA3IWxwWiEEvqCmP0/U/Juq4iG9nT8Qk uX+rCv00na360gVVI/8NzrHYIpQ0pTHax9sPt2cWTNbwlBrDoNozk47/nj0ANCfBu6rE zPin2IPXLU22slolghsjPoNvPFVG7Ga5RSRx4Hu2n870/m8OkOFjvVE0z1U8SKYRnjDS /OVA6qKYeNI/+oCVPAuSmo2nCAwLnBWnXW24E+/vKJnfIDZs1qD5/+tBja12aUF1iXnf 1U93707GV5oN6TXnToxie51pU3P0EIvpOKnhv4w2PK6dncPK2coYKjBMG1Bl5JJf1ey8 8KSg== X-Gm-Message-State: AOAM530UagNvhjGtSA9BktfWUZn/nnAFEzLZLLWQuolG7Xb2urwXDFaL JSP2QSprAx6i/d631b+iLrI= X-Google-Smtp-Source: ABdhPJx/hVFfIGjxCZwPejObwmTYI5537kNcDShkbsz60iR7H6l0ExEe2kpekgrXoV4WAOFjSCFRZQ== X-Received: by 2002:a1c:6182:: with SMTP id v124mr13035118wmb.94.1604912670197; Mon, 09 Nov 2020 01:04:30 -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: Aurelien Jarno , Richard Henderson , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Huacai Chen Subject: [PATCH-for-6.0 1/2] target/mips: Replace magic values by CP0PM_MASK or TARGET_PAGE_BITS_MIN Date: Mon, 9 Nov 2020 10:04:21 +0100 Message-Id: <20201109090422.2445166-2-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201109090422.2445166-1-f4bug@amsat.org> References: <20201109090422.2445166-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) Replace magic values related to page size: 12 -> TARGET_PAGE_BITS_MIN 13 -> CP0PM_MASK Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Huacai Chen Reviewed-by: Richard Henderson --- target/mips/cp0_helper.c | 5 +++-- target/mips/helper.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/target/mips/cp0_helper.c b/target/mips/cp0_helper.c index a1b5140ccaf..e8b9343ec9c 100644 --- a/target/mips/cp0_helper.c +++ b/target/mips/cp0_helper.c @@ -904,7 +904,7 @@ void update_pagemask(CPUMIPSState *env, target_ulong ar= g1, int32_t *pagemask) goto invalid; } /* We don't support VTLB entry smaller than target page */ - if ((maskbits + 12) < TARGET_PAGE_BITS) { + if ((maskbits + TARGET_PAGE_BITS_MIN) < TARGET_PAGE_BITS) { goto invalid; } env->CP0_PageMask =3D mask << CP0PM_MASK; @@ -913,7 +913,8 @@ void update_pagemask(CPUMIPSState *env, target_ulong ar= g1, int32_t *pagemask) =20 invalid: /* When invalid, set to default target page size. */ - env->CP0_PageMask =3D (~TARGET_PAGE_MASK >> 12) << CP0PM_MASK; + mask =3D (~TARGET_PAGE_MASK >> TARGET_PAGE_BITS_MIN); + env->CP0_PageMask =3D mask << CP0PM_MASK; } =20 void helper_mtc0_pagemask(CPUMIPSState *env, target_ulong arg1) diff --git a/target/mips/helper.c b/target/mips/helper.c index 063b65c0528..041432489d6 100644 --- a/target/mips/helper.c +++ b/target/mips/helper.c @@ -858,8 +858,8 @@ refill: break; } } - pw_pagemask =3D m >> 12; - update_pagemask(env, pw_pagemask << 13, &pw_pagemask); + pw_pagemask =3D m >> TARGET_PAGE_BITS_MIN; + update_pagemask(env, pw_pagemask << CP0PM_MASK, &pw_pagemask); pw_entryhi =3D (address & ~0x1fff) | (env->CP0_EntryHi & 0xFF); { target_ulong tmp_entryhi =3D env->CP0_EntryHi; --=20 2.26.2 From nobody Mon Nov 17 15:41:15 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) client-ip=209.85.128.42; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f42.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1604912677; cv=none; d=zohomail.com; s=zohoarc; b=jWASbHvrqP8aVshD1wmD+P4Jz8Edl0t15lmv8gu4jzZqqsk7Rur5AziAzgytc6tdPuLGHsJpa4XxyntmgqQsL6birzL7UZ5Bx17wgAYSs/YcjO6t7x5TALhKoEAap0L+khc7tEtvZEwjzR+iajJG8llbgPj9B1PEC9Pb90dHwfA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1604912677; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4iA14pMte+lLwGaPb2y/KEmFhKOga8L8HWf/hgu+TMo=; b=SdwMVv9P4QXJUs9uDFfvNK1/oBYeQNM2PV9Av6fQzlXHWLiIyTRQqBIjlDpn/zUKh/OFWiHljFq2i1kA3nvW3BvggXa/orWECsz7jqtMITx+35XSGmogQ4nhaZoyrvm3bpWI2epEihuiVHJkHlZB4T3HLNCxofFWdjMIY5c+woQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.42 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mx.zohomail.com with SMTPS id 16049126770163.9546238780330896; Mon, 9 Nov 2020 01:04:37 -0800 (PST) Received: by mail-wm1-f42.google.com with SMTP id v5so7221388wmh.1 for ; Mon, 09 Nov 2020 01:04:36 -0800 (PST) Return-Path: Return-Path: Received: from localhost.localdomain (234.red-83-42-66.dynamicip.rima-tde.net. [83.42.66.234]) by smtp.gmail.com with ESMTPSA id c6sm9331031wrh.74.2020.11.09.01.04.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Nov 2020 01:04:34 -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=4iA14pMte+lLwGaPb2y/KEmFhKOga8L8HWf/hgu+TMo=; b=K2Eyj06bf3tPKrM81ShncH+o9UPUrlfNh/gVA+0lHvDz4nGwvAjrLFm+EwlTJbJl9T hhwKJpQH1Mlh47ec1jkMdBGEjwOpLFTBNAhvNfuMujEJSLjk0hbdOReSC3IHMa/sdoV5 OvIeOmDtJQaFiWdLBVh7uCJV7Ho0yzOafxAI5M5J5uvCThC6aKLAUO1m56bNJnl5i5rQ 0WfVQd3g2nkw21oVGmZtLGNHAMngjFrgsJYDoH72++ufLYQzs2LvoENTPq/RJM1mel8Z 1ujQVUIuNdH5U1sIrwM6L2GaPBu5YMx7eZwyz/BHZCNtp/8AET1ThOS8oC0R066M1hOY 09GQ== 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=4iA14pMte+lLwGaPb2y/KEmFhKOga8L8HWf/hgu+TMo=; b=fb5gG8gp2CnbsKpuCCrxX1XwBI1GhfejH8yik/RZ/0ugwmLM/+rP6IYrJ+ACM8q2v5 j8HwXNwxxz48DyLlHYD7r5E7qKc3Jj9IsaYntgGRmm0Nla45fbdpOmupYYew3RSEt60O AWm4vebrg8PpDkeaDyw50kMcKVlq70HD+c0pu5xNpRXiOnyzTH8s9ekxBt1WOi3HpSLD 7vQDzTON6UOQ7qMLSKjo+WMrPUr0BcmsoSuG1i1eG95F+H/HD72Pq1Anbu93w2m5MteZ daZ5LWPqSJwsnL8Ul4ArUW7rYDEtGlRey2S7//xcpZXVBjxQh6HOu3ukt+dX/t+PdcGa u/Qg== X-Gm-Message-State: AOAM533QUEh+P47escFQT6cjMynBV6ll7n6t+LKk3VTj7IVYrr6ZSZFl hi7H/ZKANXO+eauXaCtfCG8= X-Google-Smtp-Source: ABdhPJwkK9vDeSl0oD2yv3kQkwg9Uvw+UGDmoySB+VICWikI8scJa04k8TMlI3iOBmonFWBEZIqNEw== X-Received: by 2002:a1c:4957:: with SMTP id w84mr13283993wma.84.1604912675079; Mon, 09 Nov 2020 01:04:35 -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: Aurelien Jarno , Richard Henderson , Aleksandar Rikalo , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Jiaxun Yang , Huacai Chen Subject: [PATCH-for-6.0 2/2] target/mips: Do not include CP0 helpers in user-mode emulation Date: Mon, 9 Nov 2020 10:04:22 +0100 Message-Id: <20201109090422.2445166-3-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201109090422.2445166-1-f4bug@amsat.org> References: <20201109090422.2445166-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) CP0 helpers are restricted to system-mode emulation. Do not intent do build cp0_helper.c in user-mode (this allows to simplify some #ifdef'ry). Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Huacai Chen Reviewed-by: Richard Henderson --- target/mips/cp0_helper.c | 4 ---- target/mips/meson.build | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/target/mips/cp0_helper.c b/target/mips/cp0_helper.c index e8b9343ec9c..caaaefcc8ad 100644 --- a/target/mips/cp0_helper.c +++ b/target/mips/cp0_helper.c @@ -32,7 +32,6 @@ #include "sysemu/kvm.h" =20 =20 -#ifndef CONFIG_USER_ONLY /* SMP helpers. */ static bool mips_vpe_is_wfi(MIPSCPU *c) { @@ -1667,10 +1666,8 @@ target_ulong helper_evpe(CPUMIPSState *env) } return prev; } -#endif /* !CONFIG_USER_ONLY */ =20 /* R6 Multi-threading */ -#ifndef CONFIG_USER_ONLY target_ulong helper_dvp(CPUMIPSState *env) { CPUState *other_cs =3D first_cpu; @@ -1709,4 +1706,3 @@ target_ulong helper_evp(CPUMIPSState *env) } return prev; } -#endif /* !CONFIG_USER_ONLY */ diff --git a/target/mips/meson.build b/target/mips/meson.build index fa1f024e782..681a5524c0e 100644 --- a/target/mips/meson.build +++ b/target/mips/meson.build @@ -1,6 +1,5 @@ mips_ss =3D ss.source_set() mips_ss.add(files( - 'cp0_helper.c', 'cpu.c', 'dsp_helper.c', 'fpu_helper.c', @@ -15,6 +14,7 @@ =20 mips_softmmu_ss =3D ss.source_set() mips_softmmu_ss.add(files( + 'cp0_helper.c', 'cp0_timer.c', 'machine.c', 'mips-semi.c', --=20 2.26.2