SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

target/ppc/mmu_common.c: Remove mmu_ctx_t

Browse Source 
Completely get rid of mmu_ctx_t after converting the remaining
functions to pass raddr and prot without the context struct.

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

25
target/ppc/mmu_common.c
View File

@ -37,12 +37,6 @@
/* #define DUMP_PAGE_TABLES */ /* #define DUMP_PAGE_TABLES */
/* Context used internally during MMU translations */
typedef struct {
hwaddr raddr; /* Real address */
int prot; /* Protection bits */
} mmu_ctx_t;
void ppc_store_sdr1(CPUPPCState *env, target_ulong value) void ppc_store_sdr1(CPUPPCState *env, target_ulong value)
{ {
PowerPCCPU *cpu = env_archcpu(env); PowerPCCPU *cpu = env_archcpu(env);
@ -264,8 +258,8 @@ static int get_bat_6xx_tlb(CPUPPCState *env, hwaddr *raddr, int *prot,
return ret; return ret;
} }
static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, static int mmu6xx_get_physical_address(CPUPPCState *env, hwaddr *raddr,
target_ulong eaddr, int *prot, target_ulong eaddr,
hwaddr *hashp, bool *keyp, hwaddr *hashp, bool *keyp,
MMUAccessType access_type, int type) MMUAccessType access_type, int type)
{ {
@ -277,8 +271,7 @@ static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
/* First try to find a BAT entry if there are any */ /* First try to find a BAT entry if there are any */
if (env->nb_BATs && if (env->nb_BATs &&
get_bat_6xx_tlb(env, &ctx->raddr, &ctx->prot, eaddr, get_bat_6xx_tlb(env, raddr, prot, eaddr, access_type, pr) == 0) {
access_type, pr) == 0) {
return 0; return 0;
} }
@ -316,7 +309,7 @@ static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
*hashp = hash; *hashp = hash;
/* Software TLB search */ /* Software TLB search */
return ppc6xx_tlb_check(env, &ctx->raddr, &ctx->prot, eaddr, return ppc6xx_tlb_check(env, raddr, prot, eaddr,
access_type, ptem, key, nx); access_type, ptem, key, nx);
} }
@ -333,7 +326,7 @@ static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
* Should make the instruction do no-op. As it already do * Should make the instruction do no-op. As it already do
* no-op, it's quite easy :-) * no-op, it's quite easy :-)
*/ */
ctx->raddr = eaddr; *raddr = eaddr;
return 0; return 0;
case ACCESS_CODE: /* No code fetch is allowed in direct-store areas */ case ACCESS_CODE: /* No code fetch is allowed in direct-store areas */
case ACCESS_FLOAT: /* Floating point load/store */ case ACCESS_FLOAT: /* Floating point load/store */
@ -343,7 +336,7 @@ static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
} }
if ((access_type == MMU_DATA_STORE || !key) && if ((access_type == MMU_DATA_STORE || !key) &&
(access_type == MMU_DATA_LOAD || key)) { (access_type == MMU_DATA_LOAD || key)) {
ctx->raddr = eaddr; *raddr = eaddr;
return 2; return 2;
} }
return -2; return -2;
@ -681,7 +674,6 @@ static bool ppc_6xx_xlate(PowerPCCPU *cpu, vaddr eaddr,
{ {
CPUState *cs = CPU(cpu); CPUState *cs = CPU(cpu);
CPUPPCState *env = &cpu->env; CPUPPCState *env = &cpu->env;
mmu_ctx_t ctx;
hwaddr hash = 0; /* init to 0 to avoid used uninit warning */ hwaddr hash = 0; /* init to 0 to avoid used uninit warning */
bool key; bool key;
int type, ret; int type, ret;
@ -700,12 +692,9 @@ static bool ppc_6xx_xlate(PowerPCCPU *cpu, vaddr eaddr,
type = ACCESS_INT; type = ACCESS_INT;
} }
ctx.prot = 0; ret = mmu6xx_get_physical_address(env, raddrp, protp, eaddr, &hash, &key,
ret = mmu6xx_get_physical_address(env, &ctx, eaddr, &hash, &key,
access_type, type); access_type, type);
if (ret == 0) { if (ret == 0) {
*raddrp = ctx.raddr;
*protp = ctx.prot;
*psizep = TARGET_PAGE_BITS; *psizep = TARGET_PAGE_BITS;
return true; return true;
} else if (!guest_visible) { } else if (!guest_visible) {