[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 56/72] target/ppc/mmu_common.c: Don't use mmu_ctx_t in mmubooke_ge
From: |
Nicholas Piggin |
Subject: |
[PULL 56/72] target/ppc/mmu_common.c: Don't use mmu_ctx_t in mmubooke_get_physical_address() |
Date: |
Fri, 24 May 2024 09:07:29 +1000 |
From: BALATON Zoltan <balaton@eik.bme.hu>
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>
---
target/ppc/mmu_common.c | 30 ++++++++++--------------------
1 file changed, 10 insertions(+), 20 deletions(-)
diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
index adce6cceb8..12dac9e63a 100644
--- a/target/ppc/mmu_common.c
+++ b/target/ppc/mmu_common.c
@@ -634,36 +634,25 @@ static int mmubooke_check_tlb(CPUPPCState *env,
ppcemb_tlb_t *tlb,
return access_type == MMU_INST_FETCH ? -3 : -2;
}
-static int mmubooke_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
- target_ulong address,
+static int mmubooke_get_physical_address(CPUPPCState *env, hwaddr *raddr,
+ int *prot, target_ulong address,
MMUAccessType access_type)
{
ppcemb_tlb_t *tlb;
- hwaddr raddr;
- int i, ret;
+ int i, ret = -1;
- ret = -1;
- raddr = (hwaddr)-1ULL;
for (i = 0; i < env->nb_tlb; 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);
if (ret != -1) {
break;
}
}
-
- if (ret >= 0) {
- ctx->raddr = raddr;
- qemu_log_mask(CPU_LOG_MMU, "%s: access granted " TARGET_FMT_lx
- " => " 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);
- }
-
+ qemu_log_mask(CPU_LOG_MMU,
+ "%s: access %s " TARGET_FMT_lx " => " HWADDR_FMT_plx
+ " %d %d\n", __func__, ret < 0 ? "refused" : "granted",
+ address, ret < 0 ? -1 : *raddr, ret == -1 ? 0 : *prot, ret);
return ret;
}
@@ -1143,7 +1132,8 @@ int get_physical_address_wtlb(CPUPPCState *env, mmu_ctx_t
*ctx,
bool real_mode;
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) {
return mmubooke206_get_physical_address(env, ctx, eaddr, access_type,
mmu_idx);
--
2.43.0
- [PULL 44/72] target/ppc/mmu_common.c: Drop cases for unimplemented MPC8xx MMU, (continued)
- [PULL 44/72] target/ppc/mmu_common.c: Drop cases for unimplemented MPC8xx MMU, Nicholas Piggin, 2024/05/23
- [PULL 45/72] target/ppc/mmu_common.c: Introduce mmu6xx_get_physical_address(), Nicholas Piggin, 2024/05/23
- [PULL 43/72] target/ppc/mmu_common.c: Simplify checking for real mode, Nicholas Piggin, 2024/05/23
- [PULL 51/72] target/ppc/mmu_common.c: Inline and remove check_physical(), Nicholas Piggin, 2024/05/23
- [PULL 46/72] target/ppc/mmu_common.c: Move else branch to avoid large if block, Nicholas Piggin, 2024/05/23
- [PULL 47/72] target/ppc/mmu_common.c: Move some debug logging, Nicholas Piggin, 2024/05/23
- [PULL 49/72] target/ppc/mmu_common.c: Split out BookE cases before checking real mode, Nicholas Piggin, 2024/05/23
- [PULL 50/72] target/ppc/mmu_common.c: Split off real mode cases in get_physical_address_wtlb(), Nicholas Piggin, 2024/05/23
- [PULL 53/72] target/ppc/mmu_common.c: Deindent ppc_jumbo_xlate(), Nicholas Piggin, 2024/05/23
- [PULL 52/72] target/ppc/mmu_common.c: Fix misindented qemu_log_mask() calls, Nicholas Piggin, 2024/05/23
- [PULL 56/72] target/ppc/mmu_common.c: Don't use mmu_ctx_t in mmubooke_get_physical_address(),
Nicholas Piggin <=
- [PULL 55/72] target/ppc/mmu_common.c: Don't use mmu_ctx_t for mmu40x_get_physical_address(), Nicholas Piggin, 2024/05/23
- [PULL 54/72] target/ppc/mmu_common.c: Replace hard coded constants in ppc_jumbo_xlate(), Nicholas Piggin, 2024/05/23
- [PULL 59/72] target/ppc/mmu_common.c: Split off BookE handling from ppc_jumbo_xlate(), Nicholas Piggin, 2024/05/23
- [PULL 57/72] target/ppc/mmu_common.c: Don't use mmu_ctx_t in mmubooke206_get_physical_address(), Nicholas Piggin, 2024/05/23
- [PULL 58/72] target/ppc/mmu_common.c: Remove BookE from direct store handling, Nicholas Piggin, 2024/05/23
- [PULL 64/72] target/ppc/mmu_common.c: Transform ppc_jumbo_xlate() into ppc_6xx_xlate(), Nicholas Piggin, 2024/05/23
- [PULL 60/72] target/ppc/mmu_common.c: Simplify ppc_booke_xlate() part 1, Nicholas Piggin, 2024/05/23
- [PULL 61/72] target/ppc/mmu_common.c: Simplify ppc_booke_xlate() part 2, Nicholas Piggin, 2024/05/23
- [PULL 63/72] target/ppc/mmu_common.c: Split off 40x cases from ppc_jumbo_xlate(), Nicholas Piggin, 2024/05/23
- [PULL 62/72] target/ppc/mmu_common.c: Split off real mode handling from get_physical_address_wtlb(), Nicholas Piggin, 2024/05/23