From patchwork Mon Mar 25 14:31:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 161125 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp4046359jan; Mon, 25 Mar 2019 07:35:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqwWOp+SHLSdXP0Pv/hvP1X06EAVgWwZHv9sc37GROCpWUJjsWlHe9fNNYs3csWo01mmWdo4 X-Received: by 2002:a81:3707:: with SMTP id e7mr15047953ywa.383.1553524549665; Mon, 25 Mar 2019 07:35:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553524549; cv=none; d=google.com; s=arc-20160816; b=kV82i2GlE2spTXbV+UJMQNs8/MgyJ26zLTr068qkEKqY49MCNFNfR4ySktul2mc3QK 3vNnUFRNozv4jiVf/8P3CimUnQRGEpeTC55JkmI8XQ/wK8dwvQvuhgJTHwAjGdn0F+AA HyOv+CJVHgUFjXHw+zKLtGCXyN/N27NbPIip5HYjFEP2M1QqX65QLs2PKLSwrc8i11yK iIZdBdyo5wm9xN1e79ec6N0QmIZdarG0O4YuLH40jnhaxjJYqohM6bxVYvTT41Ywqe7X F8dIzHQmbiknB5ZSiLnLErBuYdrJy6JFnfGslAbeT71raoa5JJuD8LyOso+2asHnPaay m8MA== 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=HfvsvheoIJ3OHd3ttrjFYM1nQgTAZ30153WjHlZo3AA=; b=w14AZBWkeRWuF37viinydRs3uEvGhGmVJ8WhLrtv5RCmusxgysJipfEZamHU7aOKmB Pod6b+D2UPrAy8jFKoNn0nu0a6Vq9csUhEx9WFjS5RiJsgj6JALfJhCI3X2+zCpbCRHr 89tmW20sYVONPevxIjzTs6OoLaCAm1nQbOg/00kTxby8O2sU60XcscPT+u7GAAOopqPG YU7Ytz4lmJ6+C1HORG6591Nr/kl9gJQ4z6BIH/1cnxI0E8D31XvNjvE8WVB/Tww2ky/A iy1GrapBLlaQQh0Z30dyVzbhJtvNdePJq4XiU1ct5FDkrIVTedt26gsK4Q9waNvqqkOz IrQQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=DTObLpC0; 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 v132si9134974ybv.44.2019.03.25.07.35.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 25 Mar 2019 07:35:49 -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=DTObLpC0; 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]:43482 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8QhZ-0002vG-75 for patch@linaro.org; Mon, 25 Mar 2019 10:35:49 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43529) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h8Qdr-0000MW-0g for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:31:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h8Qdq-00020F-44 for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:31:58 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:45429) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h8Qdp-0001zu-OV for qemu-devel@nongnu.org; Mon, 25 Mar 2019 10:31:57 -0400 Received: by mail-wr1-x42c.google.com with SMTP id s15so10394016wra.12 for ; Mon, 25 Mar 2019 07:31:57 -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=HfvsvheoIJ3OHd3ttrjFYM1nQgTAZ30153WjHlZo3AA=; b=DTObLpC0RKJpG0ZSBS08O4LcOpwDSHOUzU+6oHLV3Cf36BSdDkxFhr3QR60YRDtFCK 3j9b+OFxu+6NWaHkDO6rGGsyHK5MTJ/4foywXStI1vWbi2Npq/iNLvW1ez0FyfweIW9U jKyyG5myYdGGWLIlM3yXLbHlU+Jv7+H4Mb9njEa2ipzbpF8t/DPnovV0O33B/Ey/cBIF BnKoV0OEp9o0x/z7651bFQpOZX0twVLVaBBGJtbEo4fBNgmDM80j6/66PKTk6NYhKljE RscLI5hthFyzo0QcYgqu0VMsKUhGfbmUSbfE6fJ8a5usGemC1431oit9WMc8w8o903qS 5RTQ== 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=HfvsvheoIJ3OHd3ttrjFYM1nQgTAZ30153WjHlZo3AA=; b=PMHdoBn1Tc7L79IYN68oGNWOe/HQ5it6aqXrI9bue/VEiSVfHj/77+Dh/DJ/njhdx8 vHiGEYEfTH4pNmBuw/L8p3qbasNTUelWljVv+F5k3EBMCJn49RWXeRrbwnWjjsWGab0x d45lVs7MhGalvLvOSJjEv6t1biFVWn/rgd4H1PEI954DHVvmbR9TCN2CXRSTy7WNX0zN i686Pq0AIBNNKiD6ULJG91FftWwFHrHC46R6/6CpYTqOqL33F7Wt4yd3vg7EdOUlJx1j PWO/x2ewTqCuf8GEWx1IHbU+OdBi2/sUqKIFnUkVCXgXTgiZIpOIu0vBq/R0f9nzNxLt vpQw== X-Gm-Message-State: APjAAAXjt5Xr+U0F1yH/16mUHe/8DJXaHj56Y2rtr2whZNwfXLlkG9/E CrOoYnMMMj2mEJhkxNcdStNUOaYZQFU= X-Received: by 2002:adf:f04e:: with SMTP id t14mr16377548wro.263.1553524316449; Mon, 25 Mar 2019 07:31:56 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id j1sm18858048wme.4.2019.03.25.07.31.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Mar 2019 07:31:55 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Date: Mon, 25 Mar 2019 14:31:47 +0000 Message-Id: <20190325143152.9981-2-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190325143152.9981-1-peter.maydell@linaro.org> References: <20190325143152.9981-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 1/6] target/arm: Fix non-parallel expansion of CASP 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 second word has been loaded from the unincremented address since the first commit. Fixes: 44ac14b06fa Reported-by: Alex Bennée Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée Tested-by: Alex Bennée Message-id: 20190322234302.12770-1-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/translate-a64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.20.1 diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 19590463433..dcdeb80176e 100644 --- a/target/arm/translate-a64.c +++ b/target/arm/translate-a64.c @@ -2510,7 +2510,7 @@ static void gen_compare_and_swap_pair(DisasContext *s, int rs, int rt, tcg_gen_qemu_ld_i64(d1, clean_addr, memidx, MO_64 | MO_ALIGN_16 | s->be_data); tcg_gen_addi_i64(a2, clean_addr, 8); - tcg_gen_qemu_ld_i64(d2, clean_addr, memidx, MO_64 | s->be_data); + tcg_gen_qemu_ld_i64(d2, a2, memidx, MO_64 | s->be_data); /* Compare the two words, also in memory order. */ tcg_gen_setcond_i64(TCG_COND_EQ, c1, d1, s1);