From patchwork Fri Feb 3 17:06:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: fred.konrad@greensocs.com X-Patchwork-Id: 723825 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vFNcm41D7z9s74 for ; Sat, 4 Feb 2017 04:08:56 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=greensocs.com header.i=@greensocs.com header.b="CSR0IHxB"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=greensocs.com header.i=@greensocs.com header.b="JYj7d3wu"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=greensocs.com header.i=@greensocs.com header.b="JYj7d3wu"; dkim-atps=neutral Received: from localhost ([::1]:35946 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZhLy-0005l2-2R for incoming@patchwork.ozlabs.org; Fri, 03 Feb 2017 12:08:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZhKR-0004bA-NI for qemu-devel@nongnu.org; Fri, 03 Feb 2017 12:07:20 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cZhKQ-0002dl-Ny for qemu-devel@nongnu.org; Fri, 03 Feb 2017 12:07:19 -0500 Received: from greensocs.com ([193.104.36.180]:39021) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cZhKQ-0002dV-CC for qemu-devel@nongnu.org; Fri, 03 Feb 2017 12:07:18 -0500 Received: from localhost (localhost [127.0.0.1]) by greensocs.com (Postfix) with ESMTP id AE7931913F5; Fri, 3 Feb 2017 18:07:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1486141637; bh=18PF8c3PyUfq+tNct/HXy+bj21rBg/co+AD+/XEM+rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=CSR0IHxB2t8Awa6mhNSC3W9MUrX+swT8m8Rh44sP9s/LoXI60u7a2XWf6oVjUdo8I wMybMtoGVZBZCxt1vDt5llb/UTVJ8keCOPBbM+CqoZKNiKbWUCYwBD8AVXtrYKOz9w si0cBYn5OHZzQtBCPYD9Vm66XWm0zNP+0deQteUw= X-Virus-Scanned: amavisd-new at greensocs.com Authentication-Results: gs-01.greensocs.com (amavisd-new); dkim=pass (1024-bit key) header.d=greensocs.com header.b=JYj7d3wu; dkim=pass (1024-bit key) header.d=greensocs.com header.b=JYj7d3wu Received: from greensocs.com ([127.0.0.1]) by localhost (gs-01.greensocs.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Lv7PzbGZMvHK; Fri, 3 Feb 2017 18:07:17 +0100 (CET) Received: by greensocs.com (Postfix, from userid 998) id D726324CEC6; Fri, 3 Feb 2017 18:07:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1486141636; bh=18PF8c3PyUfq+tNct/HXy+bj21rBg/co+AD+/XEM+rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JYj7d3wuUQvXj81tZMmxKCGE9Om7Q1Gw5RnUt16FbaJAgpOl9H1+t9vUBBjOI9ZTD J0Csoq625nrfTjj8L1393xPcj8Fv3G/44x+3macOysl0xnxChIW8glerlfHw++k8is RAwZS0tEAMI2EK2nLyMout7V7gzMxhJeDV1NUdJw= Received: from corsair.home (bd231-7-88-127-3-24.fbx.proxad.net [88.127.3.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: fred.konrad@greensocs.com) by greensocs.com (Postfix) with ESMTPSA id 158D21913F5; Fri, 3 Feb 2017 18:07:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=greensocs.com; s=mail; t=1486141636; bh=18PF8c3PyUfq+tNct/HXy+bj21rBg/co+AD+/XEM+rQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=JYj7d3wuUQvXj81tZMmxKCGE9Om7Q1Gw5RnUt16FbaJAgpOl9H1+t9vUBBjOI9ZTD J0Csoq625nrfTjj8L1393xPcj8Fv3G/44x+3macOysl0xnxChIW8glerlfHw++k8is RAwZS0tEAMI2EK2nLyMout7V7gzMxhJeDV1NUdJw= From: fred.konrad@greensocs.com To: qemu-devel@nongnu.org Date: Fri, 3 Feb 2017 18:06:33 +0100 Message-Id: <1486141597-13941-2-git-send-email-fred.konrad@greensocs.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1486141597-13941-1-git-send-email-fred.konrad@greensocs.com> References: <1486141597-13941-1-git-send-email-fred.konrad@greensocs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 193.104.36.180 Subject: [Qemu-devel] [RFC 1/5] 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, peter.maydell@linaro.org, mark.burton@greensocs.com, alistair.francis@xilinx.com, clg@kaod.org, pbonzini@redhat.com, fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: KONRAD Frederic This replaces env1 and page_index variables by env and index so we can use VICTIM_TLB_HIT macro later. Signed-off-by: KONRAD Frederic --- cputlb.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cputlb.c b/cputlb.c index 6c39927..665caea 100644 --- a/cputlb.c +++ b/cputlb.c @@ -457,21 +457,21 @@ static void report_bad_exec(CPUState *cpu, target_ulong addr) * 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)) { @@ -484,7 +484,7 @@ tb_page_addr_t get_page_addr_code(CPUArchState *env1, target_ulong 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); }