From patchwork Mon Apr 29 17:00:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 163048 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp2134055ill; Mon, 29 Apr 2019 10:04:59 -0700 (PDT) X-Google-Smtp-Source: APXvYqwpRQSXyKPiigrRNorUPKpSkWO5eF1QUwCQdMTlB0LgW4S+p3Y82w3qcuoBUTfdpiz1180q X-Received: by 2002:a19:6619:: with SMTP id a25mr6790969lfc.21.1556557499132; Mon, 29 Apr 2019 10:04:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556557499; cv=none; d=google.com; s=arc-20160816; b=h6DpnxC0/8caP19ijyZZqtgaKAMi58RJuMPlNYFftAA1YCfwFhMvXYtLlRYcen6/Un 20wTQfuOBkzJoae3xpDcaKuFJoVz782yb9qx6ma0GXjLrXAlPzJiuqFXkMD4orRpIB65 Q8GQDhgCcpXF4NFLnLUb/r/u+evt/P28fGVhn+x4r3Vb8GUgibVT3DI3vogd6FOoliST xaXI3sfkSDYcOJJKHj1zjQs+IpG+Am5RkW4patkf30ToBjdLiztLOD9ADAg5armcagvL o8CQtAnmKfu7jLxPTICjYlUYJjpx5hgmpFj5D5NlcHMXiom9cEHyTVu81G/YlkiNSs/d eETg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Rv9idA66U0R3da/ng9l1sXaK23Zu2IQFWoWn3MV0yck=; b=C3EtP/GyPCx9yfosUORPvMpZunlsm4r8VNAJaPx9ux38RSOjlVgE0tCAISyi3qxdAJ Ea/YZmLaay6Tlgu2WM6nll6uaQdpsWz+bD4V+NcuGkMCtiwik1MHAjTOQFdWMTldGYRY sGI+FZ4U2zDYRA3hUxg+FIKWtDqW3I3p0ZuvYMGmIlHKk7jnuyKelM7qCRgq8MLmwq+o 2X+BaqlUZZH1pMsPkjZucLFJCaiZCgA/KG7GII8P18SsmwpOzX/88VGV0DweO5b1IQFV ENQlO7T8/GKo3ytFrbeSTpcyOMJb1jeTvF4UNIF0DyzbvGhBQu+vAKLTwdqLhsOxJKAP c9uA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=e7rIDARk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id x25si18711522lfc.6.2019.04.29.10.04.58 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 29 Apr 2019 10:04:59 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=e7rIDARk; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:60627 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL9i5-0007XO-Ox for patch@linaro.org; Mon, 29 Apr 2019 13:04:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34170) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hL9eS-0004Sl-Br for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hL9eM-0006We-7d for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:11 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:35880) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hL9eI-0006Qc-FT for qemu-devel@nongnu.org; Mon, 29 Apr 2019 13:01:02 -0400 Received: by mail-wm1-x32f.google.com with SMTP id h18so189194wml.1 for ; Mon, 29 Apr 2019 10:00:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Rv9idA66U0R3da/ng9l1sXaK23Zu2IQFWoWn3MV0yck=; b=e7rIDARkQlswB+K4yyeHwsM5VJ1v1gWkRdrp7S4ViJtg8krnJrGFDW1JxfKhCJp84+ YwrsZbx6/cBnzSEecmm+/1w+yBpiPywCFU9daUtrRaJOUK1CQNYgFGDOXXmPbDedalUE 188IGa0yhNPGfE3i5Ko6Sr81+kUD5CBGI1Z56Kiri2tdUMX2Z490ejs+tGJlCQSRsXPz A1jytr6ee+XDr+mj6Hdg9trdggq0wycUjLgz0Ndgjask276bQUVkVAZLf2teQL60IuEA gQX3HIaG1yqMhrmFvCIyRfLX5l5RuJod//wQXQj1qXrqdUshETYMADn9m9fUcqKyqVBl HAPw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Rv9idA66U0R3da/ng9l1sXaK23Zu2IQFWoWn3MV0yck=; b=Ktk1aLRpA2NjKhJtidUVSCsrRppXhWtDnv00v1OxrgiySUZBj04Mvz8yHaL7YoZVaB avFyQT/BJ6uYLZKzDro1S8+7QuAUTl8JX30Hb5mrwjPyYJv2LKycTnoEWORymUfdtgSj 0Q2+J9Xhsc83VMM7R7xKmHsmZnH1Fji7rnyX32vf2J27K1r/uSVHBsGHva62Ajl5hgGk NCL0QGaabrbIFcp1ptAC4f/YlBTWpURkDYuVDHVCa3U0o0JsA81P7gWiwSQKFmdW95x3 MP8Htdp7EgCWDlpQ3sXyFR3pxhs+kjaGSB3zz/FbmpdCMFia29HsGejYPsrtrj+2adFe 7Jbg== X-Gm-Message-State: APjAAAV0PzzYBRHkO7oWiXYmWBUU7BgTjeWa/VJ2cAL+TondyDddNm8z h7tpVt0bJhI87LDkwTLwRAm5GKHdMoM= X-Received: by 2002:a1c:ef10:: with SMTP id n16mr57476wmh.70.1556557251610; Mon, 29 Apr 2019 10:00:51 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id a13sm36896wmj.39.2019.04.29.10.00.50 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Apr 2019 10:00:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 29 Apr 2019 18:00:03 +0100 Message-Id: <20190429170030.11323-16-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190429170030.11323-1-peter.maydell@linaro.org> References: <20190429170030.11323-1-peter.maydell@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32f Subject: [Qemu-devel] [PULL 15/42] target/arm: Clear CONTROL.SFPA in BXNS and BLXNS 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" For v8M floating point support, transitions from Secure to Non-secure state via BLNS and BLXNS must clear the CONTROL.SFPA bit. (This corresponds to the pseudocode BranchToNS() function.) Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20190416125744.27770-13-peter.maydell@linaro.org --- target/arm/helper.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 547898581a2..088852ceb96 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -7819,6 +7819,9 @@ void HELPER(v7m_bxns)(CPUARMState *env, uint32_t dest) /* translate.c should have made BXNS UNDEF unless we're secure */ assert(env->v7m.secure); + if (!(dest & 1)) { + env->v7m.control[M_REG_S] &= ~R_V7M_CONTROL_SFPA_MASK; + } switch_v7m_security_state(env, dest & 1); env->thumb = 1; env->regs[15] = dest & ~1; @@ -7876,6 +7879,7 @@ void HELPER(v7m_blxns)(CPUARMState *env, uint32_t dest) */ write_v7m_exception(env, 1); } + env->v7m.control[M_REG_S] &= ~R_V7M_CONTROL_SFPA_MASK; switch_v7m_security_state(env, 0); env->thumb = 1; env->regs[15] = dest;