From nobody Wed Feb 11 03:25:58 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1510749619299279.8264938205516; Wed, 15 Nov 2017 04:40:19 -0800 (PST) Received: from localhost ([::1]:35836 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEwz4-0008HN-Bd for importer@patchew.org; Wed, 15 Nov 2017 07:40:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34483) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEwwa-0006r5-Tp for qemu-devel@nongnu.org; Wed, 15 Nov 2017 07:37:29 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEwwa-0006OM-5Z for qemu-devel@nongnu.org; Wed, 15 Nov 2017 07:37:28 -0500 Received: from mail-wr0-x244.google.com ([2a00:1450:400c:c0c::244]:51741) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eEwwZ-0006Nq-Ui for qemu-devel@nongnu.org; Wed, 15 Nov 2017 07:37:28 -0500 Received: by mail-wr0-x244.google.com with SMTP id z14so1554079wrb.8 for ; Wed, 15 Nov 2017 04:37:27 -0800 (PST) Received: from cloudburst.twiddle.net (18.red-37-10-242.dynamicip.rima-tde.net. [37.10.242.18]) by smtp.gmail.com with ESMTPSA id 29sm21828608wrz.77.2017.11.15.04.37.25 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 15 Nov 2017 04:37:25 -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 :mime-version:content-transfer-encoding; bh=aHBaUea/tBedI9wsvw9tO3w8Ii64fxfFEO7kzaNZoMk=; b=N5TZGsNIOoEffPijtjDZ4mRx3t1IJ3DzyRotuYhoViSd9NaW4jowbtyCA9/bbwahYe hSw6TP1MkBt58ABJbThwUlnQ9wSctCgVkr0nXnNh+3aaVaL2BlEpUhlbfmlUTo+Tzkfv pIwTkKFKY7ze8zfVHaWO/hupgjdjMmguJYmAw= 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:mime-version:content-transfer-encoding; bh=aHBaUea/tBedI9wsvw9tO3w8Ii64fxfFEO7kzaNZoMk=; b=jUWSozgYJ68aGUEyvnPvce0FEpkjlCj4K4jyKv7T2CCtQsJf9ChgMjaoyuyQYHSKbq Ev7SLT996EHk1vWdP0eQ8Exqc6eq8e45vROHvpWvXOcMUZ8LPBeoyLfat7yjxQVIDC93 OXKWctfaonXiZGnEhAu/ssYFf2Sjjq79lDB59w+FoAQ1jIgilhUCjg/X/2tcGXahhb75 v6w/Q7GxL/x8kOZdXUC8/KCVBpeNvxrCLgtlho8TATvK3ug3IXpSNcJr6hIjgnSPdgyN uiMrJMyXfAoS9dEsC3KDdcpktanT3+xB5ohyb4MY2y7ivOHsbHbWuOwyqTczeHNyomHt P4Aw== X-Gm-Message-State: AJaThX7zeB4cqosBPk2aElPdWBLcXH5CRivqFxMTn3g31qzSdI9aBQ6f 6M5hFjGxbLFfh7yxGgNBFTSXOJibLOc= X-Google-Smtp-Source: AGs4zMYbmuvAwBa7pQKZK4jutWAQrhK9E/jbXqlwjBIzcYrdvIVMaRR/NOUZ3DEwsHCTrGbQ8DYg3g== X-Received: by 10.223.153.100 with SMTP id x91mr12602715wrb.189.1510749446588; Wed, 15 Nov 2017 04:37:26 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Wed, 15 Nov 2017 13:35:19 +0100 Message-Id: <20171115123520.7464-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171115123520.7464-1-richard.henderson@linaro.org> References: <20171115123520.7464-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::244 Subject: [Qemu-devel] [PULL for-2.11 2/3] target/arm: Use helper_retaddr in stxp helpers 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+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 We use raw memory primitives along the !parallel_cpus paths in order to simplify the endianness handling. Because of that, we did not benefit from the generic changes to cpu_ldst_user_only_template.h. The simplest fix is to manipulate helper_retaddr here. Reviewed-by: Alex Benn=C3=A9e Signed-off-by: Richard Henderson --- target/arm/helper-a64.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/target/arm/helper-a64.c b/target/arm/helper-a64.c index d0e435ca4b..96a3ecf707 100644 --- a/target/arm/helper-a64.c +++ b/target/arm/helper-a64.c @@ -456,6 +456,8 @@ static uint64_t do_paired_cmpxchg64_le(CPUARMState *env= , uint64_t addr, #ifdef CONFIG_USER_ONLY /* ??? Enforce alignment. */ uint64_t *haddr =3D g2h(addr); + + helper_retaddr =3D ra; o0 =3D ldq_le_p(haddr + 0); o1 =3D ldq_le_p(haddr + 1); oldv =3D int128_make128(o0, o1); @@ -465,6 +467,7 @@ static uint64_t do_paired_cmpxchg64_le(CPUARMState *env= , uint64_t addr, stq_le_p(haddr + 0, int128_getlo(newv)); stq_le_p(haddr + 1, int128_gethi(newv)); } + helper_retaddr =3D 0; #else int mem_idx =3D cpu_mmu_index(env, false); TCGMemOpIdx oi0 =3D make_memop_idx(MO_LEQ | MO_ALIGN_16, mem_idx); @@ -523,6 +526,8 @@ static uint64_t do_paired_cmpxchg64_be(CPUARMState *env= , uint64_t addr, #ifdef CONFIG_USER_ONLY /* ??? Enforce alignment. */ uint64_t *haddr =3D g2h(addr); + + helper_retaddr =3D ra; o1 =3D ldq_be_p(haddr + 0); o0 =3D ldq_be_p(haddr + 1); oldv =3D int128_make128(o0, o1); @@ -532,6 +537,7 @@ static uint64_t do_paired_cmpxchg64_be(CPUARMState *env= , uint64_t addr, stq_be_p(haddr + 0, int128_gethi(newv)); stq_be_p(haddr + 1, int128_getlo(newv)); } + helper_retaddr =3D 0; #else int mem_idx =3D cpu_mmu_index(env, false); TCGMemOpIdx oi0 =3D make_memop_idx(MO_BEQ | MO_ALIGN_16, mem_idx); --=20 2.13.6