diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2013-03-12 00:31:15 +0000 |
|---|---|---|
| committer | Alexander Graf <agraf@suse.de> | 2013-03-22 15:28:48 +0100 |
| commit | 59191721a16ae393c01280dc633937374cdf474e (patch) | |
| tree | 94370e8c33a59a86f3d046b51446da02e2cde305 /target-ppc/mmu_helper.c | |
| parent | 496272a7018ba01aa2b87a1a5ed866ff85133401 (diff) | |
| download | qemu-59191721a16ae393c01280dc633937374cdf474e.tar.gz | |
target-ppc: Don't share get_pteg_offset() between 32 and 64-bit
The get_pteg_offset() helper function is currently shared between 32-bit
and 64-bit hash mmus, taking a parameter for the hash pte size. In the
64-bit paths, it's only called in one place, and it's a trivial
calculation. This patch, therefore, open codes it for 64-bit. The
remaining version, which is used in two places is made 32-bit only and
moved to mmu-hash32.c.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
Diffstat (limited to 'target-ppc/mmu_helper.c')
| -rw-r--r-- | target-ppc/mmu_helper.c | 9 |
1 files changed, 2 insertions, 7 deletions
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) { |