From patchwork Thu Feb 14 19:05:56 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 158429 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1752343jaa; Thu, 14 Feb 2019 11:13:00 -0800 (PST) X-Google-Smtp-Source: AHgI3IaT+ynyNdWalxFFOkZbRmh2VVivVLVOsv0DswL7p9iKuUM0gBK2yOtuERwwKRy+tHffQei1 X-Received: by 2002:a5b:1ce:: with SMTP id f14mr105934ybp.432.1550171580152; Thu, 14 Feb 2019 11:13:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550171580; cv=none; d=google.com; s=arc-20160816; b=NPUkhEiemf7jS+kXahEwlVRyjrca6TasWtrRhlyjzXaHWgQ1zhJDoxnsimFnbQQJSK jyUDM/8KsAA2mCaUTGj4Jk/c7LdQw0Lohf9XTlKiErdz3jQWsOtJVhJZneih1bct21iQ qgpKv1H6/cMEVGqilFd/0EN7Eq9y8joQWa1afgZ28BjAcI5NGhSjgQF3G9oaT1OG6m8l 3tv9bEYY+vgB0nEUfBbbAKjxpcODlU5tnR/5ois5vqTlIw20o8MoFTujCo6GjHYkvB0t xn96BfQsaeKxMd8GfJwogihEQZXY8VUk8eOaLXpodRhrI2ahhpwGW7vNxbq8WsCQkwID 3aBQ== 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=W64PRGp8uX/62P12invQvLhJjduChfiEQD/NdXf+/eU=; b=T2ZcS/1q1Pl00HDnpQ4hBHctzmTBroOQRkKWkbFwrHs2Wcd47owrmXYTAj1m18QRM7 7Q5pEXHGPs/lhoUr9a0qXutZiC3megS45I7psbhR2Z6PuB4B24fzo4nTD+VKFpmp1VII KIE7J5x0dbLSJt2w+DRiiEDwAZtwv+aHD6pP4wUMy/LCrUSi24v3DBm2pRkEIvVgsCT3 YIAzvlbv8nH+3tXhcruNpeMvwoeM5kwi6tLTWtyFLOBnTrIyGkDHWv98KtV44EgfWZm1 rCz33Mx5rQ0wyi9qEJjtZdtUtsObVKArxJt8q60RRwmlOLXJe2ZKMkYu/gcJm9WXIdJ2 f4hA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=JRL0USnF; 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 v7si2031003ywd.323.2019.02.14.11.12.59 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 14 Feb 2019 11:13:00 -0800 (PST) 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=JRL0USnF; 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]:53600 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMRP-0004Ss-Gh for patch@linaro.org; Thu, 14 Feb 2019 14:12:59 -0500 Received: from eggs.gnu.org ([209.51.188.92]:54077) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1guMLL-00084E-Ax for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1guMLK-0004uN-89 for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:43 -0500 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:38792) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1guMLJ-0004og-Ts for qemu-devel@nongnu.org; Thu, 14 Feb 2019 14:06:42 -0500 Received: by mail-wr1-x42c.google.com with SMTP id v13so7709602wrw.5 for ; Thu, 14 Feb 2019 11:06:30 -0800 (PST) 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=W64PRGp8uX/62P12invQvLhJjduChfiEQD/NdXf+/eU=; b=JRL0USnFucLMoYX6DI6X8eFMHsmzgXRpCW6rHYf2x/s8gQLR+o7EieS+RkHz0xprxo icwBUoenslh/7q36oFloendaC2UwhFGyy9Ur+6dLjIC1DYL0D2zblPgVhVHyWNLev14E 2rFsNzXlxIVRXYri47rvVTA58yNlcI7gGLqyRI40sCWzAQD5tuS1hE6lC6AeC+dXLZEr Zr3dBRmrehl3M0z3D3TVPVwVHLv28PIO9EoSQW5AmjtoRLrkr+oiuWF3H5WK+Sx/Rmbo cnLe+FnX9EaOTL6rMBl4o3iZ1CioWi1Fnzn9fXyLdv7lR/sirM3ziBgdaL93hDC6Bz0z Vqvg== 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=W64PRGp8uX/62P12invQvLhJjduChfiEQD/NdXf+/eU=; b=lXC9uYJ7jnif76nBFKb0zYsOc8YtQT42x4IKOmYICgLnPwNMzO79CwATJNJyRY97pA v0bqqEha1OGDetrc+URrv8HejR92aAMwZTBvW0KcUYXx2OC41BOQ4nDi17meszvxSKfr FXEqNND2p5U0n7idGYlvLvcqSz36qHT4PqqD1Y6++PkoLUD5dNYzEXOofpsY9XfcS53K 9pmiXvj9ThAs2W55CvhB7mORAZcCGov9tfVbUUKI6A2JOx7U9b5v/o1YMYFzgt5eSDfk N2ga7ZwPhy1dYLGmxLo7cJozu6N0J/FIhrJMqhPKbIepB/9bx9iXHisJaRBZMF8f/CHJ AgeA== X-Gm-Message-State: AHQUAubG1eofRtra6Bl7CUZ4itvljoy5cLWfugPrTRn/rmcPnlXXAbla nZpJrAxrc7jOjfeWSqKlAawKIKAOJ2lyqg== X-Received: by 2002:a5d:6810:: with SMTP id w16mr3980539wru.62.1550171189820; Thu, 14 Feb 2019 11:06:29 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id n184sm7798471wmf.5.2019.02.14.11.06.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 11:06:29 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Date: Thu, 14 Feb 2019 19:05:56 +0000 Message-Id: <20190214190603.25030-21-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190214190603.25030-1-peter.maydell@linaro.org> References: <20190214190603.25030-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::42c Subject: [Qemu-devel] [PULL 20/27] target/arm: Fix vfp_gdb_get/set_reg vs FPSCR 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" From: Richard Henderson The components of this register is stored in several different locations. Signed-off-by: Richard Henderson Message-id: 20190209033847.9014-7-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/helper.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/target/arm/helper.c b/target/arm/helper.c index 7653aa6a50a..8eedce113c1 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -81,7 +81,7 @@ static int vfp_gdb_get_reg(CPUARMState *env, uint8_t *buf, int reg) } switch (reg - nregs) { case 0: stl_p(buf, env->vfp.xregs[ARM_VFP_FPSID]); return 4; - case 1: stl_p(buf, env->vfp.xregs[ARM_VFP_FPSCR]); return 4; + case 1: stl_p(buf, vfp_get_fpscr(env)); return 4; case 2: stl_p(buf, env->vfp.xregs[ARM_VFP_FPEXC]); return 4; } return 0; @@ -107,7 +107,7 @@ static int vfp_gdb_set_reg(CPUARMState *env, uint8_t *buf, int reg) } switch (reg - nregs) { case 0: env->vfp.xregs[ARM_VFP_FPSID] = ldl_p(buf); return 4; - case 1: env->vfp.xregs[ARM_VFP_FPSCR] = ldl_p(buf); return 4; + case 1: vfp_set_fpscr(env, ldl_p(buf)); return 4; case 2: env->vfp.xregs[ARM_VFP_FPEXC] = ldl_p(buf) & (1 << 30); return 4; } return 0;