From patchwork Wed Aug 24 22:17:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Emilio Cota X-Patchwork-Id: 9298439 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 6F601607F0 for ; Wed, 24 Aug 2016 22:23:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4D4AA29000 for ; Wed, 24 Aug 2016 22:23:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4164E2913F; Wed, 24 Aug 2016 22:23:28 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id E931729000 for ; Wed, 24 Aug 2016 22:23:27 +0000 (UTC) Received: from localhost ([::1]:53603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcgZz-00027K-4p for patchwork-qemu-devel@patchwork.kernel.org; Wed, 24 Aug 2016 18:23:27 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52942) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcgVE-0006rQ-0M for qemu-devel@nongnu.org; Wed, 24 Aug 2016 18:18:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bcgUy-0004Js-U4 for qemu-devel@nongnu.org; Wed, 24 Aug 2016 18:18:31 -0400 Received: from out2-smtp.messagingengine.com ([66.111.4.26]:53995) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bcgUw-0004FE-5K for qemu-devel@nongnu.org; Wed, 24 Aug 2016 18:18:16 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id C3A272042E; Wed, 24 Aug 2016 18:18:04 -0400 (EDT) Received: from frontend2 ([10.202.2.161]) by compute1.internal (MEProxy); Wed, 24 Aug 2016 18:18:05 -0400 DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=braap.org; h=cc :date:from:in-reply-to:message-id:references:subject:to :x-sasl-enc:x-sasl-enc; s=mesmtp; bh=gDOOQEVvJl1FpArAwBTGSvgSub0 =; b=AVrsZeEavvIDizhAcOBr5ZCnPGHdvQRwnvTMuZIcVEQxVRK/6wN+1ngziJM BAOey5HxpThalsRJ/aHoRjE9rvTPRUqYnWW7hogu8C8XoSsmv6HGIo2Y+pIUA1IF kfoyGrZcxbI14RMwFskDgVcvSXwv+dtlhw5hNgV28RLUm1lY= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-sasl-enc:x-sasl-enc; s=smtpout; bh=gDOO QEVvJl1FpArAwBTGSvgSub0=; b=sjBJk5so32dk1GXPHmYKVjToGGIyefGJmaEd EXQR1D0zyDCw1b7rIAX+PbTNcerJ9YybP/ALmkG+wPpu+uxjL75wjb3ToO0w9FgU jqF1g91EmofAZ3ifwhSEcknO3kEfYIOnDb5sYFzrlQaMfGryR2YWS7VALhqk+qH7 teueQ2o= X-Sasl-enc: P7z6CIDHUGdqjmBFOHxbSj8oAo9YEjXQGvrJNPyLvbFT 1472077084 Received: from localhost (flamenco.cs.columbia.edu [128.59.20.216]) by mail.messagingengine.com (Postfix) with ESMTPA id 82CD6CCE7C; Wed, 24 Aug 2016 18:18:04 -0400 (EDT) From: "Emilio G. Cota" To: Richard Henderson Date: Wed, 24 Aug 2016 18:17:59 -0400 Message-Id: <1472077083-15022-4-git-send-email-cota@braap.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1472077083-15022-1-git-send-email-cota@braap.org> References: <20160824211240.GA26546@flamenco> <1472077083-15022-1-git-send-email-cota@braap.org> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.111.4.26 Subject: [Qemu-devel] [PATCH 4/8] target-arm: helper fixup for paired atomics 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: mttcg@greensocs.com, peter.maydell@linaro.org, claudio.fontana@huawei.com, nikunj@linux.vnet.ibm.com, crosthwaite.peter@gmail.com, jan.kiszka@siemens.com, mark.burton@greensocs.com, a.rigo@virtualopensystems.com, qemu-devel@nongnu.org, serge.fdrv@gmail.com, pbonzini@redhat.com, bobby.prani@gmail.com, alex.bennee@linaro.org, dgilbert@redhat.com, fred.konrad@greensocs.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Emilio G. Cota --- target-arm/helper-a64.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c index 8ce518b..6f3fd17 100644 --- a/target-arm/helper-a64.c +++ b/target-arm/helper-a64.c @@ -453,7 +453,7 @@ uint64_t HELPER(crc32c_64)(uint64_t acc, uint64_t val, uint32_t bytes) uint64_t HELPER(paired_cmpxchg64_le)(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi) { -#ifndef CONFIG_USER_ONLY +#if !defined(CONFIG_USER_ONLY) || !defined(CONFIG_ATOMIC128) uintptr_t ra = GETPC(); #endif Int128 oldv, cmpv, newv; @@ -518,7 +518,7 @@ uint64_t HELPER(paired_cmpxchg64_le)(CPUARMState *env, uint64_t addr, uint64_t HELPER(paired_cmpxchg64_be)(CPUARMState *env, uint64_t addr, uint64_t new_lo, uint64_t new_hi) { -#ifndef CONFIG_USER_ONLY +#if !defined(CONFIG_USER_ONLY) || !defined(CONFIG_ATOMIC128) uintptr_t ra = GETPC(); #endif Int128 oldv, cmpv, newv;