From patchwork Fri Apr 1 04:15:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 89187 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 74C69B6F81 for ; Fri, 1 Apr 2011 16:13:07 +1100 (EST) Received: from localhost ([127.0.0.1]:39070 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5WfP-0002jc-5V for incoming@patchwork.ozlabs.org; Fri, 01 Apr 2011 01:13:03 -0400 Received: from [140.186.70.92] (port=39986 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Q5VmF-0007Bl-2N for qemu-devel@nongnu.org; Fri, 01 Apr 2011 00:16:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Q5Vm3-0001Rx-Az for qemu-devel@nongnu.org; Fri, 01 Apr 2011 00:16:02 -0400 Received: from ozlabs.org ([203.10.76.45]:35014) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Q5Vm2-0001R3-IR for qemu-devel@nongnu.org; Fri, 01 Apr 2011 00:15:51 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 5DDEE1007D7; Fri, 1 Apr 2011 15:15:44 +1100 (EST) From: David Gibson To: agraf@suse.de, qemu-devel@nongnu.org Date: Fri, 1 Apr 2011 15:15:14 +1100 Message-Id: <1301631334-30795-8-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1301631334-30795-1-git-send-email-david@gibson.dropbear.id.au> References: <1301631334-30795-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 203.10.76.45 Cc: paulus@samba.org, anton@samba.org Subject: [Qemu-devel] [PATCH 07/27] Clean up slb_lookup() function X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 --- target-ppc/helper.c | 45 ++++++++++++++++++--------------------------- 1 files changed, 18 insertions(+), 27 deletions(-) diff --git a/target-ppc/helper.c b/target-ppc/helper.c index b9621d2..7ca33cb 100644 --- a/target-ppc/helper.c +++ b/target-ppc/helper.c @@ -676,9 +676,7 @@ static inline int find_pte(CPUState *env, mmu_ctx_t *ctx, int h, int rw, } #if defined(TARGET_PPC64) -static inline int slb_lookup(CPUPPCState *env, target_ulong eaddr, - target_ulong *vsid, target_ulong *page_mask, - int *attr, int *target_page_bits) +static inline ppc_slb_t *slb_lookup(CPUPPCState *env, target_ulong eaddr) { uint64_t esid; int n; @@ -693,19 +691,11 @@ static inline int slb_lookup(CPUPPCState *env, target_ulong eaddr, LOG_SLB("%s: slot %d %016" PRIx64 " %016" PRIx64 "\n", __func__, n, slb->esid, slb->vsid); if (slb->esid == esid) { - *vsid = (slb->vsid & SLB_VSID_VSID) >> SLB_VSID_SHIFT; - *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 slb; } } - return -5; + return NULL; } 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) { - target_ulong vsid, page_mask; - int attr; - int n; ppc_slb_t *slb; - n = slb_lookup(env, T0, &vsid, &page_mask, &attr, NULL); - if (n < 0) { + slb = slb_lookup(env, T0); + if (!slb) { return; } - slb = &env->slb[n]; - if (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; #if defined(TARGET_PPC64) if (env->mmu_model & POWERPC_MMU_64) { - int attr; + ppc_slb_t *slb; LOG_MMU("Check SLBs\n"); - ret = slb_lookup(env, eaddr, &vsid, &page_mask, &attr, - &target_page_bits); - if (ret < 0) - return ret; - ctx->key = !!(pr ? (attr & SLB_VSID_KP) : (attr & SLB_VSID_KS)); + slb = slb_lookup(env, eaddr); + if (!slb) { + return -5; + } + + 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; - ctx->nx = !!(attr & SLB_VSID_N); + ctx->nx = !!(slb->vsid & SLB_VSID_N); ctx->eaddr = eaddr; vsid_mask = 0x00003FFFFFFFFF80ULL; vsid_sh = 7;