From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44222) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7ctl-0008PS-Fy for qemu-devel@nongnu.org; Wed, 03 Oct 2018 04:52:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7cti-0001uG-71 for qemu-devel@nongnu.org; Wed, 03 Oct 2018 04:52:49 -0400 Received: from mail-wm1-f66.google.com ([209.85.128.66]:53881) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1g7cti-0001tp-04 for qemu-devel@nongnu.org; Wed, 03 Oct 2018 04:52:46 -0400 Received: by mail-wm1-f66.google.com with SMTP id b19-v6so4872530wme.3 for ; Wed, 03 Oct 2018 01:52:45 -0700 (PDT) References: <20181002163556.10279-1-peter.maydell@linaro.org> <20181002163556.10279-4-peter.maydell@linaro.org> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Wed, 3 Oct 2018 10:52:43 +0200 MIME-Version: 1.0 In-Reply-To: <20181002163556.10279-4-peter.maydell@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH 03/13] target/arm: Move v7m_using_psp() to internals.h List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Maydell , qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org On 02/10/2018 18:35, Peter Maydell wrote: > We're going to want v7m_using_psp() in op_helper.c in the > next patch, so move it from helper.c to internals.h. > > Signed-off-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daudé > --- > target/arm/internals.h | 15 +++++++++++++++ > target/arm/helper.c | 12 ------------ > 2 files changed, 15 insertions(+), 12 deletions(-) > > diff --git a/target/arm/internals.h b/target/arm/internals.h > index dc9357766c9..bc4c01ccd92 100644 > --- a/target/arm/internals.h > +++ b/target/arm/internals.h > @@ -796,4 +796,19 @@ static inline uint32_t arm_debug_exception_fsr(CPUARMState *env) > } > } > > +/** > + * v7m_using_psp: Return true if using process stack pointer > + * Return true if the CPU is currently using the process stack > + * pointer, or false if it is using the main stack pointer. > + */ > +static inline bool v7m_using_psp(CPUARMState *env) > +{ > + /* Handler mode always uses the main stack; for thread mode > + * the CONTROL.SPSEL bit determines the answer. > + * Note that in v7M it is not possible to be in Handler mode with > + * CONTROL.SPSEL non-zero, but in v8M it is, so we must check both. > + */ > + return !arm_v7m_is_handler_mode(env) && > + env->v7m.control[env->v7m.secure] & R_V7M_CONTROL_SPSEL_MASK; > +} > #endif > diff --git a/target/arm/helper.c b/target/arm/helper.c > index c303dc453f1..ef8c244fb84 100644 > --- a/target/arm/helper.c > +++ b/target/arm/helper.c > @@ -6554,18 +6554,6 @@ pend_fault: > return false; > } > > -/* Return true if we're using the process stack pointer (not the MSP) */ > -static bool v7m_using_psp(CPUARMState *env) > -{ > - /* Handler mode always uses the main stack; for thread mode > - * the CONTROL.SPSEL bit determines the answer. > - * Note that in v7M it is not possible to be in Handler mode with > - * CONTROL.SPSEL non-zero, but in v8M it is, so we must check both. > - */ > - return !arm_v7m_is_handler_mode(env) && > - env->v7m.control[env->v7m.secure] & R_V7M_CONTROL_SPSEL_MASK; > -} > - > /* Write to v7M CONTROL.SPSEL bit for the specified security bank. > * This may change the current stack pointer between Main and Process > * stack pointers if it is done for the CONTROL register for the current >