From patchwork Wed Mar 6 03:44:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 225294 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 536C62C037A for ; Wed, 6 Mar 2013 15:05:22 +1100 (EST) Received: from localhost ([::1]:53984 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UD5S6-0004uH-NW for incoming@patchwork.ozlabs.org; Tue, 05 Mar 2013 22:55:38 -0500 Received: from eggs.gnu.org ([208.118.235.92]:51505) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UD5I1-0004Dy-Py for qemu-devel@nongnu.org; Tue, 05 Mar 2013 22:45:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UD5Hg-0007s5-OT for qemu-devel@nongnu.org; Tue, 05 Mar 2013 22:45:13 -0500 Received: from ozlabs.org ([2402:b800:7003:1:1::1]:45189) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UD5Hg-0007o9-3P; Tue, 05 Mar 2013 22:44:52 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id D35DF2C038A; Wed, 6 Mar 2013 14:44:42 +1100 (EST) From: David Gibson To: agraf@suse.de Date: Wed, 6 Mar 2013 14:44:08 +1100 Message-Id: <1362541473-4365-21-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: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2402:b800:7003:1:1::1 Cc: David Gibson , qemu-ppc@nongnu.org, afaerber@suse.de, qemu-devel@nongnu.org Subject: [Qemu-devel] [PATCH 20/45] mmu-hash*: Remove eaddr field from mmu_ctx_hash{32, 64} 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 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 --- target-ppc/mmu-hash32.c | 12 +++++------- target-ppc/mmu-hash64.c | 12 +++++------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/target-ppc/mmu-hash32.c b/target-ppc/mmu-hash32.c index ad5ef44..8001563 100644 --- a/target-ppc/mmu-hash32.c +++ b/target-ppc/mmu-hash32.c @@ -43,7 +43,6 @@ struct mmu_ctx_hash32 { hwaddr raddr; /* Real address */ - hwaddr eaddr; /* Effective address */ int prot; /* Protection bits */ hwaddr hash[2]; /* Pagetable hash values */ target_ulong ptem; /* Virtual segment ID | API */ @@ -314,8 +313,8 @@ hwaddr get_pteg_offset32(CPUPPCState *env, hwaddr hash) } /* PTE table lookup */ -static int find_pte32(CPUPPCState *env, struct mmu_ctx_hash32 *ctx, int h, - int rwx, int target_page_bits) +static int find_pte32(CPUPPCState *env, struct mmu_ctx_hash32 *ctx, + target_ulong eaddr, int h, int rwx, int target_page_bits) { hwaddr pteg_off; 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 * split a huge page to 4k chunks */ 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; } return ret; @@ -387,7 +386,6 @@ static int get_segment32(CPUPPCState *env, struct mmu_ctx_hash32 *ctx, target_ulong sr, pgidx; pr = msr_pr; - ctx->eaddr = eaddr; sr = env->sr[eaddr >> 28]; 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, ctx->hash[0]); /* 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) { /* Secondary table lookup */ LOG_MMU("1 htab=" TARGET_FMT_plx "/" TARGET_FMT_plx " vsid=" TARGET_FMT_lx " api=" TARGET_FMT_lx " hash=" TARGET_FMT_plx "\n", env->htab_base, 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) { ret = ret2; } diff --git a/target-ppc/mmu-hash64.c b/target-ppc/mmu-hash64.c index f89d005..407c6e6 100644 --- a/target-ppc/mmu-hash64.c +++ b/target-ppc/mmu-hash64.c @@ -42,7 +42,6 @@ struct mmu_ctx_hash64 { hwaddr raddr; /* Real address */ - hwaddr eaddr; /* Effective address */ int prot; /* Protection bits */ hwaddr hash[2]; /* Pagetable hash values */ 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 */ -static int find_pte64(CPUPPCState *env, struct mmu_ctx_hash64 *ctx, int h, - int rwx, int target_page_bits) +static int find_pte64(CPUPPCState *env, struct mmu_ctx_hash64 *ctx, + target_ulong eaddr, int h, int rwx, int target_page_bits) { hwaddr pteg_off; 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 * split a huge page to 4k chunks */ 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; } return ret; @@ -444,7 +443,6 @@ static int get_segment64(CPUPPCState *env, struct mmu_ctx_hash64 *ctx, int ret, ret2; pr = msr_pr; - ctx->eaddr = eaddr; ppc_slb_t *slb; target_ulong pageaddr; 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, ctx->hash[0]); /* 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) { /* Secondary table lookup */ LOG_MMU("1 htab=" TARGET_FMT_plx "/" TARGET_FMT_plx " vsid=" TARGET_FMT_lx " api=" TARGET_FMT_lx " hash=" TARGET_FMT_plx "\n", env->htab_base, 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) { ret = ret2; }