From patchwork Tue Aug 21 14:27:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 144734 Delivered-To: patch@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp5365370ljj; Tue, 21 Aug 2018 07:45:23 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZk02tFJSvQTniF25/elfzP+YrZDOJghgfnmOFyRrtXINlkeZu7Cgu2XESzp0JTsweZ6mLV X-Received: by 2002:a37:6292:: with SMTP id w140-v6mr9365661qkb.258.1534862723337; Tue, 21 Aug 2018 07:45:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1534862723; cv=none; d=google.com; s=arc-20160816; b=fXfrjoZxPk16r4DgjGh++JOpEHlNITdabxc0JxfagrvZQ7l+gwQSq2cTwWU1piDQ60 CPIc1tK3RDxaD24nnQdEi+OqdcEzLKUnTHR4DY8/pKQPGJYEwZYThooQVqD7yxI4yAnE Tr4EAQur7Spx8Tdcv0whR6rEWqYEnL4p+RzL50EO/kUV/CkIiheFo2MK/yuFgRDYw/D0 UW7M3j/t4L5geS2SFx9PLq1MwdLgKnSVK1MZ31e+706ZXIFDzvnDmLo8YXGfw4alJhUG JRBmNENQBuhmvZPzMycDcLPFKvSCqwchOzcqb1xf0WknDNenTa3TX+aNNxE2O4KQWnUX 00nQ== 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:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=Kw70vJmJvvdMa1ZmP7qQjISsq1++nuywnW3iYLCkFuE=; b=VQtvHGwVN7/5jfUSiu4v/9Avp/DvGjoAWAxqygz85aNfpKGr/epTU2iHgTalwe+n8T fNrbdLEmn89AB1I+wYooBX5R2bzKTZFYeIDi8VYQHRobZX/civMNjVMFYMkef4H90pZ8 sdzFreFLD8NW3hYVVb3cxxZphsBgKFKCKKA8nU8gi9o1qY8lqnlN8pyRLYnG9pl9yZl6 iR83sGxgoR8j3G/7Aha7VtRzAbjV6QQtCDoBmZQQZ3gtUUIPoi11AQM5K8xUsfW6RUDV 8DAD3t3OcTxV1ChVu22ikj3749tQZgFjLUWCoVJCr/D/tu6SoQA7vkrcvmvSRJXG9Uju JnJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=a8mpnedI; 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 u34-v6si1071384qtb.176.2018.08.21.07.45.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 21 Aug 2018 07:45:23 -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=a8mpnedI; 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]:54055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs7uM-0007vU-Ou for patch@linaro.org; Tue, 21 Aug 2018 10:45:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50991) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fs7cm-0003Rt-6c for qemu-devel@nongnu.org; Tue, 21 Aug 2018 10:27:18 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fs7cl-0000bd-88 for qemu-devel@nongnu.org; Tue, 21 Aug 2018 10:27:12 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]:45085) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fs7ck-0000b4-Vt for qemu-devel@nongnu.org; Tue, 21 Aug 2018 10:27:11 -0400 Received: by mail-pf1-x433.google.com with SMTP id i26-v6so8575748pfo.12 for ; Tue, 21 Aug 2018 07:27:10 -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; bh=Kw70vJmJvvdMa1ZmP7qQjISsq1++nuywnW3iYLCkFuE=; b=a8mpnedIYzhJlaWp97J+tSpfp4+asdJlRLVviL3mh1Ao9BYjr88dV/TepHJtk/8Hf4 /hEEHrFSpDVkrV/MarJphpkNZMuH+sRv0Ii87BMbLCBaKQpGdjNIeH0Nz2KRbvVz0x7v Zb4ZBlpGJcJftLaDxrq5XqEXsx01DwelnlniQ= 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=Kw70vJmJvvdMa1ZmP7qQjISsq1++nuywnW3iYLCkFuE=; b=W++oSR8lmvNRJ3JpENoSpEWSlhBRLEhmVePjCzEi25Grly+bxC/oGxWq6b8xmMYtWu Nu6ZAaA9iRPsrfHOaxaJICejrtCjv/NN57xJFz0o8iss0i1JC8JPkmKi+ysFp6zagHAg bJdtMZrsvYpTSSZZJ5egHMKtsThDJSFwDv2FWNo1NQG0ofaEyRfiNQlUp4Y/29+1IEqw Nq4ksJyGo6fsUYjJr3NIUXYzNGulXdbag0q/XAkblgHD19AAHitKjDJozRD0MDhwrPSn HBsEDCBGtLU/C9Gbdw82K9KMW6jQ61xjn8u3+7CFBx4qhmJ9WZG7mJaysZe+2Ajolwa3 r3EA== X-Gm-Message-State: AOUpUlEUP5UzsJk/tGjmOG/JoSMp8uz/WnUXS/5OaFkxI0BtRTHvGXjF h6RavFKlGXFB1JnwRdLnxsUYE6TNN1o= X-Received: by 2002:a63:f309:: with SMTP id l9-v6mr46486566pgh.369.1534861629479; Tue, 21 Aug 2018 07:27:09 -0700 (PDT) Received: from cloudburst.twiddle.net (97-113-8-179.tukw.qwest.net. [97.113.8.179]) by smtp.gmail.com with ESMTPSA id p5-v6sm16576984pfn.57.2018.08.21.07.27.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 21 Aug 2018 07:27:08 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 07:27:01 -0700 Message-Id: <20180821142704.18783-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180821142704.18783-1-richard.henderson@linaro.org> References: <20180821142704.18783-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::433 Subject: [Qemu-devel] [PATCH v2 2/5] 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: pbonzini@redhat.com, cota@braap.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Reviewed-by: Emilio G. Cota Signed-off-by: Richard Henderson --- target/i386/mem_helper.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) -- 2.17.1 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