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

Clean up slb_lookup() function 

The slb_lookup() function, used in the ppc translation path returns a
number of slb entry fields in reference parameters.  However, only one
of the two callers of slb_lookup() actually wants this information.

This patch, therefore, makes slb_lookup() return a simple pointer to the
located SLB entry (or NULL), and the caller which needs the fields can
extract them itself.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
David Gibson 2011-04-01 15:15:14 +11:00 committed by Alexander Graf
parent eaabeef268
commit 8500e3a912
1 changed files with 18 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
target-ppc/helper.c
View File

@ -676,9 +676,7 @@ static inline int find_pte(CPUState *env, mmu_ctx_t *ctx, int h, int rw,
} }
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
static inline int slb_lookup(CPUPPCState *env, target_ulong eaddr, static inline ppc_slb_t *slb_lookup(CPUPPCState *env, target_ulong eaddr)
target_ulong *vsid, target_ulong *page_mask,
int *attr, int *target_page_bits)
{ {
uint64_t esid; uint64_t esid;
int n; int n;
@ -693,19 +691,11 @@ static inline int slb_lookup(CPUPPCState *env, target_ulong eaddr,
LOG_SLB("%s: slot %d %016" PRIx64 " %016" LOG_SLB("%s: slot %d %016" PRIx64 " %016"
PRIx64 "\n", __func__, n, slb->esid, slb->vsid); PRIx64 "\n", __func__, n, slb->esid, slb->vsid);
if (slb->esid == esid) { if (slb->esid == esid) {
*vsid = (slb->vsid & SLB_VSID_VSID) >> SLB_VSID_SHIFT; return slb;
*page_mask = ~SEGMENT_MASK_256M;
*attr = slb->vsid & SLB_VSID_ATTR;
if (target_page_bits) {
*target_page_bits = (slb->vsid & SLB_VSID_L)
? TARGET_PAGE_BITS_16M
: TARGET_PAGE_BITS;
}
return n;
} }
} }
return -5; return NULL;
} }
void ppc_slb_invalidate_all (CPUPPCState *env) void ppc_slb_invalidate_all (CPUPPCState *env)
@ -732,18 +722,13 @@ void ppc_slb_invalidate_all (CPUPPCState *env)
void ppc_slb_invalidate_one (CPUPPCState *env, uint64_t T0) void ppc_slb_invalidate_one (CPUPPCState *env, uint64_t T0)
{ {
target_ulong vsid, page_mask;
int attr;
int n;
ppc_slb_t *slb; ppc_slb_t *slb;
n = slb_lookup(env, T0, &vsid, &page_mask, &attr, NULL); slb = slb_lookup(env, T0);
if (n < 0) { if (!slb) {
return; return;
} }
slb = &env->slb[n];
if (slb->esid & SLB_ESID_V) { if (slb->esid & SLB_ESID_V) {
slb->esid &= ~SLB_ESID_V; slb->esid &= ~SLB_ESID_V;
@ -822,16 +807,22 @@ static inline int get_segment(CPUState *env, mmu_ctx_t *ctx,
pr = msr_pr; pr = msr_pr;
#if defined(TARGET_PPC64) #if defined(TARGET_PPC64)
if (env->mmu_model & POWERPC_MMU_64) { if (env->mmu_model & POWERPC_MMU_64) {
int attr; ppc_slb_t *slb;
LOG_MMU("Check SLBs\n"); LOG_MMU("Check SLBs\n");
ret = slb_lookup(env, eaddr, &vsid, &page_mask, &attr, slb = slb_lookup(env, eaddr);
&target_page_bits); if (!slb) {
if (ret < 0) return -5;
return ret; }
ctx->key = !!(pr ? (attr & SLB_VSID_KP) : (attr & SLB_VSID_KS));
vsid = (slb->vsid & SLB_VSID_VSID) >> SLB_VSID_SHIFT;
page_mask = ~SEGMENT_MASK_256M;
target_page_bits = (slb->vsid & SLB_VSID_L)
? TARGET_PAGE_BITS_16M : TARGET_PAGE_BITS;
ctx->key = !!(pr ? (slb->vsid & SLB_VSID_KP)
: (slb->vsid & SLB_VSID_KS));
ds = 0; ds = 0;
ctx->nx = !!(attr & SLB_VSID_N); ctx->nx = !!(slb->vsid & SLB_VSID_N);
ctx->eaddr = eaddr; ctx->eaddr = eaddr;
vsid_mask = 0x00003FFFFFFFFF80ULL; vsid_mask = 0x00003FFFFFFFFF80ULL;
vsid_sh = 7; vsid_sh = 7;