On Thu May 2, 2024 at 9:43 AM AEST, BALATON Zoltan wrote:
> Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
Reviewed-by: Nicholas Piggin <npig...@gmail.com>
> ---
> target/ppc/mmu_common.c | 25 +++++++++----------------
> 1 file changed, 9 insertions(+), 16 deletions(-)
>
> diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
> index fab86a8f3e..760e4072b2 100644
> --- a/target/ppc/mmu_common.c
> +++ b/target/ppc/mmu_common.c
> @@ -665,31 +665,24 @@ static int mmubooke_get_physical_address(CPUPPCState
> *env, mmu_ctx_t *ctx,
> MMUAccessType access_type)
> {
> ppcemb_tlb_t *tlb;
> - hwaddr raddr;
> - int i, ret;
> + hwaddr raddr = (hwaddr)-1ULL;
> + int i, ret = -1;
>
> - ret = -1;
> - raddr = (hwaddr)-1ULL;
> for (i = 0; i < env->nb_tlb; i++) {
> tlb = &env->tlb.tlbe[i];
> ret = mmubooke_check_tlb(env, tlb, &raddr, &ctx->prot, address,
> access_type, i);
> if (ret != -1) {
> + if (ret >= 0) {
> + ctx->raddr = raddr;
> + }
> break;
> }
> }
> -
> - if (ret >= 0) {
> - ctx->raddr = raddr;
> - qemu_log_mask(CPU_LOG_MMU, "%s: access granted " TARGET_FMT_lx
> - " => " HWADDR_FMT_plx " %d %d\n", __func__,
> - address, ctx->raddr, ctx->prot, ret);
> - } else {
> - qemu_log_mask(CPU_LOG_MMU, "%s: access refused " TARGET_FMT_lx
> - " => " HWADDR_FMT_plx " %d %d\n", __func__,
> - address, raddr, ctx->prot, ret);
> - }
> -
> + qemu_log_mask(CPU_LOG_MMU,
> + "%s: access %s " TARGET_FMT_lx " => " HWADDR_FMT_plx
> + " %d %d\n", __func__, ret < 0 ? "refused" : "granted",
> + address, raddr, ctx->prot, ret);
> return ret;
> }
>
