On Mon May 27, 2024 at 9:12 AM AEST, BALATON Zoltan wrote:
> In ppc6xx_tlb_pte_check() the pp variable is used only once to pass it
> to a function parameter with the same name. Remove the local and
> inline the value. Also use named constant for the hex value to make it
> clearer.
>
Reviewed-by: Nicholas Piggin <npig...@gmail.com>
> Signed-off-by: BALATON Zoltan <bala...@eik.bme.hu>
> ---
> target/ppc/mmu_common.c | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
> index b21f52290f..799d2ced9b 100644
> --- a/target/ppc/mmu_common.c
> +++ b/target/ppc/mmu_common.c
> @@ -98,13 +98,12 @@ static int ppc6xx_tlb_pte_check(mmu_ctx_t *ctx,
> target_ulong pte0,
> target_ulong pte1, int pteh,
> MMUAccessType access_type)
> {
> - int ret, pp;
> + int ret;
>
> ret = -1;
> /* Check validity and table match */
> if (pte_is_valid(pte0) && ((pte0 >> 6) & 1) == pteh) {
> /* Check vsid & api */
> - pp = pte1 & 0x00000003;
> if ((pte0 & PTE_PTEM_MASK) == ctx->ptem) {
> if (ctx->raddr != (hwaddr)-1ULL) {
> /* all matches should have equal RPN, WIMG & PP */
> @@ -115,7 +114,7 @@ static int ppc6xx_tlb_pte_check(mmu_ctx_t *ctx,
> target_ulong pte0,
> }
> /* Keep the matching PTE information */
> ctx->raddr = pte1;
> - ctx->prot = ppc_hash32_prot(ctx->key, pp, ctx->nx);
> + ctx->prot = ppc_hash32_prot(ctx->key, pte1 & HPTE32_R_PP,
> ctx->nx);
> if (check_prot_access_type(ctx->prot, access_type)) {
> /* Access granted */
> qemu_log_mask(CPU_LOG_MMU, "PTE access granted !\n");
