diff options
| -rw-r--r-- | target-ppc/cpu.h | 1 | ||||
| -rw-r--r-- | target-ppc/mmu-hash32.c | 7 | ||||
| -rw-r--r-- | target-ppc/mmu-hash32.h | 2 | ||||
| -rw-r--r-- | target-ppc/mmu-hash64.c | 2 | ||||
| -rw-r--r-- | target-ppc/mmu_helper.c | 9 |
5 files changed, 10 insertions, 11 deletions
diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 41cd5d6aba..86e8978ff8 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -1133,7 +1133,6 @@ void ppc_hw_interrupt (CPUPPCState *env); #if !defined(CONFIG_USER_ONLY) void ppc_store_sdr1 (CPUPPCState *env, target_ulong value); -hwaddr get_pteg_offset(CPUPPCState *env, hwaddr hash, int pte_size); int get_bat(CPUPPCState *env, mmu_ctx_t *ctx, target_ulong virtual, int rw, int type); #endif /* !defined(CONFIG_USER_ONLY) */ diff --git a/target-ppc/mmu-hash32.c b/target-ppc/mmu-hash32.c index 4b7598bdfc..0ccaf7cf06 100644 --- a/target-ppc/mmu-hash32.c +++ b/target-ppc/mmu-hash32.c @@ -174,6 +174,11 @@ static int ppc_hash32_pte_update_flags(mmu_ctx_t *ctx, target_ulong *pte1p, return store; } +hwaddr get_pteg_offset32(CPUPPCState *env, hwaddr hash) +{ + return (hash * HASH_PTE_SIZE_32 * 8) & env->htab_mask; +} + /* PTE table lookup */ static int find_pte32(CPUPPCState *env, mmu_ctx_t *ctx, int h, int rw, int type, int target_page_bits) @@ -184,7 +189,7 @@ static int find_pte32(CPUPPCState *env, mmu_ctx_t *ctx, int h, int ret, r; ret = -1; /* No entry found */ - pteg_off = get_pteg_offset(env, ctx->hash[h], HASH_PTE_SIZE_32); + pteg_off = get_pteg_offset32(env, ctx->hash[h]); for (i = 0; i < 8; i++) { if (env->external_htab) { pte0 = ldl_p(env->external_htab + pteg_off + (i * 8)); diff --git a/target-ppc/mmu-hash32.h b/target-ppc/mmu-hash32.h index 8f10e0d15c..3435aa5513 100644 --- a/target-ppc/mmu-hash32.h +++ b/target-ppc/mmu-hash32.h @@ -3,7 +3,7 @@ #ifndef CONFIG_USER_ONLY -int pte32_is_valid(target_ulong pte0); +hwaddr get_pteg_offset32(CPUPPCState *env, hwaddr hash); hwaddr ppc_hash32_get_phys_page_debug(CPUPPCState *env, target_ulong addr); int ppc_hash32_handle_mmu_fault(CPUPPCState *env, target_ulong address, int rw, int mmu_idx); diff --git a/target-ppc/mmu-hash64.c b/target-ppc/mmu-hash64.c index f9c5b099b4..7134616f2c 100644 --- a/target-ppc/mmu-hash64.c +++ b/target-ppc/mmu-hash64.c @@ -378,7 +378,7 @@ static int find_pte64(CPUPPCState *env, mmu_ctx_t *ctx, int h, int ret, r; ret = -1; /* No entry found */ - pteg_off = get_pteg_offset(env, ctx->hash[h], HASH_PTE_SIZE_64); + pteg_off = (ctx->hash[h] * HASH_PTE_SIZE_64 * 8) & env->htab_mask; for (i = 0; i < 8; i++) { if (env->external_htab) { pte0 = ldq_p(env->external_htab + pteg_off + (i * 16)); diff --git a/target-ppc/mmu_helper.c b/target-ppc/mmu_helper.c index 2deb635d75..50ec0ace7d 100644 --- a/target-ppc/mmu_helper.c +++ b/target-ppc/mmu_helper.c @@ -499,11 +499,6 @@ int get_bat(CPUPPCState *env, mmu_ctx_t *ctx, return ret; } -hwaddr get_pteg_offset(CPUPPCState *env, hwaddr hash, int pte_size) -{ - return (hash * pte_size * 8) & env->htab_mask; -} - /* Perform segment based translation */ static inline int get_segment_6xx_tlb(CPUPPCState *env, mmu_ctx_t *ctx, target_ulong eaddr, int rw, int type) @@ -1551,9 +1546,9 @@ int cpu_ppc_handle_mmu_fault(CPUPPCState *env, target_ulong address, int rw, tlb_miss: env->error_code |= ctx.key << 19; env->spr[SPR_HASH1] = env->htab_base + - get_pteg_offset(env, ctx.hash[0], HASH_PTE_SIZE_32); + get_pteg_offset32(env, ctx.hash[0]); env->spr[SPR_HASH2] = env->htab_base + - get_pteg_offset(env, ctx.hash[1], HASH_PTE_SIZE_32); + get_pteg_offset32(env, ctx.hash[1]); break; case POWERPC_MMU_SOFT_74xx: if (rw == 1) { |