From patchwork Mon Jan 30 21:48:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 648621 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp1395485pva; Mon, 30 Jan 2023 13:51:43 -0800 (PST) X-Google-Smtp-Source: AK7set/2IWI61FKLlrt5bvnKp6dzd6G8NAy66VvgGFtnYiX7jQN8nrXV9ubX1MFEkb9ObQgAj1vz X-Received: by 2002:a05:622a:178f:b0:3b8:5dfe:ef3 with SMTP id s15-20020a05622a178f00b003b85dfe0ef3mr11844584qtk.68.1675115503795; Mon, 30 Jan 2023 13:51:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675115503; cv=none; d=google.com; s=arc-20160816; b=lNfdJdi6eWdfBTSlPdJN5EX3TThXg3gNo86luQJI08utmtmCON3UyFMwD4lupUJgh6 H/uxhuIi6Eux5+RDRWCgZfOXvnBDDIHpcWC4yslJTEsghQo+XC8C3R1uLd6Xa18CsXUT +gCppL76HwPqYmdDNWI49DUi0qLYCDM4OQr21pslxWMcxSQyi6EfkwTNAyXxtEo1k/wh 2tcgyhbOYplxRKP747G/cMeNnTMRlND3nr/Xn6n3DGb3BDgSR+roUHf6S6pMu57zARh2 6mmxsMZmAuSxWZ3UUhvPqCx8PKZaLKmWPfVKN80HP4sWc6JSWYstooQKslxH+nkRGYEE obUA== 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=Yt/+yGRLrJr2VL9eRa3Q6MCLkfJ5dqY6Fx7Rie1jDnQmwNDHYfFlNTBYjDaMQHY5Nt /Gp3Qll0KmLEoJBwQjM3sM3W3slxJKo5NA6fMghQmVNMk7kWvJGQMkHKQm5GT3xjNVFm 7cYo74xkb/+Sf+0ME0cqtmAKUodL3vlwgcVG6j0IkPx6sIbKuSV9xEJX6t+WD4Y96lQv RCq3bmWjfl3Rr8mEWPI9593ILCh/KRr4MJ1fPLtG8mABRE7UTkB/K00rAX6cf6C21Pw/ vFmzBGz6aJlxRLJKIRvC+GvkpMhuFnHNDbLJtfXByxEAAdJ2aFav8v2QFIp/orIUqUx5 +TKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zI8Qpcsy; 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 e21-20020ac85995000000b003b8475ea228si3580060qte.691.2023.01.30.13.51.43 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 30 Jan 2023 13:51:43 -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=zI8Qpcsy; 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 1pMc2J-0003Jk-Pl; Mon, 30 Jan 2023 16:49:59 -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 1pMc26-0002q9-IJ for qemu-devel@nongnu.org; Mon, 30 Jan 2023 16:49:47 -0500 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pMc24-0005cc-U7 for qemu-devel@nongnu.org; Mon, 30 Jan 2023 16:49:46 -0500 Received: by mail-pj1-x1031.google.com with SMTP id rm7-20020a17090b3ec700b0022c05558d22so12468953pjb.5 for ; Mon, 30 Jan 2023 13:49:44 -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=zI8QpcsyBgSEN+XLJBZuEoVC6G2RGExDsM5M4NoBc+Has29f1BuJCPUExgpNxpzunr Nl7l/bkLYOnUSSIaZJV3aUfqf3KrzoES0yw4XbGqrKckNudus+ihZglaVl3JovujtgTY Z6vAMKZVZMpmk/yzcjzKCeKlAYJ/MF4o64BfTQmcGcUkw1KxuPCnYCD4gWbWN6NLzH4j 4Tcb+mSutilCszNDaGJ5eGUd6csMcVJQTNvNpJMZyibdMa+n6f4Y2/MYy/rYy23V5QiW S62rSusybXEaS3EKmuH7ozAPq/D73pAcHcpl+m7tpyBDqKmofQIpdb+ysJeNfNfZyOpV 1R4A== 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=BgyJck8jrQlPTB46OofL14IxNc1arXtolZpXb9r4OElcEw+G2O4gsf8YIRHS+k6ySZ UyFd3GZ+rUKbG5rEvhUentDvut0nFMc6cGNwyc4HvjQSKRvoK/U3IrxRJb5zdfW9A++A zOiOi/p6mOgxAcL3HgA7hbUKcBYYz9g0ON2pWRPo2iy2LFEf+TeyZkN0bg6D7IBB7qFh Mu6lhC1oDHDkM66PY6TY6FOGlc0xeNTqyUWbcykx1r/soCnFm62Zqu0IlmqNiAIEqc06 B4dmPALa/cMR5hhSx7ngu/OdDYF0Btmt0+8DaSVhqnRcZXm0pp6/s1ILgdt+2IZ0U+Ai BEFA== X-Gm-Message-State: AO0yUKVWChCIkYTtx2wQxvj2meceY75B3Blc6ULfR4mxMxyx9tpEk5JA bRyTkC1xsf/pRNUxFBRBwv+6lwzkv5FLSASs X-Received: by 2002:a05:6a21:3384:b0:bc:caea:6cb8 with SMTP id yy4-20020a056a21338400b000bccaea6cb8mr9553760pzb.8.1675115384115; Mon, 30 Jan 2023 13:49:44 -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 t4-20020a17090ad14400b00219220edf0dsm7451215pjw.48.2023.01.30.13.49.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Jan 2023 13:49:43 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Cc: alex.bennee@linaro.org, philmd@linaro.org Subject: [PATCH v6 34/36] target/i386: Split out gen_cmpxchg8b, gen_cmpxchg16b Date: Mon, 30 Jan 2023 11:48:42 -1000 Message-Id: <20230130214844.1158612-35-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230130214844.1158612-1-richard.henderson@linaro.org> References: <20230130214844.1158612-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::1031; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x1031.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 */