Message ID | 20190416125744.27770-8-peter.maydell@linaro.org |
---|---|
State | Superseded |
Headers | show
Delivered-To: patch@linaro.org Received: by 2002:ac9:2a84:0:0:0:0:0 with SMTP id p4csp4019916oca; Tue, 16 Apr 2019 06:07:31 -0700 (PDT) X-Google-Smtp-Source: APXvYqyUqPqecYZAZCMTobVKpnXfvwG931ldsQHngIhgnIbAG2YHnvuIvmpAc26/XmkPz6/fQ4ja X-Received: by 2002:a1c:9ec7:: with SMTP id h190mr27723223wme.105.1555420051048; Tue, 16 Apr 2019 06:07:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555420051; cv=none; d=google.com; s=arc-20160816; b=VhN7/WOptjTKVymYfjQNax6s1sKAcUNcTP9n+UczoJdiWVCwXYsLs9xcD9GWuXerUD G886EbCWtYH4ej00w9g1fDHRR0S4i8fUtKdCDbh9cBXT6LnMn2AhptV8q6pH5r1vjb5Q xrGBTJIYynNpXVkX/FmoEsnSRC9vm0WdrQijpBuja99qVKp4hxLE31D+J6u8MRWlAJeT rwEfVKgz6YyD8ZTMYFi8pBVCCYtfbtVPDxtPSucHRpzsU2Zv+4YVlZTV5EOSdjte6Azc ron3xOJKHUOkjWwV9AUJlIcZDCuNLpiGh5ufNfSCqSkLwmABqipi6nP4Vv8oHK3Nj7b8 048A== 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=kMVdzvD/XiERD9we9lBIjwqedh398KDiYXQYlDS231U=; b=ZyOpqhDRR+69o5Id6j/0sQR1kKYEcJwTDQUBvm6bGSKYVD1HkiJaPsXxg1Zi1RVVIl yZByOf9E/lTWegaLcNesOCym4eDA4MuazygzrwBac9MJ7xyPGbI+6kytnJEhYpI1NG4u gpFb/S18VdZWZNmlSCVd8C28RPa2Ro06sUYzkHVn6nE9g6bWiYLnD0v+jsH7hU9JGqdU S3nFjYemfU3r+hnFpleMMzRQyvsiXiMUeaClpgvrMd2zE9mH2FQfQtoAjN0ithSY5L3T WO+zPClUKqozarx1Mfh24Bsx/rU6BHptj5SeanPUcC4u6bl/esdPrjKRovTS0DJmDCms PKqA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=XwUfkKGk; 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: <qemu-devel-bounces+patch=linaro.org@nongnu.org> Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 36si37666808wri.440.2019.04.16.06.07.30 for <patch@linaro.org> (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 16 Apr 2019 06:07:31 -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=XwUfkKGk; 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]:36409 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <qemu-devel-bounces+patch=linaro.org@nongnu.org>) id 1hGNoA-0003u8-13 for patch@linaro.org; Tue, 16 Apr 2019 09:07:30 -0400 Received: from eggs.gnu.org ([209.51.188.92]:34453) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1hGNf7-0004bS-GD for qemu-devel@nongnu.org; Tue, 16 Apr 2019 08:58:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1hGNf6-0001B8-F8 for qemu-devel@nongnu.org; Tue, 16 Apr 2019 08:58:09 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38193) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from <peter.maydell@linaro.org>) id 1hGNf3-00015u-2K for qemu-devel@nongnu.org; Tue, 16 Apr 2019 08:58:06 -0400 Received: by mail-wm1-x343.google.com with SMTP id w15so25304725wmc.3 for <qemu-devel@nongnu.org>; Tue, 16 Apr 2019 05:58:01 -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=kMVdzvD/XiERD9we9lBIjwqedh398KDiYXQYlDS231U=; b=XwUfkKGkrXVJMk+vO1201fkwjDMcyWw5SXhBM5FV06Y5VvZluX5LaJ+gsW1nymTKsi lrxrIO1Fv3fP3ffGmubHBc4DlOabh6Y6Z/+jft6eEedpdVYMGxkhINvXTV7WIDpa434Z cXmoFArG9pBeT1uG3W3GONGvaZg0zyB7uotL3dWv+6hYYjIZzK/9fs9ny0lyYY5+cGY0 n36DACKlJ8GPRIzlekJk/wV6xJDV1v1TgX3h/QSp068JBx5D55V+2COWoXr4Y14oHoui GCwhHrkRXF0vaM+X9Oqa+pUY1Rkvq1C49AXo/pyVfrwjkXmHJWKwC0bRMAYzhNjSUWce uxwQ== 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=kMVdzvD/XiERD9we9lBIjwqedh398KDiYXQYlDS231U=; b=Cudqho5CV+Af4bEDVbYHDe5nxFamVVi3rp5LnxaSXfeLCnVhZcOSbNayGFQcwkWlnL TeA9N15fVRg0PY4bXso148oAQOA8701a0EPQCZhYpBhqfQALNSnmmAMRAXo90/laYROI 3juFsGeynnDk1HSf/23Kcdx4P8nD5AKQq0S3AgtRvQbSkCbKyh/08iHoaDOBkJkzwRGt EgovNvEafAQvBqYftktbNgRNRcHCCpHCA5xeewyDdA6n4IP3g+ooUXG/16BcnD18H7cl 1Qfird8a/6r2C/6QRTaFsUrTSgBErYWut17C4MJoKG7yAlAjhJe2EdF7o7K7mUEvl2P7 1eQw== X-Gm-Message-State: APjAAAVVNn9RAtr5uNx4sqUIvrXR5zDUZpQw2r5nDMnxM0FMc/E8veeB 6hv3ZkL01dpN04eHdxMqz8VN+g== X-Received: by 2002:a7b:c92f:: with SMTP id h15mr26435726wml.115.1555419480496; Tue, 16 Apr 2019 05:58:00 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id v184sm39476572wma.6.2019.04.16.05.57.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Apr 2019 05:57:59 -0700 (PDT) From: Peter Maydell <peter.maydell@linaro.org> To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Date: Tue, 16 Apr 2019 13:57:25 +0100 Message-Id: <20190416125744.27770-8-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190416125744.27770-1-peter.maydell@linaro.org> References: <20190416125744.27770-1-peter.maydell@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [PATCH 07/26] target/arm: Clear CONTROL_S.SFPA in SG insn if FPU present X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <qemu-devel.nongnu.org> List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe> List-Archive: <http://lists.nongnu.org/archive/html/qemu-devel/> List-Post: <mailto:qemu-devel@nongnu.org> List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help> List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>, <mailto:qemu-devel-request@nongnu.org?subject=subscribe> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org> |
Series |
target/arm: Implement M profile floating point
|
expand
|
On 4/16/19 5:57 AM, Peter Maydell wrote: > If the floating point extension is present, then the SG instruction > must clear the CONTROL_S.SFPA bit. Implement this. > > (On a no-FPU system the bit will always be zero, so we don't need > to make the clearing of the bit conditional on ARM_FEATURE_VFP.) > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > target/arm/helper.c | 1 + > 1 file changed, 1 insertion(+) Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/target/arm/helper.c b/target/arm/helper.c index 27e5f98bc73..b4f1609a1c6 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -8809,6 +8809,7 @@ static bool v7m_handle_execute_nsc(ARMCPU *cpu) qemu_log_mask(CPU_LOG_INT, "...really an SG instruction at 0x%08" PRIx32 ", executing it\n", env->regs[15]); env->regs[14] &= ~1; + env->v7m.control[M_REG_S] &= ~R_V7M_CONTROL_SFPA_MASK; switch_v7m_security_state(env, true); xpsr_write(env, 0, XPSR_IT); env->regs[15] += 4;
If the floating point extension is present, then the SG instruction must clear the CONTROL_S.SFPA bit. Implement this. (On a no-FPU system the bit will always be zero, so we don't need to make the clearing of the bit conditional on ARM_FEATURE_VFP.) Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- target/arm/helper.c | 1 + 1 file changed, 1 insertion(+) -- 2.20.1