From: Bruno Piazera Larsen <bruno.larsen@eldorado.org.br>
To: "Lucas Mateus Castro (alqotel)" <lucas.araujo@eldorado.org.br>,
qemu-devel@nongnu.org, qemu-ppc@nongnu.org
Cc: luis.pires@eldorado.org.br, fernando.valle@eldorado.org.br,
matheus.ferst@eldorado.org.br, david@gibson.dropbear.id.au
Subject: Re: [PATCH v2 3/3] target/ppc: moved ppc_store_sdr1 to mmu_common.c
Date: Thu, 10 Jun 2021 13:54:24 -0300 [thread overview]
Message-ID: <9f391290-a5b5-6508-e75a-9c2630c41e64@eldorado.org.br> (raw)
In-Reply-To: <20210610164648.83878-4-lucas.araujo@eldorado.org.br>
[-- Attachment #1: Type: text/plain, Size: 3759 bytes --]
On 10/06/2021 13:46, Lucas Mateus Castro (alqotel) wrote:
> Moved ppc_store_sdr1 to mmu_common.c as it was originally in
> mmu_helper.c.
>
> Signed-off-by: Lucas Mateus Castro (alqotel) <lucas.araujo@eldorado.org.br>
> ---
> target/ppc/cpu.c | 28 ----------------------------
> target/ppc/mmu_common.c | 28 ++++++++++++++++++++++++++++
> 2 files changed, 28 insertions(+), 28 deletions(-)
>
> diff --git a/target/ppc/cpu.c b/target/ppc/cpu.c
> index 19d67b5b07..7ad9bd6044 100644
> --- a/target/ppc/cpu.c
> +++ b/target/ppc/cpu.c
> @@ -67,34 +67,6 @@ uint32_t ppc_get_vscr(CPUPPCState *env)
> return env->vscr | (sat << VSCR_SAT);
> }
>
> -#ifdef CONFIG_SOFTMMU
> -void ppc_store_sdr1(CPUPPCState *env, target_ulong value)
> -{
> - PowerPCCPU *cpu = env_archcpu(env);
> - qemu_log_mask(CPU_LOG_MMU, "%s: " TARGET_FMT_lx "\n", __func__, value);
> - assert(!cpu->vhyp);
> -#if defined(TARGET_PPC64)
> - if (mmu_is_64bit(env->mmu_model)) {
> - target_ulong sdr_mask = SDR_64_HTABORG | SDR_64_HTABSIZE;
> - target_ulong htabsize = value & SDR_64_HTABSIZE;
> -
> - if (value & ~sdr_mask) {
> - qemu_log_mask(LOG_GUEST_ERROR, "Invalid bits 0x"TARGET_FMT_lx
> - " set in SDR1", value & ~sdr_mask);
> - value &= sdr_mask;
> - }
> - if (htabsize > 28) {
> - qemu_log_mask(LOG_GUEST_ERROR, "Invalid HTABSIZE 0x" TARGET_FMT_lx
> - " stored in SDR1", htabsize);
> - return;
> - }
> - }
> -#endif /* defined(TARGET_PPC64) */
> - /* FIXME: Should check for valid HTABMASK values in 32-bit case */
> - env->spr[SPR_SDR1] = value;
> -}
> -#endif /* CONFIG_SOFTMMU */
> -
> /* GDBstub can read and write MSR... */
> void ppc_store_msr(CPUPPCState *env, target_ulong value)
> {
> diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
> index 93e7b8f955..54c6a7ac6f 100644
> --- a/target/ppc/mmu_common.c
> +++ b/target/ppc/mmu_common.c
> @@ -58,6 +58,34 @@
> # define LOG_BATS(...) do { } while (0)
> #endif
>
> +#ifdef CONFIG_SOFTMMU
> +void ppc_store_sdr1(CPUPPCState *env, target_ulong value)
> +{
> + PowerPCCPU *cpu = env_archcpu(env);
> + qemu_log_mask(CPU_LOG_MMU, "%s: " TARGET_FMT_lx "\n", __func__, value);
> + assert(!cpu->vhyp);
> +#if defined(TARGET_PPC64)
> + if (mmu_is_64bit(env->mmu_model)) {
> + target_ulong sdr_mask = SDR_64_HTABORG | SDR_64_HTABSIZE;
> + target_ulong htabsize = value & SDR_64_HTABSIZE;
> +
> + if (value & ~sdr_mask) {
> + qemu_log_mask(LOG_GUEST_ERROR, "Invalid bits 0x"TARGET_FMT_lx
> + " set in SDR1", value & ~sdr_mask);
> + value &= sdr_mask;
> + }
> + if (htabsize > 28) {
> + qemu_log_mask(LOG_GUEST_ERROR, "Invalid HTABSIZE 0x" TARGET_FMT_lx
> + " stored in SDR1", htabsize);
> + return;
> + }
> + }
> +#endif /* defined(TARGET_PPC64) */
> + /* FIXME: Should check for valid HTABMASK values in 32-bit case */
> + env->spr[SPR_SDR1] = value;
> +}
> +#endif /* CONFIG_SOFTMMU */
> +
> /*****************************************************************************/
> /* PowerPC MMU emulation */
>
Maybe just a nit, but if this file is being compiled, CONFIG_SOFTMMU
will be defined. This ifdef here is redundant. I only added because it
was needed for cpu.c
Other than that, LGTM
--
Bruno Piazera Larsen
Instituto de Pesquisas ELDORADO
<https://www.eldorado.org.br/?utm_campaign=assinatura_de_e-mail&utm_medium=email&utm_source=RD+Station>
Departamento Computação Embarcada
Analista de Software Trainee
Aviso Legal - Disclaimer <https://www.eldorado.org.br/disclaimer.html>
[-- Attachment #2: Type: text/html, Size: 4373 bytes --]
prev parent reply other threads:[~2021-06-10 16:57 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 16:46 [PATCH v2 0/3] target/ppc: mmu cleanup Lucas Mateus Castro (alqotel)
2021-06-10 16:46 ` [PATCH v2 1/3] target/ppc: Turn ppc_tlb_invalid_all in a noop Lucas Mateus Castro (alqotel)
2021-06-10 17:07 ` Bruno Piazera Larsen
2021-06-15 5:38 ` David Gibson
2021-06-15 16:24 ` Lucas Mateus Martins Araujo e Castro
2021-06-10 16:46 ` [PATCH v2 2/3] target/ppc: divided mmu_helper.c in 2 files Lucas Mateus Castro (alqotel)
2021-06-15 5:42 ` David Gibson
2021-06-15 18:44 ` Lucas Mateus Martins Araujo e Castro
2021-06-10 16:46 ` [PATCH v2 3/3] target/ppc: moved ppc_store_sdr1 to mmu_common.c Lucas Mateus Castro (alqotel)
2021-06-10 16:54 ` Bruno Piazera Larsen [this message]
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=9f391290-a5b5-6508-e75a-9c2630c41e64@eldorado.org.br \
--to=bruno.larsen@eldorado.org.br \
--cc=david@gibson.dropbear.id.au \
--cc=fernando.valle@eldorado.org.br \
--cc=lucas.araujo@eldorado.org.br \
--cc=luis.pires@eldorado.org.br \
--cc=matheus.ferst@eldorado.org.br \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.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 read-only IMAP folder(s) and NNTP newsgroup(s).