ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mmu-hash*: Remove eaddr field from mmu_ctx_hash{32, 64} 

The eaddr field of mmu_ctx_hash{32,64} is effectively just used to pass the
effective address from get_segment{32,64}() to find_pte{32,64}().  Just
pass it as a normal parameter instead.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
David Gibson 2013-03-12 00:31:22 +00:00 committed by Alexander Graf
parent ba36ed1005
commit f078cd46de
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,6 @@
struct mmu_ctx_hash32 { struct mmu_ctx_hash32 {
hwaddr raddr; /* Real address */ hwaddr raddr; /* Real address */
hwaddr eaddr; /* Effective address */
int prot; /* Protection bits */ int prot; /* Protection bits */
hwaddr hash[2]; /* Pagetable hash values */ hwaddr hash[2]; /* Pagetable hash values */
target_ulong ptem; /* Virtual segment ID | API */ target_ulong ptem; /* Virtual segment ID | API */
@ -314,8 +313,8 @@ hwaddr get_pteg_offset32(CPUPPCState *env, hwaddr hash)
} }
/* PTE table lookup */ /* PTE table lookup */
static int find_pte32(CPUPPCState *env, struct mmu_ctx_hash32 *ctx, int h, static int find_pte32(CPUPPCState *env, struct mmu_ctx_hash32 *ctx,
int rwx, int target_page_bits) target_ulong eaddr, int h, int rwx, int target_page_bits)
{ {
hwaddr pteg_off; hwaddr pteg_off;
target_ulong pte0, pte1; target_ulong pte0, pte1;
@ -371,7 +370,7 @@ static int find_pte32(CPUPPCState *env, struct mmu_ctx_hash32 *ctx, int h,
/* We have a TLB that saves 4K pages, so let's /* We have a TLB that saves 4K pages, so let's
* split a huge page to 4k chunks */ * split a huge page to 4k chunks */
if (target_page_bits != TARGET_PAGE_BITS) { if (target_page_bits != TARGET_PAGE_BITS) {
ctx->raddr |= (ctx->eaddr & ((1 << target_page_bits) - 1)) ctx->raddr |= (eaddr & ((1 << target_page_bits) - 1))
& TARGET_PAGE_MASK; & TARGET_PAGE_MASK;
} }
return ret; return ret;
@ -387,7 +386,6 @@ static int get_segment32(CPUPPCState *env, struct mmu_ctx_hash32 *ctx,
target_ulong sr, pgidx; target_ulong sr, pgidx;
pr = msr_pr; pr = msr_pr;
ctx->eaddr = eaddr;
sr = env->sr[eaddr >> 28]; sr = env->sr[eaddr >> 28];
ctx->key = (((sr & SR32_KP) && (pr != 0)) || ctx->key = (((sr & SR32_KP) && (pr != 0)) ||
@ -426,14 +424,14 @@ static int get_segment32(CPUPPCState *env, struct mmu_ctx_hash32 *ctx,
env->htab_base, env->htab_mask, vsid, ctx->ptem, env->htab_base, env->htab_mask, vsid, ctx->ptem,
ctx->hash[0]); ctx->hash[0]);
/* Primary table lookup */ /* Primary table lookup */
ret = find_pte32(env, ctx, 0, rwx, target_page_bits); ret = find_pte32(env, ctx, eaddr, 0, rwx, target_page_bits);
if (ret < 0) { if (ret < 0) {
/* Secondary table lookup */ /* Secondary table lookup */
LOG_MMU("1 htab=" TARGET_FMT_plx "/" TARGET_FMT_plx LOG_MMU("1 htab=" TARGET_FMT_plx "/" TARGET_FMT_plx
" vsid=" TARGET_FMT_lx " api=" TARGET_FMT_lx " vsid=" TARGET_FMT_lx " api=" TARGET_FMT_lx
" hash=" TARGET_FMT_plx "\n", env->htab_base, " hash=" TARGET_FMT_plx "\n", env->htab_base,
env->htab_mask, vsid, ctx->ptem, ctx->hash[1]); env->htab_mask, vsid, ctx->ptem, ctx->hash[1]);
ret2 = find_pte32(env, ctx, 1, rwx, target_page_bits); ret2 = find_pte32(env, ctx, eaddr, 1, rwx, target_page_bits);
if (ret2 != -1) { if (ret2 != -1) {
ret = ret2; ret = ret2;
} }

12
target-ppc/mmu-hash64.c
View File

@ -42,7 +42,6 @@
struct mmu_ctx_hash64 { struct mmu_ctx_hash64 {
hwaddr raddr; /* Real address */ hwaddr raddr; /* Real address */
hwaddr eaddr; /* Effective address */
int prot; /* Protection bits */ int prot; /* Protection bits */
hwaddr hash[2]; /* Pagetable hash values */ hwaddr hash[2]; /* Pagetable hash values */
target_ulong ptem; /* Virtual segment ID | API */ target_ulong ptem; /* Virtual segment ID | API */
@ -372,8 +371,8 @@ static int ppc_hash64_pte_update_flags(struct mmu_ctx_hash64 *ctx,
} }
/* PTE table lookup */ /* PTE table lookup */
static int find_pte64(CPUPPCState *env, struct mmu_ctx_hash64 *ctx, int h, static int find_pte64(CPUPPCState *env, struct mmu_ctx_hash64 *ctx,
int rwx, int target_page_bits) target_ulong eaddr, int h, int rwx, int target_page_bits)
{ {
hwaddr pteg_off; hwaddr pteg_off;
target_ulong pte0, pte1; target_ulong pte0, pte1;
@ -429,7 +428,7 @@ static int find_pte64(CPUPPCState *env, struct mmu_ctx_hash64 *ctx, int h,
/* We have a TLB that saves 4K pages, so let's /* We have a TLB that saves 4K pages, so let's
* split a huge page to 4k chunks */ * split a huge page to 4k chunks */
if (target_page_bits != TARGET_PAGE_BITS) { if (target_page_bits != TARGET_PAGE_BITS) {
ctx->raddr |= (ctx->eaddr & ((1 << target_page_bits) - 1)) ctx->raddr |= (eaddr & ((1 << target_page_bits) - 1))
& TARGET_PAGE_MASK; & TARGET_PAGE_MASK;
} }
return ret; return ret;
@ -444,7 +443,6 @@ static int get_segment64(CPUPPCState *env, struct mmu_ctx_hash64 *ctx,
int ret, ret2; int ret, ret2;
pr = msr_pr; pr = msr_pr;
ctx->eaddr = eaddr;
ppc_slb_t *slb; ppc_slb_t *slb;
target_ulong pageaddr; target_ulong pageaddr;
int segment_bits; int segment_bits;
@ -500,14 +498,14 @@ static int get_segment64(CPUPPCState *env, struct mmu_ctx_hash64 *ctx,
env->htab_base, env->htab_mask, vsid, ctx->ptem, env->htab_base, env->htab_mask, vsid, ctx->ptem,
ctx->hash[0]); ctx->hash[0]);
/* Primary table lookup */ /* Primary table lookup */
ret = find_pte64(env, ctx, 0, rwx, target_page_bits); ret = find_pte64(env, ctx, eaddr, 0, rwx, target_page_bits);
if (ret < 0) { if (ret < 0) {
/* Secondary table lookup */ /* Secondary table lookup */
LOG_MMU("1 htab=" TARGET_FMT_plx "/" TARGET_FMT_plx LOG_MMU("1 htab=" TARGET_FMT_plx "/" TARGET_FMT_plx
" vsid=" TARGET_FMT_lx " api=" TARGET_FMT_lx " vsid=" TARGET_FMT_lx " api=" TARGET_FMT_lx
" hash=" TARGET_FMT_plx "\n", env->htab_base, " hash=" TARGET_FMT_plx "\n", env->htab_base,
env->htab_mask, vsid, ctx->ptem, ctx->hash[1]); env->htab_mask, vsid, ctx->ptem, ctx->hash[1]);
ret2 = find_pte64(env, ctx, 1, rwx, target_page_bits); ret2 = find_pte64(env, ctx, eaddr, 1, rwx, target_page_bits);
if (ret2 != -1) { if (ret2 != -1) {
ret = ret2; ret = ret2;
} }