From patchwork Tue Jan 8 02:17:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 154956 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp4359151jaa; Mon, 7 Jan 2019 18:22:10 -0800 (PST) X-Google-Smtp-Source: ALg8bN7gd80XGFbXSxUjbotFR0AHFs1vlucDaABsp/Ts3wx6BzdGLy7JCDhKmGLVcL1KcHf36hUl X-Received: by 2002:adf:c452:: with SMTP id a18mr54633303wrg.145.1546914130281; Mon, 07 Jan 2019 18:22:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1546914130; cv=none; d=google.com; s=arc-20160816; b=IDaCYt29XSc1uDpIdHB3Ps4Y2MstGGluxVaLhq4fao4YnpS98Bo5+dlHss8wNU0U69 mLWgJpnoC4845phFaSAz/TCLc78Kup6Rn2p/k1Myy/QknDDtocQSZlmF264iNLEgbsg4 tiIZ0ICjn+4ndm4MoWFvYmaDf4ubJpu1gdV+YtPLM1HKGEMReshPG4HH9BkJA1iO9Ab+ zlrDJeXGgHQHutj+Yg0xI6URdXs84aD8mP8paYZ6LoTTzaUQqcCaK6g+k9w2CybLbBHv skulV92v75lfxF+gFvs1aHG1WIZ6X+/oxDZ5Oo2CpaLGLPRbm9uyRBploYL43xOldqns xsHw== 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=WTKYMV4sKSNp5BK5GOH1vdDXA9yb9yW5n3RkFGs4l+4=; b=KVgCtUwEubhREjvAYGhWlHXbhDmTIMM7OPoc1VEYzKL8HrETkr5FWtM0wnv/sGkWC+ KmgTtD6XDT76PZj7sgEC1I+8T0MBu777lKbl4zq5mBDa5L9dmYQgt4tBQw09mlCOTWVM PHcxANoohBhWFzsUwajCni45fgj6KN45dZ+QAmcfvQu37p5m5a0dbpcXtLwkn8LE02HX nhXqMBaidhaof/iCDMCraoU82RhErZZqjSrLbjofr+ghpAQBzLiyw6TfxWxB/71jGN6w d9NLN88Hu7PfmTKleb18ff9XlZsW+CiUmRsZEIEB2RDHYMLGXc8pTbROA+FFVfE5zapl qwIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=ea7HWEvU; 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 t20si5065297wra.198.2019.01.07.18.22.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 07 Jan 2019 18:22:10 -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=ea7HWEvU; 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]:50183 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ggh1t-0002hL-9b for patch@linaro.org; Mon, 07 Jan 2019 21:22:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:45628) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gggxV-0007gC-UJ for qemu-devel@nongnu.org; Mon, 07 Jan 2019 21:17:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gggxU-0002H4-SE for qemu-devel@nongnu.org; Mon, 07 Jan 2019 21:17:37 -0500 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:41950) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gggxU-0002G3-MS for qemu-devel@nongnu.org; Mon, 07 Jan 2019 21:17:36 -0500 Received: by mail-pf1-x444.google.com with SMTP id b7so1116913pfi.8 for ; Mon, 07 Jan 2019 18:17:36 -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=WTKYMV4sKSNp5BK5GOH1vdDXA9yb9yW5n3RkFGs4l+4=; b=ea7HWEvUexC7IsBBNlGKLf7wmd2lmCq1bqQfdiW6vaL2uqqY82I/2PaUDkzy8on8Nw xvAD4j6kgeKvWVc3Zy4IpncCBT6dWzCHYk5aM5Vm4GBticO+axlDe4nk5nPuxIViTe2K atA+WdRpOuyJx/U2TObZFqKdU+6YGGL5TTHaQ= 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=WTKYMV4sKSNp5BK5GOH1vdDXA9yb9yW5n3RkFGs4l+4=; b=krIkDer7BxdAx6+813UtTQ9WyNCqAjg5daevGZWpsL4PUiQAyrb5OwsUCnQiS/lkEF PEhV+MZddgOdB2HBUWxTLmOIy2GmSdTMVd95kMXF3qZmTJlbjCthi1I2K6j9JgUtoIak 0Zwv6NjXiZptngD4F/YojU2FAxIswL2fTr7ur3MtAzSSmmv2Z69eU72UGZM7lNIAHhkL +lPOdujPIodi/HPKQUndbZWW22tFzDRPPaOoZ3W5z1q6l8mmXTQGl7Pf+kBmhbKfXOhr mQGH0NRzwNR1b/7tvtlxcVP6TXre+ZrL8HpzUXRgSDt+jvKMh52nPy7IidhMj++JKdqK hs9A== X-Gm-Message-State: AJcUukcK/+oiYv7mpNi895HsjkYRDZnv1VYuQMlpNVipBlaPd0u/nQeA kZFbNBIq/HId8+vPZf5ur2h0SAs2y3ZRBg== X-Received: by 2002:a63:3507:: with SMTP id c7mr13037370pga.315.1546913855313; Mon, 07 Jan 2019 18:17:35 -0800 (PST) Received: from cloudburst.lan (2001-44b8-2176-c800-8cc6-2630-7d99-5ef1.static.ipv6.internode.on.net. [2001:44b8:2176:c800:8cc6:2630:7d99:5ef1]) by smtp.gmail.com with ESMTPSA id f64sm175814137pfh.0.2019.01.07.18.17.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 07 Jan 2019 18:17:34 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 8 Jan 2019 12:17:22 +1000 Message-Id: <20190108021723.14762-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190108021723.14762-1-richard.henderson@linaro.org> References: <20190108021723.14762-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::444 Subject: [Qemu-devel] [PULL 2/3] target/alpha: Fix user-only initialization of fpcr 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 Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" When the representation of fpcr was changed, the user-only initialization was not updated to match. Oops. Fixes: f3d3aad4a92 Fixes: https://bugs.launchpad.net/bugs/1701835 Reported-by: Bruno Haible Signed-off-by: Richard Henderson --- target/alpha/cpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.17.2 diff --git a/target/alpha/cpu.c b/target/alpha/cpu.c index a953897fcc..1fd95d6c0f 100644 --- a/target/alpha/cpu.c +++ b/target/alpha/cpu.c @@ -205,9 +205,9 @@ static void alpha_cpu_initfn(Object *obj) env->lock_addr = -1; #if defined(CONFIG_USER_ONLY) env->flags = ENV_FLAG_PS_USER | ENV_FLAG_FEN; - cpu_alpha_store_fpcr(env, (FPCR_INVD | FPCR_DZED | FPCR_OVFD - | FPCR_UNFD | FPCR_INED | FPCR_DNOD - | FPCR_DYN_NORMAL)); + cpu_alpha_store_fpcr(env, (uint64_t)(FPCR_INVD | FPCR_DZED | FPCR_OVFD + | FPCR_UNFD | FPCR_INED | FPCR_DNOD + | FPCR_DYN_NORMAL) << 32); #else env->flags = ENV_FLAG_PAL_MODE | ENV_FLAG_FEN; #endif