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

target/ppc/mmu_common.c: Remove hash field from mmu_ctx_t 

Return hash value via a parameter and remove it from mmu_ctx.t.

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:12:45 +02:00 committed by Nicholas Piggin
parent 0e2d7fc817
commit f6f8838b05
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
target/ppc/mmu_common.c
View File

@ -41,7 +41,6 @@
typedef struct { typedef struct {
hwaddr raddr; /* Real address */ hwaddr raddr; /* Real address */
int prot; /* Protection bits */ int prot; /* Protection bits */
hwaddr hash[2]; /* Pagetable hash values */
target_ulong ptem; /* Virtual segment ID | API */ target_ulong ptem; /* Virtual segment ID | API */
int key; /* Access key */ int key; /* Access key */
int nx; /* Non-execute area */ int nx; /* Non-execute area */
@ -331,7 +330,7 @@ static int get_bat_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx,
} }
static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx, static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
target_ulong eaddr, target_ulong eaddr, hwaddr *hashp,
MMUAccessType access_type, int type) MMUAccessType access_type, int type)
{ {
PowerPCCPU *cpu = env_archcpu(env); PowerPCCPU *cpu = env_archcpu(env);
@ -379,8 +378,7 @@ static int mmu6xx_get_physical_address(CPUPPCState *env, mmu_ctx_t *ctx,
qemu_log_mask(CPU_LOG_MMU, "htab_base " HWADDR_FMT_plx " htab_mask " qemu_log_mask(CPU_LOG_MMU, "htab_base " HWADDR_FMT_plx " htab_mask "
HWADDR_FMT_plx " hash " HWADDR_FMT_plx "\n", HWADDR_FMT_plx " hash " HWADDR_FMT_plx "\n",
ppc_hash32_hpt_base(cpu), ppc_hash32_hpt_mask(cpu), hash); ppc_hash32_hpt_base(cpu), ppc_hash32_hpt_mask(cpu), hash);
ctx->hash[0] = hash; *hashp = hash;
ctx->hash[1] = ~hash;
/* Initialize real address with an invalid value */ /* Initialize real address with an invalid value */
ctx->raddr = (hwaddr)-1ULL; ctx->raddr = (hwaddr)-1ULL;
@ -761,8 +759,8 @@ 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; mmu_ctx_t ctx;
int type; hwaddr hash = 0; /* init to 0 to avoid used uninit warning */
int ret; int type, ret;
if (ppc_real_mode_xlate(cpu, eaddr, access_type, raddrp, psizep, protp)) { if (ppc_real_mode_xlate(cpu, eaddr, access_type, raddrp, psizep, protp)) {
return true; return true;
@ -779,9 +777,8 @@ static bool ppc_6xx_xlate(PowerPCCPU *cpu, vaddr eaddr,
} }
ctx.prot = 0; ctx.prot = 0;
ctx.hash[0] = 0; ret = mmu6xx_get_physical_address(env, &ctx, eaddr, &hash,
ctx.hash[1] = 0; access_type, type);
ret = mmu6xx_get_physical_address(env, &ctx, eaddr, access_type, type);
if (ret == 0) { if (ret == 0) {
*raddrp = ctx.raddr; *raddrp = ctx.raddr;
*protp = ctx.prot; *protp = ctx.prot;
@ -834,9 +831,9 @@ static bool ppc_6xx_xlate(PowerPCCPU *cpu, vaddr eaddr,
tlb_miss: tlb_miss:
env->error_code |= ctx.key << 19; env->error_code |= ctx.key << 19;
env->spr[SPR_HASH1] = ppc_hash32_hpt_base(cpu) + env->spr[SPR_HASH1] = ppc_hash32_hpt_base(cpu) +
get_pteg_offset32(cpu, ctx.hash[0]); get_pteg_offset32(cpu, hash);
env->spr[SPR_HASH2] = ppc_hash32_hpt_base(cpu) + env->spr[SPR_HASH2] = ppc_hash32_hpt_base(cpu) +
get_pteg_offset32(cpu, ctx.hash[1]); get_pteg_offset32(cpu, ~hash);
break; break;
case -2: case -2:
/* Access rights violation */ /* Access rights violation */