From patchwork Fri Mar 22 23:43:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 160955 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp1370549jan; Fri, 22 Mar 2019 16:44:08 -0700 (PDT) X-Google-Smtp-Source: APXvYqwVD2tEGH/yiv3yYiJXrtDi2TO3XghgG0O6SocWq1toIC/eaar9Nu2NMJOXSjx5RjBpG9NQ X-Received: by 2002:a5b:c01:: with SMTP id f1mr10960898ybq.39.1553298248463; Fri, 22 Mar 2019 16:44:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553298248; cv=none; d=google.com; s=arc-20160816; b=AzSBl+FJax955ovrDLaVL2pKI3O6O8tOVxgTs/h9Fvlmea0BbdgjLpiQGFrcXPWmk5 j0JbQ5cM12W7gMQwbhj+Lur6BO8Cor+mhkeeNJLMKLG1mG05NTQtOF/n0z/tou4RSoX2 j/oXu+G4OzhDVhKsm6egQcpMZ8jWgj934t3n8kW6fyxZXpbtJshMUjtiQypZf9yAEv0C 8axk16sqo6hpgg7Y0QrWmIO80IaN73KWzeONUk9VDjoNywdjjsfmhahK+/Sv8bWoLcPe Kk+78Gr5EElNhiyVCZU4FuyfaKJc6dNoamUbDQlhP3jAwhm/IWoZYtctEXXqP26e6g8W zo5g== 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 :content-transfer-encoding:mime-version:message-id:date:to:from :dkim-signature; bh=pn1PvNRwxvYJlDb9n23zNX7rW8t6nn/V5ox2lALrB/w=; b=s7uU/uGTYLDzJp+EhZtZrG9tO4xCaiQMfjwRY4dvjJ2nkMC2H1pgBr9Lm0lI53aGLD VBEh1Kwiq/hpuQaFQpPY6dKxcOSWDPNgoha1BSELx8Ykzh/YNcDFbz1/Lqw4AmZec08q EBmyw+J88RaK65fb3P5OouPmsdb5j6OdIRR6WlZVA5YEg2QeaHl37Y5UsFkEK5FLRVF5 koDw5OI5Z0M0GmMN31Ff/3VKYe6c6ULomRtjirtTx7MyYfMApQA2fAq5JMxAxfp1TRDO EcKJBV+P7LCe6TqHXFSYbiSXiLRXsMFZqA1dTh7x+GKzx/0jb+Yqu8edMVYGqee+woex eOaw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ay1hPmjB; 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 i128si5709443ywd.5.2019.03.22.16.44.08 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 22 Mar 2019 16:44:08 -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=Ay1hPmjB; 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]:36207 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7TpY-0008E6-2g for patch@linaro.org; Fri, 22 Mar 2019 19:44:08 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39508) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h7TpN-0008Dx-VT for qemu-devel@nongnu.org; Fri, 22 Mar 2019 19:43:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h7TpH-0004pz-PK for qemu-devel@nongnu.org; Fri, 22 Mar 2019 19:43:56 -0400 Received: from mail-pg1-x544.google.com ([2607:f8b0:4864:20::544]:32877) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h7Tp8-0004RM-TX for qemu-devel@nongnu.org; Fri, 22 Mar 2019 19:43:47 -0400 Received: by mail-pg1-x544.google.com with SMTP id b12so2546592pgk.0 for ; Fri, 22 Mar 2019 16:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=pn1PvNRwxvYJlDb9n23zNX7rW8t6nn/V5ox2lALrB/w=; b=Ay1hPmjBL3CRouAn1C3EWJOhcXwUCS/nrB0iapjHe+hmZsWMvIJ7ujCW6/6w6n6DqJ G4mCJHln2BduPQ+W/nwxCL/Fb1ektA7bEn33RW7ZEnRyMv7TuQM1fKW5X2b8IhyK0KVy lq1VZy4usoIVcZ1pNr2fCBIyEEDEGDOy2BwyfROYwGiEUTkHtspMyA47rR+n8VGtKSzB x9NP8UA5O0BXRzDYN2Y6AarQjDC7n3nSV7xTPv1GPFcqaP9tzfqm+gq1ER1XmjQD0qjo FHZH3uJiZFeZxTH1Ti5Z8DJBlNguwcnz/R63FecdEz8lfnqplT6UzMtkTOPjQwZlTh0V 1FSQ== 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:mime-version :content-transfer-encoding; bh=pn1PvNRwxvYJlDb9n23zNX7rW8t6nn/V5ox2lALrB/w=; b=VQRVC+BB0RglSxxaVchwLZXPQsU29Mtae3CcqTizN4ktb0UPwyVRoFjL7JkL9rp6Vs CneeZc4dOGr0s4Zh7Hfw17n+cClbHJz/fUL67ZyjLRdPaWuhJ7jfNuMDQ45d4J6+hDHa Be34HI6AmBbvunqVT1WksG352za8fY/djB2HzFTnJqYQWH3HTlV8LxkX/I5hgWo+ot7+ 5/55SDnj2dmyk5U8eqYbqArpdcAY8OKxG+SZ3ZIjgGty3H8untTXTt7hZJmWeXNZtDS0 0pjNCbAcqap8SHfWoxMVo0UJuQX7+MvCt7mkxIHbBUC/KwFFL3pieSR2ISDZ629Pp1uK kyTA== X-Gm-Message-State: APjAAAU5yzcviCjS/wUcr3nL+/fp4zfC82kDBSILbxXdnl/VEvWZ/3Mx wnm/7nEbVc+K1rlxLo9k5OxZMeBkF74= X-Received: by 2002:a63:2b82:: with SMTP id r124mr11369787pgr.214.1553298185291; Fri, 22 Mar 2019 16:43:05 -0700 (PDT) Received: from localhost.localdomain (174-21-5-201.tukw.qwest.net. [174.21.5.201]) by smtp.gmail.com with ESMTPSA id i21sm11227699pfa.14.2019.03.22.16.43.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 22 Mar 2019 16:43:04 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Fri, 22 Mar 2019 16:43:02 -0700 Message-Id: <20190322234302.12770-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::544 Subject: [Qemu-devel] [PATCH for-4.0] 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: , Cc: peter.maydell@linaro.org, =?utf-8?q?Alex_Benn=C3=A9e?= Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- target/arm/translate-a64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 Tested-by: Alex Bennée Reviewed-by: Alex Bennée diff --git a/target/arm/translate-a64.c b/target/arm/translate-a64.c index 1959046343..dcdeb80176 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);