From patchwork Tue Nov 14 12:53:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 837841 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="GU6n6op4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3ybnYr0fNhz9sBZ for ; Tue, 14 Nov 2017 23:55:59 +1100 (AEDT) Received: from localhost ([::1]:59303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEakt-0001Md-KA for incoming@patchwork.ozlabs.org; Tue, 14 Nov 2017 07:55:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42187) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eEakE-0001H6-FK for qemu-devel@nongnu.org; Tue, 14 Nov 2017 07:55:18 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eEak9-0006C4-Gg for qemu-devel@nongnu.org; Tue, 14 Nov 2017 07:55:14 -0500 Received: from mail-wm0-x243.google.com ([2a00:1450:400c:c09::243]:35045) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eEak9-0006Ab-63 for qemu-devel@nongnu.org; Tue, 14 Nov 2017 07:55:09 -0500 Received: by mail-wm0-x243.google.com with SMTP id y80so21058254wmd.0 for ; Tue, 14 Nov 2017 04:55:08 -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=wKRxKghRYX66bnj0i5LS3QaZCXhWXU21G1WwQjVQFMA=; b=GU6n6op4ZMig107uIZ/vv4Kulx97X/mMhe6lDL7DnaPy5J5U79PPKfYatFdLzah0zR bE6OkPMByCGAmIxFVOhNfIV9lY/xduq1vwrmtVDl/Eh3hNmoAFDPhJLCS7qxg1LMTiKZ UUWfISPhPiR89gdqOX6yeFNC1UrJeOA8XQUFQ= 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=wKRxKghRYX66bnj0i5LS3QaZCXhWXU21G1WwQjVQFMA=; b=lIU1pKNqIkUYF/hs08Oo7edDQfz4Bw6VnXlQHMtJrdVgJ0Pyetz26BqULygoS6oTVu sSeFHrUEL0jVXj88hBRoq/h+YZoC6M004KuItVmKGzu61LSVYJskJgF6mzkPqyPOvzwt GNIPR+9+4xaP1BAG2gDSWMsx7GabXOTAV5b4Y0e41CN/UTI6p6jRqtvTvZyG+Z1PWEQ8 lwIzauzcvPvJVDJCEuo6vR2ewjosSjnDhCpghbKUwtMl8t4GzpCRLggHHKcFP/8Dx4Yu JLjzAvcExjnZc2vbG56DiruUY4ImS8qPt9OYqXLlDC4/p1Wpo6EvF/XWWuKitvcTQeyz EIYg== X-Gm-Message-State: AJaThX41DqkKcUbpuj7hd3Me8JgJAMARFZFe7ODq3CMLHz2IvAumGiH4 fWLoHvA4a0Dkz3dqs2kouzJMLIa6ueU= X-Google-Smtp-Source: AGs4zMabTL70ErU9y+QP05ycGWeeJzz9frs65E164XdDN/HrbNFJv3aQsvuudjyHfQSLfi9C3KWcuQ== X-Received: by 10.28.194.139 with SMTP id s133mr6167828wmf.14.1510664107535; Tue, 14 Nov 2017 04:55:07 -0800 (PST) Received: from cloudburst.twiddle.net (176.red-213-99-135.dynamicip.rima-tde.net. [213.99.135.176]) by smtp.gmail.com with ESMTPSA id f10sm16898208wrg.20.2017.11.14.04.55.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Nov 2017 04:55:06 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 14 Nov 2017 13:53:04 +0100 Message-Id: <20171114125304.854-1-richard.henderson@linaro.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171114094203.28030-1-richard.henderson@linaro.org> References: <20171114094203.28030-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::243 Subject: [Qemu-devel] [PATCH 2/1] 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" 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. Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- 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 = g2h(addr); + + helper_retaddr = ra; o0 = ldq_le_p(haddr + 0); o1 = ldq_le_p(haddr + 1); oldv = 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 = 0; #else int mem_idx = cpu_mmu_index(env, false); TCGMemOpIdx oi0 = 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 = g2h(addr); + + helper_retaddr = ra; o1 = ldq_be_p(haddr + 0); o0 = ldq_be_p(haddr + 1); oldv = 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 = 0; #else int mem_idx = cpu_mmu_index(env, false); TCGMemOpIdx oi0 = make_memop_idx(MO_BEQ | MO_ALIGN_16, mem_idx);