From nobody Tue Nov 18 04:25:31 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) client-ip=209.85.128.51; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-wm1-f51.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1607890815; cv=none; d=zohomail.com; s=zohoarc; b=bifcao/5u/ecetzpDa0jCSzP6/Jr5UTDbU/WCydt7pYWqa2APxP1GQkvELA723JPvtMHGriUdxz30GjkIEuwvjwjylAXOSU75HNFEJaWJcIk1Ss7RaJ/qehdSMm/JJvVoC8ONJ+iK/+RKJWduM3joPG9zOWD1YwNGt1kIew0CeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1607890815; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=2ISNCVzJYbaoq1vI61by2IBAkaqbdNie7OHgVDeXnbA=; b=lOyGzPwXt4OfS5aFH8xHhRqN2W77XeYceBBFQNxRNGj4y2FyG9pwIXBwEsE2gV7wiU1D0KV36K5/tHQigTHBjrjzFfjW/2LwWn3oFn2B1jacPwC49dqKnc6+4tZ3bv/8/7bFW6KOxTNVr1jGX5KjQpYS9eSN62c7m1/uz4mH+7A= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.128.51 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mx.zohomail.com with SMTPS id 1607890815738587.793118693284; Sun, 13 Dec 2020 12:20:15 -0800 (PST) Received: by mail-wm1-f51.google.com with SMTP id 190so1719939wmz.0 for ; Sun, 13 Dec 2020 12:20:15 -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 l8sm20448668wrb.73.2020.12.13.12.20.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 13 Dec 2020 12:20:13 -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=2ISNCVzJYbaoq1vI61by2IBAkaqbdNie7OHgVDeXnbA=; b=QnkMcMiqG8UVyDMMuGRox71t7T+UqZBUKvKswBUB2KOeED01VBfl1gTqc5svpwe1CC rgudl0VE4QS0bigb8esLT9df+NjBOsWyrZfVj+qQPS449oSmXo9w2OybNxuwdEVbGcnf 9OZMrO0pd1dU/wYb+ybwrpJ0agz5ct4pj1VARipaQZi2eWaE2lDbgFBkJv4TXxPQ73ds n3sXcx4L7PddPgiwLLwSksoL8J28lLeRaYWBl/pcU7PRnZTDyVwPmI//BYk9vZdt7FsQ HwBqSaqbkszXuQTYtepR5kp0AgKMRup1qCrXkbc0/S+7Kkax0P9mPw/pOaLd5c2R2Ccw wprA== 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=2ISNCVzJYbaoq1vI61by2IBAkaqbdNie7OHgVDeXnbA=; b=WTDk1QqzmGAdaP/BAqMfjn0UeWUo/yqLjEVGvEHu2igVb357H+5/+lEqtyg9sFX5C9 wR92LFwsvSuY+LFp/2V0Jv2GK3r13xjnaSq+BIpDlTj657U//6fq/1n32QK6NufB+kKn ufztLMV+QxZtaMov3I0xC0cXN4p1P+SxfS+Q096nZgTB1FLtrXny871RrsQX+qG1C7qG FOt1hDZPbvn7E0yG/LVMJrrx/+ygdnuhX0WgO3yvnBOLyTFIEzbojQO8T7RVwzd0flhw DAPA5OvRz1Pnteg+4ol0xhG15yTvuG9JsVX4SuYBR7PIwJEJ8JX7ggBbii61PKHdlj6A YOBQ== X-Gm-Message-State: AOAM5322YFi8PYF1qByH3YKyEXzRtw2x9o6yExmv+TH+pOo28BfQIEWv sdK0SbAo84xixzmarI1SdQc= X-Google-Smtp-Source: ABdhPJw2ev9B7VvAvmY2StzAj4Kxo6/UL0BE2A2EbJKABhbhMiX+nTwfhVj5Xh5TwXp8OPQeLmPEsw== X-Received: by 2002:a1c:2b46:: with SMTP id r67mr24316116wmr.162.1607890813972; Sun, 13 Dec 2020 12:20:13 -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: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Paolo Bonzini , Aurelien Jarno , Aleksandar Rikalo , kvm@vger.kernel.org, Jiaxun Yang , Huacai Chen , Paul Burton , Richard Henderson , Huacai Chen Subject: [PULL 05/26] target/mips: Replace magic values by CP0PM_MASK or TARGET_PAGE_BITS_MIN Date: Sun, 13 Dec 2020 21:19:25 +0100 Message-Id: <20201213201946.236123-6-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201213201946.236123-1-f4bug@amsat.org> References: <20201213201946.236123-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: Richard Henderson Reviewed-by: Huacai Chen Message-Id: <20201109090422.2445166-2-f4bug@amsat.org> --- 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