From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: qemu-devel@nongnu.org
Cc: "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>,
"Paul Burton" <paulburton@kernel.org>,
kvm@vger.kernel.org, "Huacai Chen" <chenhuacai@kernel.org>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Jiaxun Yang" <jiaxun.yang@flygoat.com>,
"Huacai Chen" <chenhc@lemote.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
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 [thread overview]
Message-ID: <20201213201946.236123-6-f4bug@amsat.org> (raw)
In-Reply-To: <20201213201946.236123-1-f4bug@amsat.org>
Replace magic values related to page size:
12 -> TARGET_PAGE_BITS_MIN
13 -> CP0PM_MASK
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Huacai Chen <chenhc@lemote.com>
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 arg1, 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 = mask << CP0PM_MASK;
@@ -913,7 +913,8 @@ void update_pagemask(CPUMIPSState *env, target_ulong arg1, int32_t *pagemask)
invalid:
/* When invalid, set to default target page size. */
- env->CP0_PageMask = (~TARGET_PAGE_MASK >> 12) << CP0PM_MASK;
+ mask = (~TARGET_PAGE_MASK >> TARGET_PAGE_BITS_MIN);
+ env->CP0_PageMask = mask << CP0PM_MASK;
}
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 = m >> 12;
- update_pagemask(env, pw_pagemask << 13, &pw_pagemask);
+ pw_pagemask = m >> TARGET_PAGE_BITS_MIN;
+ update_pagemask(env, pw_pagemask << CP0PM_MASK, &pw_pagemask);
pw_entryhi = (address & ~0x1fff) | (env->CP0_EntryHi & 0xFF);
{
target_ulong tmp_entryhi = env->CP0_EntryHi;
--
2.26.2
next prev parent reply other threads:[~2020-12-13 20:25 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-13 20:19 [PULL 00/26] MIPS patches for 2020-12-13 Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 01/26] MAINTAINERS: chenhc@lemote.com -> chenhuacai@kernel.org Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 02/26] target/mips/kvm: Assert unreachable code is not used Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 03/26] target/mips/kvm: Remove unused headers Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 04/26] target/mips: Include "exec/memattrs.h" in 'internal.h' Philippe Mathieu-Daudé
2020-12-13 20:19 ` Philippe Mathieu-Daudé [this message]
2020-12-13 20:19 ` [PULL 06/26] target/mips: Do not include CP0 helpers in user-mode emulation Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 07/26] target/mips: Remove unused headers from cp0_helper.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 08/26] target/mips: Also display exception names in user-mode Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 09/26] target/mips: Allow executing MSA instructions on Loongson-3A4000 Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 10/26] target/mips: Explicit Release 6 MMU types Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 11/26] target/mips: Rename cpu_supports_FEAT() as cpu_type_supports_FEAT() Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 12/26] target/mips: Introduce cpu_supports_isa() taking CPUMIPSState argument Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 13/26] hw/mips: Move address translation helpers to target/mips/ Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 14/26] target/mips: Remove unused headers from translate.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 15/26] target/mips: Remove unused headers from op_helper.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 16/26] target/mips: Remove mips_def_t unused argument from mvp_init() Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 17/26] target/mips: Introduce ase_mt_available() helper Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 18/26] target/mips: Do not initialize MT registers if MT ASE absent Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 19/26] hw/mips/malta: " Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 20/26] hw/mips/malta: Rewrite CP0_MVPConf0 access using deposit() Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 21/26] target/mips: Extract cpu_supports*/cpu_set* translate.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 22/26] target/mips: Move mips_cpu_add_definition() from helper.c to cpu.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 23/26] target/mips: Move cpu definitions, reset() and realize() " Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 24/26] target/mips: Inline cpu_mips_realize_env() in mips_cpu_realizefn() Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 25/26] target/mips: Remove unused headers from fpu_helper.c Philippe Mathieu-Daudé
2020-12-13 20:19 ` [PULL 26/26] target/mips: Use FloatRoundMode enum for FCR31 modes conversion Philippe Mathieu-Daudé
2020-12-14 20:32 ` [PULL 00/26] MIPS patches for 2020-12-13 Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201213201946.236123-6-f4bug@amsat.org \
--to=f4bug@amsat.org \
--cc=aleksandar.rikalo@syrmia.com \
--cc=aurelien@aurel32.net \
--cc=chenhc@lemote.com \
--cc=chenhuacai@kernel.org \
--cc=jiaxun.yang@flygoat.com \
--cc=kvm@vger.kernel.org \
--cc=paulburton@kernel.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).