Re: [PATCH v2 17/55] target/sparc: Set fault address in sparc_cpu_do_unaligned_access - Mark Cave-Ayland

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
To: Richard Henderson <richard.henderson@linaro.org>, qemu-devel@nongnu.org
Subject: Re: [PATCH v2 17/55] target/sparc: Set fault address in sparc_cpu_do_unaligned_access
Date: Wed, 18 Aug 2021 09:47:06 +0100	[thread overview]
Message-ID: <300951db-bc99-a3bb-f2af-af8451c7d4d0@ilande.co.uk> (raw)
In-Reply-To: <20210803041443.55452-18-richard.henderson@linaro.org>

On 03/08/2021 05:14, Richard Henderson wrote:

> We ought to have been recording the virtual address for reporting
> to the guest trap handler.  Move the function to mmu_helper.c, so
> that we can re-use code shared with get_physical_address_data.
> 
> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>   target/sparc/ldst_helper.c | 13 -------------
>   target/sparc/mmu_helper.c  | 18 ++++++++++++++++++
>   2 files changed, 18 insertions(+), 13 deletions(-)
> 
> diff --git a/target/sparc/ldst_helper.c b/target/sparc/ldst_helper.c
> index 974afea041..ea163200a4 100644
> --- a/target/sparc/ldst_helper.c
> +++ b/target/sparc/ldst_helper.c
> @@ -1953,16 +1953,3 @@ void sparc_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr,
>                             is_asi, size, retaddr);
>   }
>   #endif
> -
> -#if !defined(CONFIG_USER_ONLY)
> -void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
> -                                                 MMUAccessType access_type,
> -                                                 int mmu_idx,
> -                                                 uintptr_t retaddr)
> -{
> -    SPARCCPU *cpu = SPARC_CPU(cs);
> -    CPUSPARCState *env = &cpu->env;
> -
> -    cpu_raise_exception_ra(env, TT_UNALIGNED, retaddr);
> -}
> -#endif
> diff --git a/target/sparc/mmu_helper.c b/target/sparc/mmu_helper.c
> index 5b2fda534a..2f260b0085 100644
> --- a/target/sparc/mmu_helper.c
> +++ b/target/sparc/mmu_helper.c
> @@ -946,4 +946,22 @@ hwaddr sparc_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)
>       }
>       return phys_addr;
>   }
> +
> +void QEMU_NORETURN sparc_cpu_do_unaligned_access(CPUState *cs, vaddr addr,
> +                                                 MMUAccessType access_type,
> +                                                 int mmu_idx,
> +                                                 uintptr_t retaddr)
> +{
> +    SPARCCPU *cpu = SPARC_CPU(cs);
> +    CPUSPARCState *env = &cpu->env;
> +
> +#ifdef TARGET_SPARC64
> +    env->dmmu.sfsr = build_sfsr(env, mmu_idx, access_type);
> +    env->dmmu.sfar = addr;
> +#else
> +    env->mmuregs[4] = addr;
>   #endif
> +
> +    cpu_raise_exception_ra(env, TT_UNALIGNED, retaddr);
> +}
> +#endif /* CONFIG_USER_ONLY */

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

ATB,

Mark.