[PULL,v2,13/21] target/i386: Convert to HAVE_CMPXCHG128

Message ID	20181019060656.7968-14-richard.henderson@linaro.org
State	Accepted
Commit	e1ed709fbe687b1c92b31014b0ecfcd059252ec1
Headers	show Delivered-To: patch@linaro.org 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; From: Richard Henderson <richard.henderson@linaro.org> To: qemu-devel@nongnu.org Date: Thu, 18 Oct 2018 23:06:48 -0700 Message-Id: <20181019060656.7968-14-richard.henderson@linaro.org> In-Reply-To: <20181019060656.7968-1-richard.henderson@linaro.org> References: <20181019060656.7968-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL v2 13/21] target/i386: Convert to HAVE_CMPXCHG128 Precedence: list Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	tcg patch queue \| expand [PULL,v2,00/21] tcg patch queue [PULL,v2,01/21] tcg: Implement CPU_LOG_TB_NOCHAIN during expansion [PULL,v2,02/21] tcg: access cpu->icount_decr.u16.high with atomics [PULL,v2,03/21] tcg: fix use of uninitialized variable under CONFIG_PROFILER [PULL,v2,04/21] tcg: plug holes in struct TCGProfile [PULL,v2,05/21] tcg: distribute tcg_time into TCG contexts [PULL,v2,06/21] target/alpha: remove tlb_flush from alpha_cpu_initfn [PULL,v2,07/21] target/unicore32: remove tlb_flush from uc32_init_fn [PULL,v2,08/21] exec: introduce tlb_init [PULL,v2,09/21] cputlb: fix assert_cpu_is_self macro [PULL,v2,10/21] cputlb: serialize tlb updates with env->tlb_lock [PULL,v2,11/21] tcg: Add tlb_index and tlb_entry helpers [PULL,v2,12/21] tcg: Split CONFIG_ATOMIC128 [PULL,v2,13/21] target/i386: Convert to HAVE_CMPXCHG128 [PULL,v2,14/21] target/arm: Convert to HAVE_CMPXCHG128 [PULL,v2,15/21] target/arm: Check HAVE_CMPXCHG128 at translate time [PULL,v2,16/21] target/ppc: Convert to HAVE_CMPXCHG128 and HAVE_ATOMIC128 [PULL,v2,17/21] target/s390x: Convert to HAVE_CMPXCHG128 and HAVE_ATOMIC128 [PULL,v2,18/21] target/s390x: Split do_cdsg, do_lpq, do_stpq [PULL,v2,19/21] target/s390x: Skip wout, cout helpers if op helper does not return [PULL,v2,20/21] target/s390x: Check HAVE_ATOMIC128 and HAVE_CMPXCHG128 at translate [PULL,v2,21/21] cputlb: read CPUTLBEntry.addr_write atomically

Message ID

20181019060656.7968-14-richard.henderson@linaro.org

State

Accepted

Commit

e1ed709fbe687b1c92b31014b0ecfcd059252ec1

Headers

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; 
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Date: Thu, 18 Oct 2018 23:06:48 -0700
Message-Id: <20181019060656.7968-14-richard.henderson@linaro.org>
In-Reply-To: <20181019060656.7968-1-richard.henderson@linaro.org>
References: <20181019060656.7968-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL v2 13/21] target/i386: Convert to HAVE_CMPXCHG128
Precedence: list
Cc: peter.maydell@linaro.org
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

tcg patch queue | expand

Commit Message

Richard Henderson Oct. 19, 2018, 6:06 a.m. UTC

Reviewed-by: Emilio G. Cota <cota@braap.org>

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>

---
 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

[PULL,v2,13/21] target/i386: Convert to HAVE_CMPXCHG128

Commit Message

Patch