From patchwork Tue Jun 27 15:37:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 9812801 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D09B26020A for ; Tue, 27 Jun 2017 17:12:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D880D27E71 for ; Tue, 27 Jun 2017 17:12:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CCA872833C; Tue, 27 Jun 2017 17:12:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2D35327E71 for ; Tue, 27 Jun 2017 17:12:16 +0000 (UTC) Received: from localhost ([::1]:57205 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPu2B-00071N-Vp for patchwork-qemu-devel@patchwork.kernel.org; Tue, 27 Jun 2017 13:12:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53208) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dPtlj-0007u9-DZ for qemu-devel@nongnu.org; Tue, 27 Jun 2017 12:55:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dPsYL-00068I-1Z for qemu-devel@nongnu.org; Tue, 27 Jun 2017 11:37:22 -0400 Received: from mail-lf0-x244.google.com ([2a00:1450:4010:c07::244]:36214) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dPsYK-000649-QC for qemu-devel@nongnu.org; Tue, 27 Jun 2017 11:37:20 -0400 Received: by mail-lf0-x244.google.com with SMTP id f28so3050947lfi.3 for ; Tue, 27 Jun 2017 08:37:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=QvXEltXh/ZglI7u5Yo0ZgVnp1pMhE7HR1CxBe8mqsDs=; b=DE2fjHmI7ye/z4lkWf9THi4AcmbLSO5gDzLo0RAGyhzFFsZ9wOJFnSf6kxM4SEfR+L rGt3g3UjEeLXLI5DJOo9QVC7HxeBF50cvo+dUwyMeHGRXq+iiSV5m78dhrtt4V+V/ONY HCbfk+J9fhOepd01Y527zrLgRdkiaURiX1onxRTDtFipCJ4RYXWAWbYXEiNHxWum5zQQ gS1IZaBnKxh/6RQcvulBSuT/xAg4WzrSpLwNVHpYU36JAu3t0rNRhya1mwqCOg82oyue 1wc0P9JTrxiUF4kE5ZyjFjJmb5uq7YWE2KTBgLJCyWTU2C7bdb6TIvWqAMwDhk61PFmD iIMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QvXEltXh/ZglI7u5Yo0ZgVnp1pMhE7HR1CxBe8mqsDs=; b=Fa9lp7q8MR9d//BVrVATKSGSWkEh1YS3Lrb9xvX8fUcexvSE4xdAYpjPYIgIFyIk3x soeDXb1VV+66er1x1SeekZs/GRPthMQir6rKJvdxG2FgKUuVcjQatbKNRm3/Y9d/Vsw2 5DaBtJOtOwClbh8m/hqZyMN9Mco2oGMDENuwVfVumOPxOBkYusnqZ2+Jj5xhfddIcY2C 20BywSHJtchCVxmb006kILAJZvGJXedSVNmhMPXjcipn3um9IEVeUu/48Oboa33KM3Gs wK5ZzB1AffHaBsXhmggL1mPNwi2zYFpxgSrPFPmtxd/7TGp7wsIpD4nf8iwrZaFa/AZv y8iQ== X-Gm-Message-State: AKS2vOzoAVNw4SHIhkPCmOXOP/yBt0RGQE3SDVcpAF+IqDYASYgTeux6 5zNm7p8U5zrYNQya X-Received: by 10.25.19.201 with SMTP id 70mr1864584lft.17.1498577839132; Tue, 27 Jun 2017 08:37:19 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id r82sm947342lfr.57.2017.06.27.08.37.17 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Jun 2017 08:37:18 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Tue, 27 Jun 2017 17:37:10 +0200 Message-Id: <1498577836-25883-2-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498577836-25883-1-git-send-email-edgar.iglesias@gmail.com> References: <1498577836-25883-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4010:c07::244 Subject: [Qemu-devel] [PULL v2 1/7] cputlb: cleanup get_page_addr_code to use VICTIM_TLB_HIT X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@xilinx.com, pbonzini@redhat.com, frederic.konrad@adacore.com, rth@twiddle.net Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: KONRAD Frederic This replaces env1 and page_index variables by env and index so we can use VICTIM_TLB_HIT macro later. Reviewed-by: Richard Henderson Reviewed-by: Edgar E. Iglesias Signed-off-by: KONRAD Frederic Signed-off-by: Edgar E. Iglesias --- accel/tcg/cputlb.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/accel/tcg/cputlb.c b/accel/tcg/cputlb.c index 743776a..1cc382d 100644 --- a/accel/tcg/cputlb.c +++ b/accel/tcg/cputlb.c @@ -751,21 +751,21 @@ static inline ram_addr_t qemu_ram_addr_from_host_nofail(void *ptr) * is actually a ram_addr_t (in system mode; the user mode emulation * version of this function returns a guest virtual address). */ -tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) +tb_page_addr_t get_page_addr_code(CPUArchState *env, target_ulong addr) { - int mmu_idx, page_index, pd; + int mmu_idx, index, pd; void *p; MemoryRegion *mr; - CPUState *cpu = ENV_GET_CPU(env1); + CPUState *cpu = ENV_GET_CPU(env); CPUIOTLBEntry *iotlbentry; - page_index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); - mmu_idx = cpu_mmu_index(env1, true); - if (unlikely(env1->tlb_table[mmu_idx][page_index].addr_code != + index = (addr >> TARGET_PAGE_BITS) & (CPU_TLB_SIZE - 1); + mmu_idx = cpu_mmu_index(env, true); + if (unlikely(env->tlb_table[mmu_idx][index].addr_code != (addr & TARGET_PAGE_MASK))) { - cpu_ldub_code(env1, addr); + cpu_ldub_code(env, addr); } - iotlbentry = &env1->iotlb[mmu_idx][page_index]; + iotlbentry = &env->iotlb[mmu_idx][index]; pd = iotlbentry->addr & ~TARGET_PAGE_MASK; mr = iotlb_to_region(cpu, pd, iotlbentry->attrs); if (memory_region_is_unassigned(mr)) { @@ -777,7 +777,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong addr) report_bad_exec(cpu, addr); exit(1); } - p = (void *)((uintptr_t)addr + env1->tlb_table[mmu_idx][page_index].addend); + p = (void *)((uintptr_t)addr + env->tlb_table[mmu_idx][index].addend); return qemu_ram_addr_from_host_nofail(p); }