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: Use defines instead of numeric constants 

Replace some BAT related constants with defines from mmu-hash32.h

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:00 +02:00 committed by Nicholas Piggin
parent 68bf3a7bbc
commit 6ca35e8763
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
target/ppc/mmu_common.c
View File

@ -201,7 +201,7 @@ static inline void bat_size_prot(CPUPPCState *env, target_ulong *blp,
target_ulong bl; target_ulong bl;
int pp, valid, prot; int pp, valid, prot;
bl = (*BATu & 0x00001FFC) << 15; bl = (*BATu & BATU32_BL) << 15;
valid = 0; valid = 0;
prot = 0; prot = 0;
if ((!FIELD_EX64(env->msr, MSR, PR) && (*BATu & 0x00000002)) || if ((!FIELD_EX64(env->msr, MSR, PR) && (*BATu & 0x00000002)) ||
@ -241,19 +241,19 @@ static int get_bat_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx,
for (i = 0; i < env->nb_BATs; i++) { for (i = 0; i < env->nb_BATs; i++) {
BATu = &BATut[i]; BATu = &BATut[i];
BATl = &BATlt[i]; BATl = &BATlt[i];
BEPIu = *BATu & 0xF0000000; BEPIu = *BATu & BATU32_BEPIU;
BEPIl = *BATu & 0x0FFE0000; BEPIl = *BATu & BATU32_BEPIL;
bat_size_prot(env, &bl, &valid, &prot, BATu, BATl); bat_size_prot(env, &bl, &valid, &prot, BATu, BATl);
qemu_log_mask(CPU_LOG_MMU, "%s: %cBAT%d v " TARGET_FMT_lx " BATu " qemu_log_mask(CPU_LOG_MMU, "%s: %cBAT%d v " TARGET_FMT_lx " BATu "
TARGET_FMT_lx " BATl " TARGET_FMT_lx "\n", __func__, TARGET_FMT_lx " BATl " TARGET_FMT_lx "\n", __func__,
ifetch ? 'I' : 'D', i, eaddr, *BATu, *BATl); ifetch ? 'I' : 'D', i, eaddr, *BATu, *BATl);
if ((eaddr & 0xF0000000) == BEPIu && if ((eaddr & BATU32_BEPIU) == BEPIu &&
((eaddr & 0x0FFE0000) & ~bl) == BEPIl) { ((eaddr & BATU32_BEPIL) & ~bl) == BEPIl) {
/* BAT matches */ /* BAT matches */
if (valid != 0) { if (valid != 0) {
/* Get physical address */ /* Get physical address */
ctx->raddr = (*BATl & 0xF0000000) | ctx->raddr = (*BATl & BATU32_BEPIU) |
((eaddr & 0x0FFE0000 & bl) | (*BATl & 0x0FFE0000)) | ((eaddr & BATU32_BEPIL & bl) | (*BATl & BATU32_BEPIL)) |
(eaddr & 0x0001F000); (eaddr & 0x0001F000);
/* Compute access rights */ /* Compute access rights */
ctx->prot = prot; ctx->prot = prot;
@ -277,9 +277,9 @@ static int get_bat_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx,
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
BATu = &BATut[i]; BATu = &BATut[i];
BATl = &BATlt[i]; BATl = &BATlt[i];
BEPIu = *BATu & 0xF0000000; BEPIu = *BATu & BATU32_BEPIU;
BEPIl = *BATu & 0x0FFE0000; BEPIl = *BATu & BATU32_BEPIL;
bl = (*BATu & 0x00001FFC) << 15; bl = (*BATu & BATU32_BL) << 15;
qemu_log_mask(CPU_LOG_MMU, "%s: %cBAT%d v " TARGET_FMT_lx qemu_log_mask(CPU_LOG_MMU, "%s: %cBAT%d v " TARGET_FMT_lx
" BATu " TARGET_FMT_lx " BATl " TARGET_FMT_lx " BATu " TARGET_FMT_lx " BATl " TARGET_FMT_lx
"\n\t" TARGET_FMT_lx " " TARGET_FMT_lx " " "\n\t" TARGET_FMT_lx " " TARGET_FMT_lx " "
@ -520,9 +520,9 @@ static void mmu6xx_dump_BATs(CPUPPCState *env, int type)
for (i = 0; i < env->nb_BATs; i++) { for (i = 0; i < env->nb_BATs; i++) {
BATu = &BATut[i]; BATu = &BATut[i];
BATl = &BATlt[i]; BATl = &BATlt[i];
BEPIu = *BATu & 0xF0000000; BEPIu = *BATu & BATU32_BEPIU;
BEPIl = *BATu & 0x0FFE0000; BEPIl = *BATu & BATU32_BEPIL;
bl = (*BATu & 0x00001FFC) << 15; bl = (*BATu & BATU32_BL) << 15;
qemu_printf("%s BAT%d BATu " TARGET_FMT_lx qemu_printf("%s BAT%d BATu " TARGET_FMT_lx
" BATl " TARGET_FMT_lx "\n\t" TARGET_FMT_lx " " " BATl " TARGET_FMT_lx "\n\t" TARGET_FMT_lx " "
TARGET_FMT_lx " " TARGET_FMT_lx "\n", TARGET_FMT_lx " " TARGET_FMT_lx "\n",