| Message ID | 6b845babbcee896afca10204f43ce0990dac43ff.1716763435.git.balaton@eik.bme.hu (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remaining MMU clean up patches | expand |
On Mon May 27, 2024 at 9:12 AM AEST, BALATON Zoltan wrote: > This is used only once and can be inlined. > Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > 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 93559447ff..160311de87 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_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_prot(key, pte.pte1 & HPTE32_R_PP, sr & SR32_NX); > > if (!check_prot_access_type(prot, access_type)) { > /* Access right violation */
diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c index 93559447ff..160311de87 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_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_prot(key, pte.pte1 & HPTE32_R_PP, sr & SR32_NX); if (!check_prot_access_type(prot, access_type)) { /* Access right violation */
This is used only once and can be inlined. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- target/ppc/mmu-hash32.c | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-)