ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

target/ppc: Don't use mmu_ctx_t in mmubooke_get_physical_address() 

mmubooke_get_physical_address() only uses the raddr and prot fields
from mmu_ctx_t. Pass these directly instead of using a ctx struct.

Reviewed-by: Nicholas Piggin <npiggin@gmail.com>
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
This commit is contained in:
BALATON Zoltan 2024-05-13 01:27:51 +02:00 committed by Nicholas Piggin
parent 5cc867a679
commit ecff3394a8
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
target/ppc/mmu_common.c
View File

@ -634,36 +634,25 @@ static int mmubooke_check_tlb(CPUPPCState *env, ppcemb_tlb_t *tlb,
return access_type == MMU_INST_FETCH ? -3 : -2; return access_type == MMU_INST_FETCH ? -3 : -2;
} }
static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, static int mmubooke_get_physical_address(CPUPPCState *env, hwaddr *raddr,
target_ulong address, int *prot, target_ulong address,
MMUAccessType access_type) MMUAccessType access_type)
{ {
ppcemb_tlb_t *tlb; ppcemb_tlb_t *tlb;
hwaddr raddr; int i, ret = -1;
int i, ret;
ret = -1;
raddr = (hwaddr)-1ULL;
for (i = 0; i < env->nb_tlb; i++) { for (i = 0; i < env->nb_tlb; i++) {
tlb = &env->tlb.tlbe[i]; tlb = &env->tlb.tlbe[i];
ret = mmubooke_check_tlb(env, tlb, &raddr, &ctx->prot, address, ret = mmubooke_check_tlb(env, tlb, raddr, prot, address,
access_type, i); access_type, i);
if (ret != -1) { if (ret != -1) {
break; break;
} }
} }
qemu_log_mask(CPU_LOG_MMU,
if (ret >= 0) { "%s: access %s " TARGET_FMT_lx " => " HWADDR_FMT_plx
ctx->raddr = raddr; " %d %d\n", __func__, ret < 0 ? "refused" : "granted",
qemu_log_mask(CPU_LOG_MMU, "%s: access granted " TARGET_FMT_lx address, ret < 0 ? -1 : *raddr, ret == -1 ? 0 : *prot, ret);
" => " HWADDR_FMT_plx " %d %d\n", __func__,
address, ctx->raddr, ctx->prot, ret);
} else {
qemu_log_mask(CPU_LOG_MMU, "%s: access refused " TARGET_FMT_lx
" => " HWADDR_FMT_plx " %d %d\n", __func__,
address, raddr, ctx->prot, ret);
}
return ret; return ret;
} }
@ -1143,7 +1132,8 @@ int get_physical_address_wtlb(CPUPPCState *env, mmu_ctx_t *ctx,
bool real_mode; bool real_mode;
if (env->mmu_model == POWERPC_MMU_BOOKE) { if (env->mmu_model == POWERPC_MMU_BOOKE) {
return mmubooke_get_physical_address(env, ctx, eaddr, access_type); return mmubooke_get_physical_address(env, &ctx->raddr, &ctx->prot,
eaddr, access_type);
} else if (env->mmu_model == POWERPC_MMU_BOOKE206) { } else if (env->mmu_model == POWERPC_MMU_BOOKE206) {
return mmubooke206_get_physical_address(env, ctx, eaddr, access_type, return mmubooke206_get_physical_address(env, ctx, eaddr, access_type,
mmu_idx); mmu_idx);