From patchwork Wed Mar 6 03:44:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 225288 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 361E62C037A for ; Wed, 6 Mar 2013 15:00:49 +1100 (EST) Received: from localhost ([::1]:53977 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UD5Rt-0004qW-8D for incoming@patchwork.ozlabs.org; Tue, 05 Mar 2013 22:55:25 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51587) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UD5IE-0004EC-0S for qemu-devel@nongnu.org; Tue, 05 Mar 2013 22:45:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UD5Hi-0007uE-ED for qemu-devel@nongnu.org; Tue, 05 Mar 2013 22:45:25 -0500 Received: from ozlabs.org ([203.10.76.45]:57946) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UD5Hh-0007ni-IA; Tue, 05 Mar 2013 22:44:54 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 7DF072C039D; Wed, 6 Mar 2013 14:44:43 +1100 (EST) From: David Gibson To: agraf@suse.de Date: Wed, 6 Mar 2013 14:44:20 +1100 Message-Id: <1362541473-4365-33-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1362541473-4365-1-git-send-email-david@gibson.dropbear.id.au> References: <1362541473-4365-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 203.10.76.45 Cc: David Gibson , qemu-ppc@nongnu.org, afaerber@suse.de, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 32/45] mmu-hash32: Split BAT size logic from permissions logic X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org hash32_bat_size_prot() and its 601 variant, as the name suggests, returns both a BAT's size - needed to search for a matching BAT - and its permissions, only relevant once a matching BAT has been located. There's no particular advantage to combining these, so we split these roles into seperate functions for clarity. Signed-off-by: David Gibson --- target-ppc/mmu-hash32.c | 71 ++++++++++++++++++++++++++--------------------- 1 file changed, 40 insertions(+), 31 deletions(-) diff --git a/target-ppc/mmu-hash32.c b/target-ppc/mmu-hash32.c index b7f6e8f..6c71ebd 100644 --- a/target-ppc/mmu-hash32.c +++ b/target-ppc/mmu-hash32.c @@ -113,57 +113,64 @@ static int ppc_hash32_check_prot(int prot, int rwx) return ret; } -/* Perform BAT hit & translation */ -static void hash32_bat_size_prot(CPUPPCState *env, target_ulong *blp, - int *validp, int *protp, - target_ulong batu, target_ulong batl) +static void hash32_bat_size(CPUPPCState *env, target_ulong *blp, int *validp, + target_ulong batu, target_ulong batl) { target_ulong bl; - int pp, valid, prot; + int valid; bl = (batu & BATU32_BL) << 15; valid = 0; - prot = 0; if (((msr_pr == 0) && (batu & BATU32_VS)) || ((msr_pr != 0) && (batu & BATU32_VP))) { valid = 1; - pp = batl & BATL32_PP; - if (pp != 0) { - prot = PAGE_READ | PAGE_EXEC; - if (pp == 0x2) { - prot |= PAGE_WRITE; - } - } } *blp = bl; *validp = valid; - *protp = prot; } -static void hash32_bat_601_size_prot(CPUPPCState *env, target_ulong *blp, - int *validp, int *protp, - target_ulong batu, target_ulong batl) +static int hash32_bat_prot(CPUPPCState *env, + target_ulong batu, target_ulong batl) +{ + int pp, prot; + + prot = 0; + pp = batl & BATL32_PP; + if (pp != 0) { + prot = PAGE_READ | PAGE_EXEC; + if (pp == 0x2) { + prot |= PAGE_WRITE; + } + } + return prot; +} + +static void hash32_bat_601_size(CPUPPCState *env, target_ulong *blp, int *validp, + target_ulong batu, target_ulong batl) { target_ulong bl; - int key, pp, valid, prot; + int valid; bl = (batl & BATL32_601_BL) << 17; LOG_BATS("b %02x ==> bl " TARGET_FMT_lx " msk " TARGET_FMT_lx "\n", (uint8_t)(batl & BATL32_601_BL), bl, ~bl); - prot = 0; valid = !!(batl & BATL32_601_V); - if (valid) { - pp = batu & BATU32_601_PP; - if (msr_pr == 0) { - key = !!(batu & BATU32_601_KS); - } else { - key = !!(batu & BATU32_601_KP); - } - prot = ppc_hash32_pp_check(key, pp, 0); - } *blp = bl; *validp = valid; - *protp = prot; +} + +static int hash32_bat_601_prot(CPUPPCState *env, + target_ulong batu, target_ulong batl) +{ + int key, pp; + + pp = batu & BATU32_601_PP; + if (msr_pr == 0) { + key = !!(batu & BATU32_601_KS); + } else { + key = !!(batu & BATU32_601_KP); + } + return ppc_hash32_pp_check(key, pp, 0); } static int ppc_hash32_get_bat(CPUPPCState *env, struct mmu_ctx_hash32 *ctx, @@ -190,9 +197,11 @@ static int ppc_hash32_get_bat(CPUPPCState *env, struct mmu_ctx_hash32 *ctx, BEPIu = batu & BATU32_BEPIU; BEPIl = batu & BATU32_BEPIL; if (unlikely(env->mmu_model == POWERPC_MMU_601)) { - hash32_bat_601_size_prot(env, &bl, &valid, &prot, batu, batl); + hash32_bat_601_size(env, &bl, &valid, batu, batl); + prot = hash32_bat_601_prot(env, batu, batl); } else { - hash32_bat_size_prot(env, &bl, &valid, &prot, batu, batl); + hash32_bat_size(env, &bl, &valid, batu, batl); + prot = hash32_bat_prot(env, batu, batl); } LOG_BATS("%s: %cBAT%d v " TARGET_FMT_lx " BATu " TARGET_FMT_lx " BATl " TARGET_FMT_lx "\n", __func__,