From patchwork Fri Dec 7 10:36:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 153127 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp345823ljp; Fri, 7 Dec 2018 02:51:16 -0800 (PST) X-Google-Smtp-Source: AFSGD/WI7Z0nMoAbf7X2/aw8YYMvn8K+nYJurtD5laxdNGAJ5eI6dNyZKRX5+Kq/e+BPJ6S/BpyT X-Received: by 2002:ac8:2d53:: with SMTP id o19mr1389464qta.21.1544179876140; Fri, 07 Dec 2018 02:51:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544179876; cv=none; d=google.com; s=arc-20160816; b=0gPjRPkV1XImwEmwe+iuTmQk1F+PjQeCsmOZxcbUt00GS+uy4+p4oDCXGtLCVTBciU IqCGjYykFAE1NDEwtLA0Odcom9pGjGIQic2j8Ja3jbMY8qVcY9RTqiQPjjpX1zPGLDQh EwoZECT62goq1F9TMvy8QPqYmJN//urufCDtgfwT3ll+LeCS9lEK/FAaWs7krHckR+Q1 xKtp1Ce2hpKBMX5vjNE/sHeOv3/29DDgcW2+I4yTWjAUMUIUEDPqd0weQnAH4wb7pKTK yytTqf1Whd/E4BzfbPsDeanBJaEpHEKWH1ZzUQEyMdfc37GVgW99FgdaFufXzGMzdpiP 6MbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=T1SS/p3u3YFxLhpOZRgkkQVS3ysBHfzBcMQrZhMcKSE=; b=hEqiRLZbwitJw7CtZrP+dl+/pBHvQO76L5u44duno+Z5co6ghBXYlvJ9XyRCxv+Dxb jtXNNOjqKBWQA0aWlZMg0gNLXpQd1wRgkRpxcn6mB4hleIxLLGFhe0ZM2+++BEmOjRcJ u+Xabd5i9B6U6PbS4w1lGtm53EObJRJ0HJf4exjObQNpIM81dvwCCuLkDBCyKAcXylDu UiypgFHMdpnlw11yNE/3eqIyxNY4EGs4talBeo/nJevK87DiE1Th82VM+ZCHYgtps2vr mOobM8mGUIAE1xtu3ad83FTt9lpwIYNxAO0Xl8AfLe21g8cWrZJl8ScPk/+j8iAlePiX rhTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XTRxTSsC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id r15si588411qtj.56.2018.12.07.02.51.15 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 07 Dec 2018 02:51:16 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XTRxTSsC; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:45326 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVDj1-0000TL-KV for patch@linaro.org; Fri, 07 Dec 2018 05:51:15 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:59220) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gVDVE-0008Bv-7h for qemu-devel@nongnu.org; Fri, 07 Dec 2018 05:37:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gVDVD-0007mx-Aa for qemu-devel@nongnu.org; Fri, 07 Dec 2018 05:37:00 -0500 Received: from mail-ot1-x342.google.com ([2607:f8b0:4864:20::342]:34822) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gVDVD-0007md-5M for qemu-devel@nongnu.org; Fri, 07 Dec 2018 05:36:59 -0500 Received: by mail-ot1-x342.google.com with SMTP id 81so3373723otj.2 for ; Fri, 07 Dec 2018 02:36:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=T1SS/p3u3YFxLhpOZRgkkQVS3ysBHfzBcMQrZhMcKSE=; b=XTRxTSsCpeoNHUVhe4ZTrnayE45G5urfFF6IDnP/asd84o/3oc972xs6i5dq86Cv56 ncfynJu7PAOzEfEbI/X28CznHN7Ca8Ddj6/E4a43VM7FgR/bJuRLO52REOc9fnj6oqs7 GU17nWdjOIwRtE/Zvt/OPZZ/RKn9VRSC/CT4U= 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=T1SS/p3u3YFxLhpOZRgkkQVS3ysBHfzBcMQrZhMcKSE=; b=Trep5BnUvBC9+fjKplEmxIgDlP7iLjZQ56F4A02iVbox1ZrvTabFiflyOxLXVfHRhQ 1003yYogjO1BL9Xxe+6VSWZV0vjy9LDEGiWfhWWF3s+IKOy3p/rowP8BOmz4KsWEjKMh tS0LXX8I5V6A6MyQmqSaeVVcTtCKNnlIOk9Fabl0PRPLyAV5YSZl6pSr9dyDtW12eb84 xeMg1GOF3pCHFpl1EjxW48pG1NqgdpkRH78UL4zfw5SPxj3Rf18gh7QxNefxxLXo1sUD 0T8OCiAdRkpsagGp0Ns04Q00gO43wZRmyU6he1+ovmqbHyXj8Z9Lpe1jRskrcVou81Sx 1Kog== X-Gm-Message-State: AA+aEWZfEaRP9DM1a5CFSFvqnHPObq0LGBU8J++CCljSuw4efnKln8yF Wwn+utz9oCAEOGzTnfMbJcRtep2Vxqc= X-Received: by 2002:a9d:7097:: with SMTP id l23mr1025680otj.49.1544179018142; Fri, 07 Dec 2018 02:36:58 -0800 (PST) Received: from cloudburst.twiddle.net (172.189-204-159.bestel.com.mx. [189.204.159.172]) by smtp.gmail.com with ESMTPSA id c19sm2037594otl.16.2018.12.07.02.36.56 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 07 Dec 2018 02:36:57 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 7 Dec 2018 04:36:20 -0600 Message-Id: <20181207103631.28193-16-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181207103631.28193-1-richard.henderson@linaro.org> References: <20181207103631.28193-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::342 Subject: [Qemu-devel] [PATCH 15/26] target/arm: Introduce arm_mmu_idx 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: peter.maydell@linaro.org, ramana.radhakrishnan@arm.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The pattern ARMMMUIdx mmu_idx = core_to_arm_mmu_idx(env, cpu_mmu_index(env, false)); is computing the full ARMMMUIdx, stripping off the ARM bits, and then putting them back. Avoid the extra two steps with the appropriate helper function. Signed-off-by: Richard Henderson --- target/arm/cpu.h | 1 + target/arm/helper.c | 27 ++++++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) -- 2.17.2 Reviewed-by: Peter Maydell diff --git a/target/arm/cpu.h b/target/arm/cpu.h index 18f2378b87..6bac5c18d0 100644 --- a/target/arm/cpu.h +++ b/target/arm/cpu.h @@ -2740,6 +2740,7 @@ ARMMMUIdx arm_v7m_mmu_idx_for_secstate_and_priv(CPUARMState *env, ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate); /* Determine the current mmu_idx to use for normal loads/stores */ +ARMMMUIdx arm_mmu_idx(CPUARMState *env); int cpu_mmu_index(CPUARMState *env, bool ifetch); /* Indexes used when registering address spaces with cpu_address_space_init */ diff --git a/target/arm/helper.c b/target/arm/helper.c index eaa9e60e7b..be8daefc46 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7127,7 +7127,7 @@ static bool v7m_push_callee_stack(ARMCPU *cpu, uint32_t lr, bool dotailchain, limit = env->v7m.msplim[M_REG_S]; } } else { - mmu_idx = core_to_arm_mmu_idx(env, cpu_mmu_index(env, false)); + mmu_idx = arm_mmu_idx(env); frame_sp_p = &env->regs[13]; limit = v7m_sp_limit(env); } @@ -7308,7 +7308,7 @@ static bool v7m_push_stack(ARMCPU *cpu) CPUARMState *env = &cpu->env; uint32_t xpsr = xpsr_read(env); uint32_t frameptr = env->regs[13]; - ARMMMUIdx mmu_idx = core_to_arm_mmu_idx(env, cpu_mmu_index(env, false)); + ARMMMUIdx mmu_idx = arm_mmu_idx(env); /* Align stack pointer if the guest wants that */ if ((frameptr & 4) && @@ -11083,7 +11083,7 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, int prot; bool ret; ARMMMUFaultInfo fi = {}; - ARMMMUIdx mmu_idx = core_to_arm_mmu_idx(env, cpu_mmu_index(env, false)); + ARMMMUIdx mmu_idx = arm_mmu_idx(env); *attrs = (MemTxAttrs) {}; @@ -12987,26 +12987,31 @@ ARMMMUIdx arm_v7m_mmu_idx_for_secstate(CPUARMState *env, bool secstate) return arm_v7m_mmu_idx_for_secstate_and_priv(env, secstate, priv); } -int cpu_mmu_index(CPUARMState *env, bool ifetch) +ARMMMUIdx arm_mmu_idx(CPUARMState *env) { - int el = arm_current_el(env); + int el; if (arm_feature(env, ARM_FEATURE_M)) { - ARMMMUIdx mmu_idx = arm_v7m_mmu_idx_for_secstate(env, env->v7m.secure); - - return arm_to_core_mmu_idx(mmu_idx); + return arm_v7m_mmu_idx_for_secstate(env, env->v7m.secure); } + el = arm_current_el(env); if (el < 2 && arm_is_secure_below_el3(env)) { - return arm_to_core_mmu_idx(ARMMMUIdx_S1SE0 + el); + return ARMMMUIdx_S1SE0 + el; + } else { + return ARMMMUIdx_S12NSE0 + el; } - return el; +} + +int cpu_mmu_index(CPUARMState *env, bool ifetch) +{ + return arm_to_core_mmu_idx(arm_mmu_idx(env)); } void cpu_get_tb_cpu_state(CPUARMState *env, target_ulong *pc, target_ulong *cs_base, uint32_t *pflags) { - ARMMMUIdx mmu_idx = core_to_arm_mmu_idx(env, cpu_mmu_index(env, false)); + ARMMMUIdx mmu_idx = arm_mmu_idx(env); int current_el = arm_current_el(env); int fp_el = fp_exception_el(env, current_el); uint32_t flags;