From patchwork Sat Feb 4 16:33:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 650655 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp1446768pva; Sat, 4 Feb 2023 08:36:21 -0800 (PST) X-Google-Smtp-Source: AK7set+JRbZ1HxNYOHzOvyKbi82c1bgxH+Ds9HLm0ung/PVkFoj6rWVNokA+h2PCgpw0eenJqYK7 X-Received: by 2002:a05:6214:2a4d:b0:539:d8ce:57d5 with SMTP id jf13-20020a0562142a4d00b00539d8ce57d5mr31169551qvb.9.1675528581714; Sat, 04 Feb 2023 08:36:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675528581; cv=none; d=google.com; s=arc-20160816; b=DLHsnMvNbALiS9JIFVE2yAZh5KAweh88f6G4oNKAs0IrpXzXdpiIziLvPK+Lm7lHmL DTaYS+HnEFAp8WTR7RsouJ5E5QGJ6biCVVNU9kredJqqiGsqZqaKxaBjdeXN4puBkHOS 33XJ6STQ6GQkvMdDXw1WHspSnEysKaN0MYIAqzMSkMcZCqzVo3PqpgNvR+Eiu010BVXw uKNcVtWpTDsCjux3efEmL8uSdYF+XVYo08Dr63Kc9CwWt2pk7U5Pev7ver3iSJKw9kq9 klGNc84ZdvySw4oBS9gqlWum9RWOwLU5PvLTAWGitQtqAAQva7aJBUM93al8YgDZbjkf haDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=x14oGfCPbXFzwT0sz8fdoRC+6dXXFQJCDg5CcaWYsZ8=; b=eQH7ImQzukcBL3olRwV4caG9ike7ovoU4NxEYCDhbTLREVZYXB7lNfy0gSuyH9V2ss FP+Pu9adrvq3dee4b0KXQCIkYD6IlKD1JSZSCe7a7OBYKQXShV5d0JeAi2zzYQxsXmUT 9iWzDPeFFgR/t6xAvKNhu/PZVkUQqeT7243mannYnFP+YLPwJfGHxiORVbF6O3Btp1KU XWi1Uxyvng+t0i5mTSx3rESACU0eQYFL61UnjiEgIGbMrIWKAlUWxjR7pM/mYkHHLb9f 9yeQXsSGvIofbHHNKtAA91LsHnWFZlJbe+9BRZJd35Iu4fzNeKFSZeAKQGubpmYKdgnU MfJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cRoqfv4d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id 8-20020a0562140cc800b004c74b9fbc58si4715181qvx.448.2023.02.04.08.36.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 04 Feb 2023 08:36:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cRoqfv4d; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pOLUb-0005Rc-5G; Sat, 04 Feb 2023 11:34:21 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pOLUV-0005Oi-F8 for qemu-devel@nongnu.org; Sat, 04 Feb 2023 11:34:15 -0500 Received: from mail-pj1-x102b.google.com ([2607:f8b0:4864:20::102b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pOLUS-0002Ug-LT for qemu-devel@nongnu.org; Sat, 04 Feb 2023 11:34:14 -0500 Received: by mail-pj1-x102b.google.com with SMTP id l4-20020a17090a850400b0023013402671so11504563pjn.5 for ; Sat, 04 Feb 2023 08:34:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=x14oGfCPbXFzwT0sz8fdoRC+6dXXFQJCDg5CcaWYsZ8=; b=cRoqfv4d3hktL/0cg0eMfbEOu7WPxvC52PslVK0ymzvvzwNaB1kzaRPs+W9nTSGI0H 7hDJcPdSp/YUcAZPdc8XU3ckQsJINbBT5NDkMGpOWhYT726TwxH9JOVXMfN+cxzSZY1b +H/qWEwKjFDplgTxFe7ZWbBWB2d2a5KbyRwyggP/QtfWgyZVQlR6tj4K3QdDWlrBuxnC YTg4EOBxDNDPYWVZWPeHe+7w92gjcvCF79CM+FGP095on0hkbsZrDbor3YT2K8lcFQS/ IF3q90+e+cLYH+8F9VJz0RieXhPPINaMBuiDSixVkYZnUJYaqffHf1yzW8vHK7U8veNd eXBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=x14oGfCPbXFzwT0sz8fdoRC+6dXXFQJCDg5CcaWYsZ8=; b=ZHazP5cDl6Wxm6aD5/LNS8+KxOxMrq3UPS5X4vFm/oCGXaH263V7DSNB6k3l8CVa2e noEd7nf9vNoTqFgvMs9mLGJBNqbY447nYPeWA9dpaX7ZIa8WfAEnDTrK3elSpJA2PmKC bLKeFvnSXcOCii1ZnCBtMX2p98U77mczuRAQ7gNH5abOXPLFnOAXv+UbfM3UMgewwtee uQXLpXeBJ0zzUIN6ceRrYWazt0IKFyNQSiypd1i2yB3xtyG96T2kvMvVvI0sYrioxJPS Eneop/KtxvZDxeitDhr/nwmQpyYKXMGaBAUWYD8kYlPFuboR8yiJjhi7aqSH6kwB3qRn WWMQ== X-Gm-Message-State: AO0yUKVDXHF3IwGxpnPeqYD6m21KeZltB1L4exUL0+gfwVNoJzXMNPMR mdzYgJmE2PGvNNLjzkPObvqmYLGAqcHlxrgh X-Received: by 2002:a17:902:e550:b0:193:3845:de53 with SMTP id n16-20020a170902e55000b001933845de53mr17688120plf.39.1675528451582; Sat, 04 Feb 2023 08:34:11 -0800 (PST) Received: from stoup.. (rrcs-173-197-98-118.west.biz.rr.com. [173.197.98.118]) by smtp.gmail.com with ESMTPSA id w19-20020a1709029a9300b00186b69157ecsm3660859plp.202.2023.02.04.08.34.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Feb 2023 08:34:11 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PULL 37/40] target/i386: Split out gen_cmpxchg8b, gen_cmpxchg16b Date: Sat, 4 Feb 2023 06:33:07 -1000 Message-Id: <20230204163310.815536-38-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230204163310.815536-1-richard.henderson@linaro.org> References: <20230204163310.815536-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102b; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102b.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson --- target/i386/tcg/translate.c | 48 ++++++++++++++++++++++++------------- 1 file changed, 31 insertions(+), 17 deletions(-) diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index 7e0b2a709a..a82131d635 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -2993,6 +2993,34 @@ static void gen_sty_env_A0(DisasContext *s, int offset, bool align) #include "emit.c.inc" #include "decode-new.c.inc" +static void gen_cmpxchg8b(DisasContext *s, CPUX86State *env, int modrm) +{ + gen_lea_modrm(env, s, modrm); + + if ((s->prefix & PREFIX_LOCK) && + (tb_cflags(s->base.tb) & CF_PARALLEL)) { + gen_helper_cmpxchg8b(cpu_env, s->A0); + } else { + gen_helper_cmpxchg8b_unlocked(cpu_env, s->A0); + } + set_cc_op(s, CC_OP_EFLAGS); +} + +#ifdef TARGET_X86_64 +static void gen_cmpxchg16b(DisasContext *s, CPUX86State *env, int modrm) +{ + gen_lea_modrm(env, s, modrm); + + if ((s->prefix & PREFIX_LOCK) && + (tb_cflags(s->base.tb) & CF_PARALLEL)) { + gen_helper_cmpxchg16b(cpu_env, s->A0); + } else { + gen_helper_cmpxchg16b_unlocked(cpu_env, s->A0); + } + set_cc_op(s, CC_OP_EFLAGS); +} +#endif + /* convert one instruction. s->base.is_jmp is set if the translation must be stopped. Return the next pc value */ static bool disas_insn(DisasContext *s, CPUState *cpu) @@ -3844,28 +3872,14 @@ static bool disas_insn(DisasContext *s, CPUState *cpu) if (!(s->cpuid_ext_features & CPUID_EXT_CX16)) { goto illegal_op; } - gen_lea_modrm(env, s, modrm); - if ((s->prefix & PREFIX_LOCK) && - (tb_cflags(s->base.tb) & CF_PARALLEL)) { - gen_helper_cmpxchg16b(cpu_env, s->A0); - } else { - gen_helper_cmpxchg16b_unlocked(cpu_env, s->A0); - } - set_cc_op(s, CC_OP_EFLAGS); + gen_cmpxchg16b(s, env, modrm); break; } -#endif +#endif if (!(s->cpuid_features & CPUID_CX8)) { goto illegal_op; } - gen_lea_modrm(env, s, modrm); - if ((s->prefix & PREFIX_LOCK) && - (tb_cflags(s->base.tb) & CF_PARALLEL)) { - gen_helper_cmpxchg8b(cpu_env, s->A0); - } else { - gen_helper_cmpxchg8b_unlocked(cpu_env, s->A0); - } - set_cc_op(s, CC_OP_EFLAGS); + gen_cmpxchg8b(s, env, modrm); break; case 7: /* RDSEED */