From patchwork Fri Oct 19 06:06:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 149233 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp2912198lji; Thu, 18 Oct 2018 23:18:53 -0700 (PDT) X-Google-Smtp-Source: ACcGV62ZukR4Zae7mTTBjDZryMYmSoeHPl3b2BADc+8JZtaJKlFnr/k/yJv7AHfLLjqg55X390dv X-Received: by 2002:ae9:eb05:: with SMTP id b5-v6mr31423406qkg.127.1539929932789; Thu, 18 Oct 2018 23:18:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539929932; cv=none; d=google.com; s=arc-20160816; b=V4eJFaeL7hs5XMFi71N01/ghRhenpOUkz3FF1+BTOKnhP1Sqvh2EQrD6QhJYc6zFkz Tci4n7kwImPtExr2OOuX2Dzp1OdvtY+/ODPtEI0iP9FpHkdE/FnTKo6zYNXilROd95ul wO7/pR++PnP+z1s8XJ4jzLRiMUY8VH9qI6tFHUhfhfGWQNAQOKUg/rCS+0TNudQKd3IB vclPcXcA5jHBQxbUrxCUCeBiJxQpnM0Ui5F7mLxfvkU6dVsMzfWI9s/do0Sc/hA2d8Dj wzyVz51AVedCheZBaKF/tIfAWZFwXQWvS5Krz8EnMhyC81/uxcYoeZCl7IegtqUjvyWq snzg== 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:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=DB1b/fVktprVB9+vgwXapy40A76LQaCwLNLh795KUCE=; b=W1/3nPU/2HsPSHnNCTB0PLsW0xqhsjxCq29tmm237JKzjYekUE0bAAIBRxngzacqmZ glSs5g22ZAyN9QPiPqN049tbMNKVwuBnM03vKSiL6lpe/XAvU67HGpfuhNYvHMJ4eBAr jVp7aZJcxv/RXzpbL1qPScOZh4Ey6mZEOjBSFEDahPc5gH38r0zqxRRSTY32UAd8U+bE Nj1itOFXJXgOnntnhznzSrlbLmheGsDRlOUEgC24O/s0/+DWbDR/Yf4gw4eIu85jLxzU EX90aO02JaXuCbLGu1ruoAWy5fFPnALo6ldXvRirIJJO09hpFROenN8qxqWZMakAP26c j1NQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OfgkD7u7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b1-v6si3688640qke.230.2018.10.18.23.18.52 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 18 Oct 2018 23:18:52 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=OfgkD7u7; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 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 ([::1]:47275 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDO7Y-0006BM-8b for patch@linaro.org; Fri, 19 Oct 2018 02:18:52 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gDNwh-0004S5-CH for qemu-devel@nongnu.org; Fri, 19 Oct 2018 02:07:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gDNwf-0002mW-QO for qemu-devel@nongnu.org; Fri, 19 Oct 2018 02:07:39 -0400 Received: from mail-pg1-x532.google.com ([2607:f8b0:4864:20::532]:43674) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gDNwf-0002Bk-8F for qemu-devel@nongnu.org; Fri, 19 Oct 2018 02:07:37 -0400 Received: by mail-pg1-x532.google.com with SMTP id d8-v6so4085700pgv.10 for ; Thu, 18 Oct 2018 23:07:17 -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:in-reply-to:references :mime-version:content-transfer-encoding; bh=DB1b/fVktprVB9+vgwXapy40A76LQaCwLNLh795KUCE=; b=OfgkD7u7gg5rsmQEdFKdvOWhuaXQ6kCZPVdYEkth/JaSCUtV9UQHH48eXl9yXnIPTz qiGoHYfuFrKKC6MlHOkiFJzxoFjweKp86LfhJ8i0fOKlsOCqAgd4aM3zzRgAU8F5sfTY iATv++L6re3bAnB4/S+3AeWmKZGVxYbtcUqJc= 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=DB1b/fVktprVB9+vgwXapy40A76LQaCwLNLh795KUCE=; b=Gz0WptPgBvRHLt+FlnEd3yiTdcWaN9LFB6sYYTUbTDl+92D7bWmIsAXeGPrL/GVLof oKgL7jxNk3rFssHb8ZZU+yd/7wPy2W1VpUo9m3hvynS5KYCiiJh3k4b+ahlDo4hvNObg dhtS3IcuuLok0Pn+mCYqbbHGOfb/HS/8K9BxX8aoeKDCHSzdzgMpoJqCp/qpElYVGzmS gvcGQN6xvs7nv8NpAWqGnRIA5tfaEMiGP3K/2JKyYB9XyDXzrURB9G9Xw8uQNhfsSG3x FgNauATXWhMgDYRWBdjcsjhAzd7jduznxnyOGXbCCMtY9O3mvgcftApMuzhpJBTXHBCw RdHg== X-Gm-Message-State: ABuFfogp4p84X17m5x8/kHSuQDP3BY4nlSE/NG9jSRt3vyBy/wv4hxll XCVtcrM7oLPPof58cYmSgItyiZiVY4Q= X-Received: by 2002:a63:6ec4:: with SMTP id j187-v6mr31673988pgc.3.1539929236302; Thu, 18 Oct 2018 23:07:16 -0700 (PDT) Received: from cloudburst.twiddle.net (174-21-9-133.tukw.qwest.net. [174.21.9.133]) by smtp.gmail.com with ESMTPSA id q24-v6sm25609327pff.83.2018.10.18.23.07.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Oct 2018 23:07:15 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 23:06:48 -0700 Message-Id: <20181019060656.7968-14-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20181019060656.7968-1-richard.henderson@linaro.org> References: <20181019060656.7968-1-richard.henderson@linaro.org> 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::532 Subject: [Qemu-devel] [PULL v2 13/21] target/i386: Convert to HAVE_CMPXCHG128 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Emilio G. Cota Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/i386/mem_helper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.17.2 diff --git a/target/i386/mem_helper.c b/target/i386/mem_helper.c index 30c26b9d9c..6cc53bcb40 100644 --- a/target/i386/mem_helper.c +++ b/target/i386/mem_helper.c @@ -23,6 +23,7 @@ #include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "qemu/int128.h" +#include "qemu/atomic128.h" #include "tcg.h" void helper_cmpxchg8b_unlocked(CPUX86State *env, target_ulong a0) @@ -137,10 +138,7 @@ void helper_cmpxchg16b(CPUX86State *env, target_ulong a0) if ((a0 & 0xf) != 0) { raise_exception_ra(env, EXCP0D_GPF, ra); - } else { -#ifndef CONFIG_ATOMIC128 - cpu_loop_exit_atomic(ENV_GET_CPU(env), ra); -#else + } else if (HAVE_CMPXCHG128) { int eflags = cpu_cc_compute_all(env, CC_OP); Int128 cmpv = int128_make128(env->regs[R_EAX], env->regs[R_EDX]); @@ -159,7 +157,8 @@ void helper_cmpxchg16b(CPUX86State *env, target_ulong a0) eflags &= ~CC_Z; } CC_SRC = eflags; -#endif + } else { + cpu_loop_exit_atomic(ENV_GET_CPU(env), ra); } } #endif