From patchwork Wed Jun 14 17:45:47 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: 9787181 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 F0A68602C9 for ; Wed, 14 Jun 2017 17:47:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DBB2627853 for ; Wed, 14 Jun 2017 17:47:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D023527F93; Wed, 14 Jun 2017 17:47:12 +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 204DD27853 for ; Wed, 14 Jun 2017 17:47:11 +0000 (UTC) Received: from localhost ([::1]:50259 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLCNq-0005kn-V7 for patchwork-qemu-devel@patchwork.kernel.org; Wed, 14 Jun 2017 13:47:10 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54559) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dLCMl-0005kJ-TA for qemu-devel@nongnu.org; Wed, 14 Jun 2017 13:46:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dLCMi-00013A-4K for qemu-devel@nongnu.org; Wed, 14 Jun 2017 13:46:03 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:35451) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1dLCMh-00012K-Sa for qemu-devel@nongnu.org; Wed, 14 Jun 2017 13:46:00 -0400 Received: by mail-lf0-x243.google.com with SMTP id v20so963576lfa.2 for ; Wed, 14 Jun 2017 10:45:58 -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=FAZ+7i+CSYfy3SduSGxJYt9dyxHO8CZp5FhNiQP6G8Q=; b=jqPNUnHwkQtsPSQziFgErcBktehsSEnTdwCE62PDAY7KZ37Qo5Cq+OW1vqu+lHXSfY VGdtOl8Q5v7Kcv4MoJAOCHQrhoxAektTz26+TRTIpkr7/TlHtA/LqtzadqqxTd6Un/Gn rh6XWpFjNvteZOFZZZNbs8gipOzC7oCrwsKsghkrORMpuKssdOn6098S8WHcoOI4g6Dx Zb5d10Y8sb7GZFXuVjPbEMuid1wbVxprUihcvJmMLHf+kBHgrdAP1kXI+lkTQTvw7sSb t/t6xfxcQvXt7Kl2yuLw/SDQ2S1szdQQvn/Y9tNzk+7RwZG38khDzzr62PEJ7TeYQgwN JM+w== 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=FAZ+7i+CSYfy3SduSGxJYt9dyxHO8CZp5FhNiQP6G8Q=; b=IoEcEv9q+HpfF8RHpvYQF9PXzekvCnYBKp5keH609SEHzPeRCwrCeRmDa8PIkzR7oz Fm8UyvF5FctJXfk/cOsPPmeOUBuPbeXHYlRWc4gMY5BSSPLdLyQ6y8sWiQVq7xYalaS4 SWbiGf9zjjQ+BTCJaDOmqFBwT1Tf/n5PucJt5ZEpRGMKAAPoXDX1yuk/RxDGpOezHB77 A9OqvtbY+wi31oNjZ1S1dSBM/amTMxiwvMX4xZZsRWYv7HEhUqxRO3gG3tjN7X2RGHu9 lmiOwqFycy4tMeDlRUTqUoBg37K64G1iWlt6fxHDVCTVBIsrK/DLPE8yKWRIc6jYLFHl kEbQ== X-Gm-Message-State: AKS2vOwA/uhBLBTP/yyCRLSaslHMtRxs3kIUu/J9vUhHb1KTx6Ep+c6i 7XXMOHyTNExe7jUJ X-Received: by 10.25.215.74 with SMTP id o71mr442210lfg.105.1497462356767; Wed, 14 Jun 2017 10:45:56 -0700 (PDT) Received: from localhost (81-231-233-234-no56.tbcn.telia.com. [81.231.233.234]) by smtp.gmail.com with ESMTPSA id x199sm163157lfa.13.2017.06.14.10.45.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 14 Jun 2017 10:45:55 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Wed, 14 Jun 2017 19:45:47 +0200 Message-Id: <1497462353-3432-2-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1497462353-3432-1-git-send-email-edgar.iglesias@gmail.com> References: <1497462353-3432-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::243 Subject: [Qemu-devel] [PULL v1 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, rth@twiddle.net, fred.konrad@greensocs.com 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 --- cputlb.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cputlb.c b/cputlb.c index 743776a..1cc382d 100644 --- a/cputlb.c +++ b/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); }