[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 59/61] target/ppc/mmu_common.c: Stop using ctx in get_bat_6xx_
From: |
BALATON Zoltan |
Subject: |
[PATCH v7 59/61] target/ppc/mmu_common.c: Stop using ctx in get_bat_6xx_tlb() |
Date: |
Mon, 13 May 2024 01:28:34 +0200 (CEST) |
Pass raddr and prot in function parameters instead
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
target/ppc/mmu_common.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/target/ppc/mmu_common.c b/target/ppc/mmu_common.c
index ba54c40048..6d588b6795 100644
--- a/target/ppc/mmu_common.c
+++ b/target/ppc/mmu_common.c
@@ -193,7 +193,7 @@ static int ppc6xx_tlb_check(CPUPPCState *env, hwaddr
*raddr, int *prot,
return ret;
}
-static int get_bat_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx,
+static int get_bat_6xx_tlb(CPUPPCState *env, hwaddr *raddr, int *prot,
target_ulong eaddr, MMUAccessType access_type,
bool pr)
{
@@ -224,16 +224,16 @@ static int get_bat_6xx_tlb(CPUPPCState *env, mmu_ctx_t
*ctx,
if ((eaddr & BATU32_BEPIU) == BEPIu &&
((eaddr & BATU32_BEPIL) & ~bl) == BEPIl) {
/* Get physical address */
- ctx->raddr = (*BATl & BATU32_BEPIU) |
+ *raddr = (*BATl & BATU32_BEPIU) |
((eaddr & BATU32_BEPIL & bl) | (*BATl & BATU32_BEPIL)) |
(eaddr & 0x0001F000);
/* Compute access rights */
- ctx->prot = ppc_hash32_bat_prot(*BATu, *BATl);
- if (check_prot_access_type(ctx->prot, access_type)) {
+ *prot = ppc_hash32_bat_prot(*BATu, *BATl);
+ if (check_prot_access_type(*prot, access_type)) {
qemu_log_mask(CPU_LOG_MMU, "BAT %d match: r "
HWADDR_FMT_plx
- " prot=%c%c\n", i, ctx->raddr,
- ctx->prot & PAGE_READ ? 'R' : '-',
- ctx->prot & PAGE_WRITE ? 'W' : '-');
+ " prot=%c%c\n", i, *raddr,
+ *prot & PAGE_READ ? 'R' : '-',
+ *prot & PAGE_WRITE ? 'W' : '-');
ret = 0;
} else {
ret = -2;
@@ -277,7 +277,8 @@ static int mmu6xx_get_physical_address(CPUPPCState *env,
mmu_ctx_t *ctx,
/* First try to find a BAT entry if there are any */
if (env->nb_BATs &&
- get_bat_6xx_tlb(env, ctx, eaddr, access_type, pr) == 0) {
+ get_bat_6xx_tlb(env, &ctx->raddr, &ctx->prot, eaddr,
+ access_type, pr) == 0) {
return 0;
}
--
2.30.9
- [PATCH v7 51/61] target/ppc: Add function to get protection key for hash32 MMU, (continued)
- [PATCH v7 51/61] target/ppc: Add function to get protection key for hash32 MMU, BALATON Zoltan, 2024/05/12
- [PATCH v7 52/61] target/ppc/mmu-hash32.c: Inline and remove ppc_hash32_pte_prot(), BALATON Zoltan, 2024/05/12
- [PATCH v7 50/61] target/ppc/mmu_common.c: Remove ptem field from mmu_ctx_t, BALATON Zoltan, 2024/05/12
- [PATCH v7 46/61] target/ppc/mmu_common.c: Convert local variable to bool, BALATON Zoltan, 2024/05/12
- [PATCH v7 45/61] target/ppc/mmu_common.c: Remove nx field from mmu_ctx_t, BALATON Zoltan, 2024/05/12
- [PATCH v7 56/61] target/ppc/mmu_common.c: Rename function parameter, BALATON Zoltan, 2024/05/12
- [PATCH v7 61/61] target/ppc/mmu_common.c: Remove a local variable, BALATON Zoltan, 2024/05/12
- [PATCH v7 57/61] targe/ppc/mmu_common.c: Use defines instead of numeric constants, BALATON Zoltan, 2024/05/12
- [PATCH v7 59/61] target/ppc/mmu_common.c: Stop using ctx in get_bat_6xx_tlb(),
BALATON Zoltan <=
- [PATCH v7 47/61] target/ppc/mmu_common.c: Remove single use local variable, BALATON Zoltan, 2024/05/12
- [PATCH v7 53/61] target/ppc/mmu_common.c: Init variable in function that relies on it, BALATON Zoltan, 2024/05/12
- [PATCH v7 54/61] target/ppc/mmu_common.c: Remove key field from mmu_ctx_t, BALATON Zoltan, 2024/05/12
- [PATCH v7 49/61] target/ppc/mmu_common.c: Inline and remove ppc6xx_tlb_pte_check(), BALATON Zoltan, 2024/05/12
- [PATCH v7 48/61] target/ppc/mmu_common.c: Simplify a switch statement, BALATON Zoltan, 2024/05/12
- [PATCH v7 55/61] target/ppc/mmu_common.c: Stop using ctx in ppc6xx_tlb_check(), BALATON Zoltan, 2024/05/12
- [PATCH v7 60/61] target/ppc/mmu_common.c: Remove mmu_ctx_t, BALATON Zoltan, 2024/05/12
- [PATCH v7 58/61] target/ppc: Remove bat_size_prot(), BALATON Zoltan, 2024/05/12
- Re: [PATCH v7 00/61] Misc PPC exception and BookE MMU clean ups, Nicholas Piggin, 2024/05/18