Re: [PATCH v7 52/61] target/ppc/mmu-hash32.c: Inline and remove ppc_hash32_pte_prot()

[BALATON Zoltan <balaton@eik.bme.hu>]

On Fri, 17 May 2024, Nicholas Piggin wrote:
> On Mon May 13, 2024 at 9:28 AM AEST, BALATON Zoltan wrote:
>> This is used only once and can be inlined.
>
> This reminds me, ppc_hash32_pp_prot() calculates prot from
> pp and nx (which is not from pp but from segment) and from
> key of course. It could be renamed to say ppc_hash32_prot().
> Maybe do that when you split out the rearranging of that
> function.

OK, I can rename it again. This is what you said before:
https://lists.nongnu.org/archive/html/qemu-ppc/2024-05/msg00120.html
that's why it was kept as it is but I'll drop the pp form the name.

Regards,
BALATON Zoltan

> Thanks,
> Nick
>
>>
>> Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
>> ---
>>  target/ppc/mmu-hash32.c | 19 ++++---------------
>>  1 file changed, 4 insertions(+), 15 deletions(-)
>>
>> diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c
>> index 8e5e83f46a..9de42713b3 100644
>> --- a/target/ppc/mmu-hash32.c
>> +++ b/target/ppc/mmu-hash32.c
>> @@ -37,17 +37,6 @@
>>  #  define LOG_BATS(...) do { } while (0)
>>  #endif
>>
>> -static int ppc_hash32_pte_prot(int mmu_idx,
>> -                               target_ulong sr, ppc_hash_pte32_t pte)
>> -{
>> -    unsigned pp, key;
>> -
>> -    key = ppc_hash32_key(mmuidx_pr(mmu_idx), sr);
>> -    pp = pte.pte1 & HPTE32_R_PP;
>> -
>> -    return ppc_hash32_pp_prot(key, pp, !!(sr & SR32_NX));
>> -}
>> -
>>  static target_ulong hash32_bat_size(int mmu_idx,
>>                                      target_ulong batu, target_ulong batl)
>>  {
>> @@ -341,10 +330,10 @@ bool ppc_hash32_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type,
>>      CPUState *cs = CPU(cpu);
>>      CPUPPCState *env = &cpu->env;
>>      target_ulong sr;
>> -    hwaddr pte_offset;
>> +    hwaddr pte_offset, raddr;
>>      ppc_hash_pte32_t pte;
>> +    bool key;
>>      int prot;
>> -    hwaddr raddr;
>>
>>      /* There are no hash32 large pages. */
>>      *psizep = TARGET_PAGE_BITS;
>> @@ -426,8 +415,8 @@ bool ppc_hash32_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type,
>>                  "found PTE at offset %08" HWADDR_PRIx "\n", pte_offset);
>>
>>      /* 7. Check access permissions */
>> -
>> -    prot = ppc_hash32_pte_prot(mmu_idx, sr, pte);
>> +    key = ppc_hash32_key(mmuidx_pr(mmu_idx), sr);
>> +    prot = ppc_hash32_pp_prot(key, pte.pte1 & HPTE32_R_PP, sr & SR32_NX);
>>
>>      if (!check_prot_access_type(prot, access_type)) {
>>          /* Access right violation */
>
>
>