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

target/ppc: Reorganise and rename ppc_hash32_pp_prot()

Browse Source 
Reorganise ppc_hash32_pp_prot() swapping the if legs so it does not
test for negative first and clean up to make it shorter. Also rename
it to ppc_hash32_prot().

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:36 +02:00 committed by Nicholas Piggin
parent 625b58fde8
commit 698faf3304
3 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
target/ppc/mmu-hash32.c
View File

@ -45,7 +45,7 @@ static int ppc_hash32_pte_prot(int mmu_idx,
key = !!(mmuidx_pr(mmu_idx) ? (sr & SR32_KP) : (sr & SR32_KS)); key = !!(mmuidx_pr(mmu_idx) ? (sr & SR32_KP) : (sr & SR32_KS));
pp = pte.pte1 & HPTE32_R_PP; pp = pte.pte1 & HPTE32_R_PP;
return ppc_hash32_pp_prot(key, pp, !!(sr & SR32_NX)); return ppc_hash32_prot(key, pp, !!(sr & SR32_NX));
} }
static target_ulong hash32_bat_size(int mmu_idx, static target_ulong hash32_bat_size(int mmu_idx,

43
target/ppc/mmu-hash32.h
View File

@ -102,49 +102,40 @@ static inline void ppc_hash32_store_hpte1(PowerPCCPU *cpu,
stl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2, pte1); stl_phys(CPU(cpu)->as, base + pte_offset + HASH_PTE_SIZE_32 / 2, pte1);
} }
static inline int ppc_hash32_pp_prot(bool key, int pp, bool nx) static inline int ppc_hash32_prot(bool key, int pp, bool nx)
{ {
int prot; int prot;
if (key == 0) { if (key) {
switch (pp) {
case 0x0:
case 0x1:
case 0x2:
prot = PAGE_READ | PAGE_WRITE;
break;
case 0x3:
prot = PAGE_READ;
break;
default:
abort();
}
} else {
switch (pp) { switch (pp) {
case 0x0: case 0x0:
prot = 0; prot = 0;
break; break;
case 0x1: case 0x1:
case 0x3: case 0x3:
prot = PAGE_READ; prot = PAGE_READ;
break; break;
case 0x2: case 0x2:
prot = PAGE_READ | PAGE_WRITE; prot = PAGE_READ | PAGE_WRITE;
break; break;
default: default:
abort(); g_assert_not_reached();
}
} else {
switch (pp) {
case 0x0:
case 0x1:
case 0x2:
prot = PAGE_READ | PAGE_WRITE;
break;
case 0x3:
prot = PAGE_READ;
break;
default:
g_assert_not_reached();
} }
} }
if (nx == 0) { return nx ? prot : prot | PAGE_EXEC;
prot |= PAGE_EXEC;
}
return prot;
} }
typedef struct { typedef struct {

2
target/ppc/mmu_common.c
View File

@ -120,7 +120,7 @@ static int ppc6xx_tlb_pte_check(mmu_ctx_t *ctx, target_ulong pte0,
} }
/* Keep the matching PTE information */ /* Keep the matching PTE information */
ctx->raddr = pte1; ctx->raddr = pte1;
ctx->prot = ppc_hash32_pp_prot(ctx->key, pp, ctx->nx); ctx->prot = ppc_hash32_prot(ctx->key, pp, ctx->nx);
if (check_prot_access_type(ctx->prot, access_type)) { if (check_prot_access_type(ctx->prot, access_type)) {
/* Access granted */ /* Access granted */
qemu_log_mask(CPU_LOG_MMU, "PTE access granted !\n"); qemu_log_mask(CPU_LOG_MMU, "PTE access granted !\n");