target/ppc: Split out ppc_hash32_xlate
Mirror the interface of ppc_radix64_xlate, putting all of the logic for hash32 translation into a single entry point. Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-Id: <20210621125115.67717-7-bruno.larsen@eldorado.org.br> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
parent
1a8c647bbd
commit
6c3c873c63
@ -218,10 +218,11 @@ static hwaddr ppc_hash32_bat_lookup(PowerPCCPU *cpu, target_ulong ea,
|
||||
return -1;
|
||||
}
|
||||
|
||||
static int ppc_hash32_direct_store(PowerPCCPU *cpu, target_ulong sr,
|
||||
static bool ppc_hash32_direct_store(PowerPCCPU *cpu, target_ulong sr,
|
||||
target_ulong eaddr,
|
||||
MMUAccessType access_type,
|
||||
hwaddr *raddr, int *prot)
|
||||
hwaddr *raddr, int *prot,
|
||||
bool guest_visible)
|
||||
{
|
||||
CPUState *cs = CPU(cpu);
|
||||
CPUPPCState *env = &cpu->env;
|
||||
@ -238,17 +239,23 @@ static int ppc_hash32_direct_store(PowerPCCPU *cpu, target_ulong sr,
|
||||
*/
|
||||
*raddr = ((sr & 0xF) << 28) | (eaddr & 0x0FFFFFFF);
|
||||
*prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
|
||||
return 0;
|
||||
return true;
|
||||
}
|
||||
|
||||
if (access_type == MMU_INST_FETCH) {
|
||||
/* No code fetch is allowed in direct-store areas */
|
||||
if (guest_visible) {
|
||||
cs->exception_index = POWERPC_EXCP_ISI;
|
||||
env->error_code = 0x10000000;
|
||||
return 1;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
switch (env->access_type) {
|
||||
/*
|
||||
* From ppc_cpu_get_phys_page_debug, env->access_type is not set.
|
||||
* Assume ACCESS_INT for that case.
|
||||
*/
|
||||
switch (guest_visible ? env->access_type : ACCESS_INT) {
|
||||
case ACCESS_INT:
|
||||
/* Integer load/store : only access allowed */
|
||||
break;
|
||||
@ -257,7 +264,7 @@ static int ppc_hash32_direct_store(PowerPCCPU *cpu, target_ulong sr,
|
||||
cs->exception_index = POWERPC_EXCP_ALIGN;
|
||||
env->error_code = POWERPC_EXCP_ALIGN_FP;
|
||||
env->spr[SPR_DAR] = eaddr;
|
||||
return 1;
|
||||
return false;
|
||||
case ACCESS_RES:
|
||||
/* lwarx, ldarx or srwcx. */
|
||||
env->error_code = 0;
|
||||
@ -267,7 +274,7 @@ static int ppc_hash32_direct_store(PowerPCCPU *cpu, target_ulong sr,
|
||||
} else {
|
||||
env->spr[SPR_DSISR] = 0x04000000;
|
||||
}
|
||||
return 1;
|
||||
return false;
|
||||
case ACCESS_CACHE:
|
||||
/*
|
||||
* dcba, dcbt, dcbtst, dcbf, dcbi, dcbst, dcbz, or icbi
|
||||
@ -276,7 +283,7 @@ static int ppc_hash32_direct_store(PowerPCCPU *cpu, target_ulong sr,
|
||||
* no-op, it's quite easy :-)
|
||||
*/
|
||||
*raddr = eaddr;
|
||||
return 0;
|
||||
return true;
|
||||
case ACCESS_EXT:
|
||||
/* eciwx or ecowx */
|
||||
cs->exception_index = POWERPC_EXCP_DSI;
|
||||
@ -287,16 +294,18 @@ static int ppc_hash32_direct_store(PowerPCCPU *cpu, target_ulong sr,
|
||||
} else {
|
||||
env->spr[SPR_DSISR] = 0x04100000;
|
||||
}
|
||||
return 1;
|
||||
return false;
|
||||
default:
|
||||
cpu_abort(cs, "ERROR: instruction should not need "
|
||||
"address translation\n");
|
||||
cpu_abort(cs, "ERROR: insn should not need address translation\n");
|
||||
}
|
||||
if ((access_type == MMU_DATA_STORE || key != 1) &&
|
||||
(access_type == MMU_DATA_LOAD || key != 0)) {
|
||||
|
||||
*prot = key ? PAGE_READ | PAGE_WRITE : PAGE_READ;
|
||||
if (*prot & prot_for_access_type(access_type)) {
|
||||
*raddr = eaddr;
|
||||
return 0;
|
||||
} else {
|
||||
return true;
|
||||
}
|
||||
|
||||
if (guest_visible) {
|
||||
cs->exception_index = POWERPC_EXCP_DSI;
|
||||
env->error_code = 0;
|
||||
env->spr[SPR_DAR] = eaddr;
|
||||
@ -305,8 +314,8 @@ static int ppc_hash32_direct_store(PowerPCCPU *cpu, target_ulong sr,
|
||||
} else {
|
||||
env->spr[SPR_DSISR] = 0x08000000;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
hwaddr get_pteg_offset32(PowerPCCPU *cpu, hwaddr hash)
|
||||
@ -415,8 +424,10 @@ static hwaddr ppc_hash32_pte_raddr(target_ulong sr, ppc_hash_pte32_t pte,
|
||||
return (rpn & ~mask) | (eaddr & mask);
|
||||
}
|
||||
|
||||
int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
|
||||
MMUAccessType access_type, int mmu_idx)
|
||||
static bool ppc_hash32_xlate(PowerPCCPU *cpu, vaddr eaddr,
|
||||
MMUAccessType access_type,
|
||||
hwaddr *raddrp, int *psizep, int *protp,
|
||||
bool guest_visible)
|
||||
{
|
||||
CPUState *cs = CPU(cpu);
|
||||
CPUPPCState *env = &cpu->env;
|
||||
@ -427,23 +438,25 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
|
||||
int need_prot;
|
||||
hwaddr raddr;
|
||||
|
||||
need_prot = prot_for_access_type(access_type);
|
||||
/* There are no hash32 large pages. */
|
||||
*psizep = TARGET_PAGE_BITS;
|
||||
|
||||
/* 1. Handle real mode accesses */
|
||||
if (access_type == MMU_INST_FETCH ? !msr_ir : !msr_dr) {
|
||||
/* Translation is off */
|
||||
raddr = eaddr;
|
||||
tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK,
|
||||
PAGE_READ | PAGE_WRITE | PAGE_EXEC, mmu_idx,
|
||||
TARGET_PAGE_SIZE);
|
||||
return 0;
|
||||
*raddrp = eaddr;
|
||||
*protp = PAGE_READ | PAGE_WRITE | PAGE_EXEC;
|
||||
return true;
|
||||
}
|
||||
|
||||
need_prot = prot_for_access_type(access_type);
|
||||
|
||||
/* 2. Check Block Address Translation entries (BATs) */
|
||||
if (env->nb_BATs != 0) {
|
||||
raddr = ppc_hash32_bat_lookup(cpu, eaddr, access_type, &prot);
|
||||
raddr = ppc_hash32_bat_lookup(cpu, eaddr, access_type, protp);
|
||||
if (raddr != -1) {
|
||||
if (need_prot & ~prot) {
|
||||
if (need_prot & ~*protp) {
|
||||
if (guest_visible) {
|
||||
if (access_type == MMU_INST_FETCH) {
|
||||
cs->exception_index = POWERPC_EXCP_ISI;
|
||||
env->error_code = 0x08000000;
|
||||
@ -457,13 +470,11 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
|
||||
env->spr[SPR_DSISR] = 0x08000000;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
tlb_set_page(cs, eaddr & TARGET_PAGE_MASK,
|
||||
raddr & TARGET_PAGE_MASK, prot, mmu_idx,
|
||||
TARGET_PAGE_SIZE);
|
||||
return 0;
|
||||
return false;
|
||||
}
|
||||
*raddrp = raddr;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@ -472,27 +483,23 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
|
||||
|
||||
/* 4. Handle direct store segments */
|
||||
if (sr & SR32_T) {
|
||||
if (ppc_hash32_direct_store(cpu, sr, eaddr, access_type,
|
||||
&raddr, &prot) == 0) {
|
||||
tlb_set_page(cs, eaddr & TARGET_PAGE_MASK,
|
||||
raddr & TARGET_PAGE_MASK, prot, mmu_idx,
|
||||
TARGET_PAGE_SIZE);
|
||||
return 0;
|
||||
} else {
|
||||
return 1;
|
||||
}
|
||||
return ppc_hash32_direct_store(cpu, sr, eaddr, access_type,
|
||||
raddrp, protp, guest_visible);
|
||||
}
|
||||
|
||||
/* 5. Check for segment level no-execute violation */
|
||||
if (access_type == MMU_INST_FETCH && (sr & SR32_NX)) {
|
||||
if (guest_visible) {
|
||||
cs->exception_index = POWERPC_EXCP_ISI;
|
||||
env->error_code = 0x10000000;
|
||||
return 1;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/* 6. Locate the PTE in the hash table */
|
||||
pte_offset = ppc_hash32_htab_lookup(cpu, sr, eaddr, &pte);
|
||||
if (pte_offset == -1) {
|
||||
if (guest_visible) {
|
||||
if (access_type == MMU_INST_FETCH) {
|
||||
cs->exception_index = POWERPC_EXCP_ISI;
|
||||
env->error_code = 0x40000000;
|
||||
@ -506,8 +513,8 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
|
||||
env->spr[SPR_DSISR] = 0x40000000;
|
||||
}
|
||||
}
|
||||
|
||||
return 1;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
qemu_log_mask(CPU_LOG_MMU,
|
||||
"found PTE at offset %08" HWADDR_PRIx "\n", pte_offset);
|
||||
@ -519,6 +526,7 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
|
||||
if (need_prot & ~prot) {
|
||||
/* Access right violation */
|
||||
qemu_log_mask(CPU_LOG_MMU, "PTE access rejected\n");
|
||||
if (guest_visible) {
|
||||
if (access_type == MMU_INST_FETCH) {
|
||||
cs->exception_index = POWERPC_EXCP_ISI;
|
||||
env->error_code = 0x08000000;
|
||||
@ -532,7 +540,8 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
|
||||
env->spr[SPR_DSISR] = 0x08000000;
|
||||
}
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
qemu_log_mask(CPU_LOG_MMU, "PTE access granted !\n");
|
||||
@ -556,45 +565,38 @@ int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
|
||||
|
||||
/* 9. Determine the real address from the PTE */
|
||||
|
||||
raddr = ppc_hash32_pte_raddr(sr, pte, eaddr);
|
||||
*raddrp = ppc_hash32_pte_raddr(sr, pte, eaddr);
|
||||
*protp = prot;
|
||||
return true;
|
||||
}
|
||||
|
||||
int ppc_hash32_handle_mmu_fault(PowerPCCPU *cpu, vaddr eaddr,
|
||||
MMUAccessType access_type, int mmu_idx)
|
||||
{
|
||||
CPUState *cs = CPU(cpu);
|
||||
int page_size, prot;
|
||||
hwaddr raddr;
|
||||
|
||||
/* Translate eaddr to raddr (where raddr is addr qemu needs for access) */
|
||||
if (!ppc_hash32_xlate(cpu, eaddr, access_type, &raddr,
|
||||
&page_size, &prot, true)) {
|
||||
return 1;
|
||||
}
|
||||
|
||||
tlb_set_page(cs, eaddr & TARGET_PAGE_MASK, raddr & TARGET_PAGE_MASK,
|
||||
prot, mmu_idx, TARGET_PAGE_SIZE);
|
||||
|
||||
prot, mmu_idx, 1UL << page_size);
|
||||
return 0;
|
||||
}
|
||||
|
||||
hwaddr ppc_hash32_get_phys_page_debug(PowerPCCPU *cpu, target_ulong eaddr)
|
||||
{
|
||||
CPUPPCState *env = &cpu->env;
|
||||
target_ulong sr;
|
||||
hwaddr pte_offset;
|
||||
ppc_hash_pte32_t pte;
|
||||
int prot;
|
||||
int psize, prot;
|
||||
hwaddr raddr;
|
||||
|
||||
if (msr_dr == 0) {
|
||||
/* Translation is off */
|
||||
return eaddr;
|
||||
}
|
||||
|
||||
if (env->nb_BATs != 0) {
|
||||
hwaddr raddr = ppc_hash32_bat_lookup(cpu, eaddr, 0, &prot);
|
||||
if (raddr != -1) {
|
||||
return raddr;
|
||||
}
|
||||
}
|
||||
|
||||
sr = env->sr[eaddr >> 28];
|
||||
|
||||
if (sr & SR32_T) {
|
||||
/* FIXME: Add suitable debug support for Direct Store segments */
|
||||
if (!ppc_hash32_xlate(cpu, eaddr, MMU_DATA_LOAD, &raddr,
|
||||
&psize, &prot, false)) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
pte_offset = ppc_hash32_htab_lookup(cpu, sr, eaddr, &pte);
|
||||
if (pte_offset == -1) {
|
||||
return -1;
|
||||
}
|
||||
|
||||
return ppc_hash32_pte_raddr(sr, pte, eaddr) & TARGET_PAGE_MASK;
|
||||
return raddr & TARGET_PAGE_MASK;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user