| Message ID | 095bdaf2ac340bd731e4e33e296fce8a8e93cd67.1714606359.git.balaton@eik.bme.hu |
|---|---|
| State | New |
| Headers | show |
| Series | Misc PPC exception and BookE MMU clean ups | expand |
On Thu May 2, 2024 at 9:43 AM AEST, BALATON Zoltan wrote: > This function just does two assignments and and unnecessary check that > is always true so inline it in the only caller left and remove it. Reviewed-by: Nicholas Piggin <npiggin@gmail.com> > > Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> > --- > target/ppc/mmu_common.c | 26 +++----------------------- > 1 file changed, 3 insertions(+), 23 deletions(-) > > diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c > index 3132030baa..fab86a8f3e 100644 > --- a/target/ppc/mmu_common.c > +++ b/target/ppc/mmu_common.c > @@ -1161,28 +1161,6 @@ void dump_mmu(CPUPPCState *env) > } > } > > -static int check_physical(CPUPPCState *env, mmu_ctx_t *ctx, target_ulong eaddr, > - MMUAccessType access_type) > -{ > - ctx->raddr = eaddr; > - ctx->prot = PAGE_READ | PAGE_EXEC; > - > - switch (env->mmu_model) { > - case POWERPC_MMU_SOFT_6xx: > - case POWERPC_MMU_SOFT_4xx: > - case POWERPC_MMU_REAL: > - case POWERPC_MMU_BOOKE: > - ctx->prot |= PAGE_WRITE; > - break; > - > - default: > - /* Caller's checks mean we should never get here for other models */ > - g_assert_not_reached(); > - } > - > - return 0; > -} > - > int get_physical_address_wtlb(CPUPPCState *env, mmu_ctx_t *ctx, > target_ulong eaddr, > MMUAccessType access_type, int type, > @@ -1202,7 +1180,9 @@ int get_physical_address_wtlb(CPUPPCState *env, mmu_ctx_t *ctx, > if (real_mode && (env->mmu_model == POWERPC_MMU_SOFT_6xx || > env->mmu_model == POWERPC_MMU_SOFT_4xx || > env->mmu_model == POWERPC_MMU_REAL)) { > - return check_physical(env, ctx, eaddr, access_type); > + ctx->raddr = eaddr; > + ctx->prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; > + return 0; > } > > switch (env->mmu_model) {
diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c index 3132030baa..fab86a8f3e 100644 --- a/target/ppc/mmu_common.c +++ b/target/ppc/mmu_common.c @@ -1161,28 +1161,6 @@ void dump_mmu(CPUPPCState *env) } } -static int check_physical(CPUPPCState *env, mmu_ctx_t *ctx, target_ulong eaddr, - MMUAccessType access_type) -{ - ctx->raddr = eaddr; - ctx->prot = PAGE_READ | PAGE_EXEC; - - switch (env->mmu_model) { - case POWERPC_MMU_SOFT_6xx: - case POWERPC_MMU_SOFT_4xx: - case POWERPC_MMU_REAL: - case POWERPC_MMU_BOOKE: - ctx->prot |= PAGE_WRITE; - break; - - default: - /* Caller's checks mean we should never get here for other models */ - g_assert_not_reached(); - } - - return 0; -} - int get_physical_address_wtlb(CPUPPCState *env, mmu_ctx_t *ctx, target_ulong eaddr, MMUAccessType access_type, int type, @@ -1202,7 +1180,9 @@ int get_physical_address_wtlb(CPUPPCState *env, mmu_ctx_t *ctx, if (real_mode && (env->mmu_model == POWERPC_MMU_SOFT_6xx || env->mmu_model == POWERPC_MMU_SOFT_4xx || env->mmu_model == POWERPC_MMU_REAL)) { - return check_physical(env, ctx, eaddr, access_type); + ctx->raddr = eaddr; + ctx->prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; + return 0; } switch (env->mmu_model) {
This function just does two assignments and and unnecessary check that is always true so inline it in the only caller left and remove it. Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu> --- target/ppc/mmu_common.c | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-)