On Mon May 27, 2024 at 9:12 AM AEST, BALATON Zoltan wrote:
> In mmu6xx_get_physical_address() ds is used as bool, declare it as
> such. Also use named constant instead of hex value.
Oh nx was bool, ignore my previous comment then.
Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
>
> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
> ---
> target/ppc/mmu_common.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
> index 9f402a979d..5145bde7f9 100644
> --- a/target/ppc/mmu_common.c
> +++ b/target/ppc/mmu_common.c
> @@ -321,8 +321,8 @@ static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
> PowerPCCPU *cpu = env_archcpu(env);
> hwaddr hash;
> target_ulong vsid, sr, pgidx;
> - int ds, target_page_bits;
> - bool pr, nx;
> + int target_page_bits;
> + bool pr, ds, nx;
>
> /* First try to find a BAT entry if there are any */
> if (env->nb_BATs && get_bat_6xx_tlb(env, ctx, eaddr, access_type) == 0) {
> @@ -335,7 +335,7 @@ static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
> sr = env->sr[eaddr >> 28];
> ctx->key = (((sr & 0x20000000) && pr) ||
> ((sr & 0x40000000) && !pr)) ? 1 : 0;
> - ds = sr & 0x80000000 ? 1 : 0;
> + ds = sr & SR32_T;
> nx = sr & SR32_NX;
> vsid = sr & SR32_VSID;
> target_page_bits = TARGET_PAGE_BITS;