| Message ID | 0eddf525bf31e603cc561f1c8973ea44247a7bf1.1715125376.git.balaton@eik.bme.hu |
|---|---|
| State | New |
| Headers | show |
| Series | Misc PPC exception and BookE MMU clean ups | expand |
On Wed May 8, 2024 at 10:15 AM AEST, BALATON Zoltan wrote: > The ppc_hash32_pp_prot() function in mmu-hash32.c is the same as > pp_check() in mmu_common.c, merge these to remove duplicated code. > Define the common function in internal.h as static lnline otherwise > exporting the function from mmu-hash32.c would stop the compiler > inlining it which results in slightly lower performance. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > target/ppc/internal.h | 35 ++++++++++++++++++++++++++++++++ > target/ppc/mmu-hash32.c | 45 ----------------------------------------- > target/ppc/mmu_common.c | 44 ++-------------------------------------- > 3 files changed, 37 insertions(+), 87 deletions(-) > > diff --git a/target/ppc/internal.h b/target/ppc/internal.h > index 4a90dd2584..46176c4711 100644 > --- a/target/ppc/internal.h > +++ b/target/ppc/internal.h > @@ -256,6 +256,41 @@ static inline int prot_for_access_type(MMUAccessType access_type) > #ifndef CONFIG_USER_ONLY > > /* PowerPC MMU emulation */ > +static inline int ppc_hash32_pp_prot(int key, int pp, int nx) > +{ > + int prot; > + > + if (key == 0) { > + switch (pp) { > + case 0x0: > + case 0x1: > + case 0x2: > + prot = PAGE_READ | PAGE_WRITE; > + break; > + case 0x3: > + prot = PAGE_READ; > + break; > + default: > + g_assert_not_reached(); > + } > + } else { > + switch (pp) { > + case 0x0: > + prot = 0; > + break; > + case 0x1: > + case 0x3: > + prot = PAGE_READ; > + break; > + case 0x2: > + prot = PAGE_READ | PAGE_WRITE; > + break; > + default: > + g_assert_not_reached(); > + } > + } > + return nx ? prot : prot | PAGE_EXEC; > +} > > bool ppc_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type, > hwaddr *raddrp, int *psizep, int *protp, > diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c > index 6dfedab11d..960751a50e 100644 > --- a/target/ppc/mmu-hash32.c > +++ b/target/ppc/mmu-hash32.c > @@ -43,51 +43,6 @@ struct mmu_ctx_hash32 { > int key; /* Access key */ > }; > > -static int ppc_hash32_pp_prot(int key, int pp, int nx) > -{ > - int prot; > - > - if (key == 0) { > - switch (pp) { > - case 0x0: > - case 0x1: > - case 0x2: > - prot = PAGE_READ | PAGE_WRITE; > - break; > - > - case 0x3: > - prot = PAGE_READ; > - break; > - > - default: > - abort(); > - } > - } else { > - switch (pp) { > - case 0x0: > - prot = 0; > - break; > - > - case 0x1: > - case 0x3: > - prot = PAGE_READ; > - break; > - > - case 0x2: > - prot = PAGE_READ | PAGE_WRITE; > - break; > - > - default: > - abort(); > - } > - } > - if (nx == 0) { > - prot |= PAGE_EXEC; > - } > - > - return prot; > -} > - > static int ppc_hash32_pte_prot(int mmu_idx, > target_ulong sr, ppc_hash_pte32_t pte) > { > diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c > index d92c9607b8..87cac12d68 100644 > --- a/target/ppc/mmu_common.c > +++ b/target/ppc/mmu_common.c > @@ -76,44 +76,6 @@ void ppc_store_sdr1(CPUPPCState *env, target_ulong value) > /*****************************************************************************/ > /* PowerPC MMU emulation */ > > -static int pp_check(int key, int pp, int nx) > -{ > - int access; > - > - /* Compute access rights */ > - access = 0; > - if (key == 0) { > - switch (pp) { > - case 0x0: > - case 0x1: > - case 0x2: > - access |= PAGE_WRITE; > - /* fall through */ > - case 0x3: > - access |= PAGE_READ; > - break; > - } > - } else { > - switch (pp) { > - case 0x0: > - access = 0; > - break; > - case 0x1: > - case 0x3: > - access = PAGE_READ; > - break; > - case 0x2: > - access = PAGE_READ | PAGE_WRITE; > - break; > - } > - } > - if (nx == 0) { > - access |= PAGE_EXEC; > - } > - > - return access; > -} > - > static int check_prot(int prot, MMUAccessType access_type) > { > return prot & prot_for_access_type(access_type) ? 0 : -2; > @@ -141,7 +103,7 @@ static int ppc6xx_tlb_pte_check(mmu_ctx_t *ctx, target_ulong pte0, > MMUAccessType access_type) > { > target_ulong ptem, mmask; > - int access, ret, pteh, ptev, pp; > + int ret, pteh, ptev, pp; > > ret = -1; > /* Check validity and table match */ > @@ -160,11 +122,9 @@ static int ppc6xx_tlb_pte_check(mmu_ctx_t *ctx, target_ulong pte0, > return -3; > } > } > - /* Compute access rights */ > - access = pp_check(ctx->key, pp, ctx->nx); > /* Keep the matching PTE information */ > ctx->raddr = pte1; > - ctx->prot = access; > + ctx->prot = ppc_hash32_pp_prot(ctx->key, pp, ctx->nx); > ret = check_prot(ctx->prot, access_type); > if (ret == 0) { > /* Access granted */
diff --git a/target/ppc/internal.h b/target/ppc/internal.h index 4a90dd2584..46176c4711 100644 --- a/target/ppc/internal.h +++ b/target/ppc/internal.h @@ -256,6 +256,41 @@ static inline int prot_for_access_type(MMUAccessType access_type) #ifndef CONFIG_USER_ONLY /* PowerPC MMU emulation */ +static inline int ppc_hash32_pp_prot(int key, int pp, int nx) +{ + int prot; + + if (key == 0) { + switch (pp) { + case 0x0: + case 0x1: + case 0x2: + prot = PAGE_READ | PAGE_WRITE; + break; + case 0x3: + prot = PAGE_READ; + break; + default: + g_assert_not_reached(); + } + } else { + switch (pp) { + case 0x0: + prot = 0; + break; + case 0x1: + case 0x3: + prot = PAGE_READ; + break; + case 0x2: + prot = PAGE_READ | PAGE_WRITE; + break; + default: + g_assert_not_reached(); + } + } + return nx ? prot : prot | PAGE_EXEC; +} bool ppc_xlate(PowerPCCPU *cpu, vaddr eaddr, MMUAccessType access_type, hwaddr *raddrp, int *psizep, int *protp, diff --git a/target/ppc/mmu-hash32.c b/target/ppc/mmu-hash32.c index 6dfedab11d..960751a50e 100644 --- a/target/ppc/mmu-hash32.c +++ b/target/ppc/mmu-hash32.c @@ -43,51 +43,6 @@ struct mmu_ctx_hash32 { int key; /* Access key */ }; -static int ppc_hash32_pp_prot(int key, int pp, int nx) -{ - int prot; - - if (key == 0) { - switch (pp) { - case 0x0: - case 0x1: - case 0x2: - prot = PAGE_READ | PAGE_WRITE; - break; - - case 0x3: - prot = PAGE_READ; - break; - - default: - abort(); - } - } else { - switch (pp) { - case 0x0: - prot = 0; - break; - - case 0x1: - case 0x3: - prot = PAGE_READ; - break; - - case 0x2: - prot = PAGE_READ | PAGE_WRITE; - break; - - default: - abort(); - } - } - if (nx == 0) { - prot |= PAGE_EXEC; - } - - return prot; -} - static int ppc_hash32_pte_prot(int mmu_idx, target_ulong sr, ppc_hash_pte32_t pte) { diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index d92c9607b8..87cac12d68 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -76,44 +76,6 @@ void ppc_store_sdr1(CPUPPCState *env, target_ulong value) /*****************************************************************************/ /* PowerPC MMU emulation */ -static int pp_check(int key, int pp, int nx) -{ - int access; - - /* Compute access rights */ - access = 0; - if (key == 0) { - switch (pp) { - case 0x0: - case 0x1: - case 0x2: - access |= PAGE_WRITE; - /* fall through */ - case 0x3: - access |= PAGE_READ; - break; - } - } else { - switch (pp) { - case 0x0: - access = 0; - break; - case 0x1: - case 0x3: - access = PAGE_READ; - break; - case 0x2: - access = PAGE_READ | PAGE_WRITE; - break; - } - } - if (nx == 0) { - access |= PAGE_EXEC; - } - - return access; -} - static int check_prot(int prot, MMUAccessType access_type) { return prot & prot_for_access_type(access_type) ? 0 : -2; @@ -141,7 +103,7 @@ static int ppc6xx_tlb_pte_check(mmu_ctx_t *ctx, target_ulong pte0, MMUAccessType access_type) { target_ulong ptem, mmask; - int access, ret, pteh, ptev, pp; + int ret, pteh, ptev, pp; ret = -1; /* Check validity and table match */ @@ -160,11 +122,9 @@ static int ppc6xx_tlb_pte_check(mmu_ctx_t *ctx, target_ulong pte0, return -3; } } - /* Compute access rights */ - access = pp_check(ctx->key, pp, ctx->nx); /* Keep the matching PTE information */ ctx->raddr = pte1; - ctx->prot = access; + ctx->prot = ppc_hash32_pp_prot(ctx->key, pp, ctx->nx); ret = check_prot(ctx->prot, access_type); if (ret == 0) { /* Access granted */
The ppc_hash32_pp_prot() function in mmu-hash32.c is the same as pp_check() in mmu_common.c, merge these to remove duplicated code. Define the common function in internal.h as static lnline otherwise exporting the function from mmu-hash32.c would stop the compiler inlining it which results in slightly lower performance. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- target/ppc/internal.h | 35 ++++++++++++++++++++++++++++++++ target/ppc/mmu-hash32.c | 45 ----------------------------------------- target/ppc/mmu_common.c | 44 ++-------------------------------------- 3 files changed, 37 insertions(+), 87 deletions(-)