From patchwork Mon Oct 26 13:02:02 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Edgar E. Iglesias" X-Patchwork-Id: 535935 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 8B7AA14012C for ; Tue, 27 Oct 2015 00:06:13 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=YWQp8kjo; dkim-atps=neutral Received: from localhost ([::1]:52786 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqhTX-0005X1-Ek for incoming@patchwork.ozlabs.org; Mon, 26 Oct 2015 09:06:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45174) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqhQQ-0008DS-Il for qemu-devel@nongnu.org; Mon, 26 Oct 2015 09:03:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZqhQP-0002eW-Du for qemu-devel@nongnu.org; Mon, 26 Oct 2015 09:02:58 -0400 Received: from mail-pa0-x232.google.com ([2607:f8b0:400e:c03::232]:33248) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZqhQP-0002eS-8q for qemu-devel@nongnu.org; Mon, 26 Oct 2015 09:02:57 -0400 Received: by pacfa8 with SMTP id fa8so9293215pac.0 for ; Mon, 26 Oct 2015 06:02:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0mtlSauH2USfYpd4yU3dOdKEd3VAtr2dcv3GKNN787c=; b=YWQp8kjoqYob2Yl+druidEYvg/RZTJWTZGvLJIesnbEzoYz5JyzD3hhvlRCfidsj6S jZFQI14/HXuTxQQz+plEr/Xdikipv8l9jF1rb4v42HiOXC+zVT1XguaagMD6AJFnQqLv 4/2xhNAyeSh86Lq5Y7cDWFhoVZuW/6on8e+9xlE+vt5LSKG6gXjymy2Qn5mDWZBjYMXZ E+TUvh4SagwU1CB9mW1XsUFblVhBD7GY7Y0DfEH84dfZaHzmq9pO9nUCw9x0/IJg1J0m LtYPqNErQXECB8dDJ8X1DZAB4bWDiT8eVA2nDshtvdrilVZvAO6Xd8ZK46lK2V0GOUwj 2Lig== X-Received: by 10.68.132.194 with SMTP id ow2mr21798841pbb.128.1445864576778; Mon, 26 Oct 2015 06:02:56 -0700 (PDT) Received: from localhost (ec2-52-8-89-49.us-west-1.compute.amazonaws.com. [52.8.89.49]) by smtp.gmail.com with ESMTPSA id pj10sm33960234pbc.59.2015.10.26.06.02.54 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 26 Oct 2015 06:02:55 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 26 Oct 2015 14:02:02 +0100 Message-Id: <1445864527-14520-10-git-send-email-edgar.iglesias@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1445864527-14520-1-git-send-email-edgar.iglesias@gmail.com> References: <1445864527-14520-1-git-send-email-edgar.iglesias@gmail.com> X-detected-operating-system: by eggs.gnu.org: Error: Malformed IPv6 address (bad octet value). X-Received-From: 2607:f8b0:400e:c03::232 Cc: laurent.desnogues@gmail.com, serge.fdrv@gmail.com, edgar.iglesias@xilinx.com, alex.bennee@linaro.org, agraf@suse.de Subject: [Qemu-devel] [PATCH v5 09/14] target-arm: Avoid inline for get_phys_addr 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 From: "Edgar E. Iglesias" Avoid inline for get_phys_addr() to prepare for future recursive use. Reviewed-by: Peter Maydell Signed-off-by: Edgar E. Iglesias --- target-arm/helper.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/target-arm/helper.c b/target-arm/helper.c index ae28be3..bf0aa0c 100644 --- a/target-arm/helper.c +++ b/target-arm/helper.c @@ -15,10 +15,10 @@ #define ARM_CPU_FREQ 1000000000 /* FIXME: 1 GHz, should be configurable */ #ifndef CONFIG_USER_ONLY -static inline bool get_phys_addr(CPUARMState *env, target_ulong address, - int access_type, ARMMMUIdx mmu_idx, - hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot, - target_ulong *page_size, uint32_t *fsr); +static bool get_phys_addr(CPUARMState *env, target_ulong address, + int access_type, ARMMMUIdx mmu_idx, + hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot, + target_ulong *page_size, uint32_t *fsr); /* Definitions for the PMCCNTR and PMCR registers */ #define PMCRD 0x8 @@ -7110,10 +7110,10 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, uint32_t address, * @page_size: set to the size of the page containing phys_ptr * @fsr: set to the DFSR/IFSR value on failure */ -static inline bool get_phys_addr(CPUARMState *env, target_ulong address, - int access_type, ARMMMUIdx mmu_idx, - hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot, - target_ulong *page_size, uint32_t *fsr) +static bool get_phys_addr(CPUARMState *env, target_ulong address, + int access_type, ARMMMUIdx mmu_idx, + hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot, + target_ulong *page_size, uint32_t *fsr) { if (mmu_idx == ARMMMUIdx_S12NSE0 || mmu_idx == ARMMMUIdx_S12NSE1) { /* TODO: when we support EL2 we should here call ourselves recursively