From nobody Wed Oct 23 00:39:27 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1729439770; cv=none; d=zohomail.com; s=zohoarc; b=eqkXzYmQPIGaiPibXvnUArKSUhBt+0By+UsZ+Tgu7C9rBvsLe7MsMjxpgzhXOu31KA3gFCkmk6PtvXxP6DfKO00FDD/1gcHYsSJuY4QiUpRiiw9lhCQVx2tp4e5+yuAJ+h0Q9VbIWWdS3dODylHoYzrss3sr+Z++2hF5ud3xW1g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1729439770; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=Q/DAM2YNnB8TrYcYga96JVed5cRakVoAhw2Qa5TewE0=; b=W7fTk6nJqswioY5WYEYlvFiFCZHKriDZhh7gHrhGu8FxPN10vcdN/qyJa/8j5M4YSpCzyOqUnh3Oj3AbV2mz0jatlHcXp4CaJtm3lQJZ6bJxnVNyvWOgL41bxyKomipIbdOuaUFVbiKWYJYXz3VeUQHC5jgkEfiqZk8fDN8CnBk= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1729439770635424.21183457804375; Sun, 20 Oct 2024 08:56:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t2YG3-0003UF-F7; Sun, 20 Oct 2024 11:54:19 -0400 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 1t2YFh-0003NB-Bn for qemu-devel@nongnu.org; Sun, 20 Oct 2024 11:53:58 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t2YFf-0005Pt-JV for qemu-devel@nongnu.org; Sun, 20 Oct 2024 11:53:57 -0400 Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com [209.85.221.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-410-owuzonpVNGOX4IeaXInMrQ-1; Sun, 20 Oct 2024 11:53:45 -0400 Received: by mail-wr1-f72.google.com with SMTP id ffacd0b85a97d-37d531a19a9so1779741f8f.1 for ; Sun, 20 Oct 2024 08:53:45 -0700 (PDT) Received: from avogadro.local ([151.95.144.54]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a37b4dsm2006033f8f.18.2024.10.20.08.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 20 Oct 2024 08:53:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729439627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Q/DAM2YNnB8TrYcYga96JVed5cRakVoAhw2Qa5TewE0=; b=UrGKR9EHjCuC7HfmE+MDGXv3TX/BROtNR/4TPSptanNHD26Ke2wGNhLydONBz/C7X4PVvA ofjLFxISGcVeCojLFFPEFdYuoLldtZU/2XO6ATPJhYLJMEvtJunVsKi/DS96T38ar9wSEm h9C/w5SaYf9hcqDc1zq/BK70jRTEhAM= X-MC-Unique: owuzonpVNGOX4IeaXInMrQ-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729439624; x=1730044424; 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=Q/DAM2YNnB8TrYcYga96JVed5cRakVoAhw2Qa5TewE0=; b=QkjW9HCnqk9QmHhpj1SSCU4AcNlTb0W5pMtj8EpLzkImlkhVfgKlwnNAgU5d3F0XcZ PTKDAzJPgXm5C4ZmdYc6KRdhq5GQe/iP9V+Ma2q2yDhLsUNEf82RXyjQLFA339/6M3K4 asMlqAdYO1MDnm+FkvM+zePLYy9tD1NX3eN+gh3YORqLpXPp4sVPiLCjA8ki1HNxV8Z4 VOQbqFoQQVSzdtKbP/32NDKWrCv3uCKMgbXve2+XvN0/4PHe2aAk4fJb7cErNEgYnSex TqpFFqJBrSLsfgLMANI+c5Zm5be1eUCmLEu/UkcS6FvGMFTYpztWplvabJ1jKxJUxQpE GfeQ== X-Gm-Message-State: AOJu0YxR28fRdRgQPfxMd60c+NeAb9luzx0fOJnH8Q15aGWpxkPVrHDj iXuHpOAU9qgbwcSuSeZ5WpyhPpfjJMJjCANhiROJWSLutxyafeY+O0uVPevRDuEYbHLC7cz7eHZ iO9YBQBhKeMwA4pl3AINfuTI/xLsenWsG/Nuqj+q1LPwC1K7WIIYI8Z+xepN7vsge7E6KWrQkZD egy/PvRZ4vfb7G/G6rH6VdlfLUB4J9crA6cm6pc0s= X-Received: by 2002:a5d:4044:0:b0:37d:4e03:ff8e with SMTP id ffacd0b85a97d-37ea21a1f42mr6497353f8f.28.1729439623595; Sun, 20 Oct 2024 08:53:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGSlkimWyAf0WxuDWtQfYU+dvLUUA3DmGCQX6hsd1lRy/SMdmcu9yXDGPnGMcD7ebi5qQHnAQ== X-Received: by 2002:a5d:4044:0:b0:37d:4e03:ff8e with SMTP id ffacd0b85a97d-37ea21a1f42mr6497338f8f.28.1729439623070; Sun, 20 Oct 2024 08:53:43 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: richard.henderson@linaro.org Subject: [PATCH 05/14] target/i386: Introduce cc_op_size Date: Sun, 20 Oct 2024 17:53:15 +0200 Message-ID: <20241020155324.35273-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241020155324.35273-1-pbonzini@redhat.com> References: <20241020155324.35273-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.527, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1729439771106116600 Content-Type: text/plain; charset="utf-8" From: Richard Henderson Replace arithmetic on cc_op with a helper function. Assert that the op has a size and that it is valid for the configuration. Signed-off-by: Richard Henderson Link: https://lore.kernel.org/r/20240701025115.1265117-6-richard.henderson@= linaro.org Signed-off-by: Paolo Bonzini --- target/i386/cpu.h | 17 ++++++++++++++++- target/i386/tcg/translate.c | 17 +++++++---------- target/i386/tcg/emit.c.inc | 5 +++-- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index f292463c34a..51a0a463c3e 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -24,6 +24,7 @@ #include "cpu-qom.h" #include "kvm/hyperv-proto.h" #include "exec/cpu-defs.h" +#include "exec/memop.h" #include "hw/i386/topology.h" #include "qapi/qapi-types-common.h" #include "qemu/cpu-float.h" @@ -1283,7 +1284,9 @@ typedef enum { CC_OP_ADOX =3D 2, /* CC_SRC2 =3D O, CC_SRC =3D rest. */ CC_OP_ADCOX =3D 3, /* CC_DST =3D C, CC_SRC2 =3D O, CC_SRC =3D rest. = */ =20 - CC_OP_MULB, /* modify all flags, C, O =3D (CC_SRC !=3D 0) */ + /* Low 2 bits =3D MemOp constant for the size */ +#define CC_OP_FIRST_BWLQ CC_OP_MULB + CC_OP_MULB =3D 4, /* modify all flags, C, O =3D (CC_SRC !=3D 0) */ CC_OP_MULW, CC_OP_MULL, CC_OP_MULQ, @@ -1353,6 +1356,7 @@ typedef enum { CC_OP_POPCNTL__, CC_OP_POPCNTQ__, CC_OP_POPCNT =3D sizeof(target_ulong) =3D=3D 8 ? CC_OP_POPCNTQ__ : CC_= OP_POPCNTL__, +#define CC_OP_LAST_BWLQ CC_OP_POPCNTQ__ =20 CC_OP_DYNAMIC, /* must use dynamic code to get cc_op */ CC_OP_NB, @@ -1361,6 +1365,17 @@ typedef enum { /* See X86DecodedInsn.cc_op, using int8_t. */ QEMU_BUILD_BUG_ON(CC_OP_DYNAMIC > INT8_MAX); =20 +static inline MemOp cc_op_size(CCOp op) +{ + MemOp size =3D op & 3; + + QEMU_BUILD_BUG_ON(CC_OP_FIRST_BWLQ & 3); + assert(op >=3D CC_OP_FIRST_BWLQ && op <=3D CC_OP_LAST_BWLQ); + assert(size <=3D MO_TL); + + return size; +} + typedef struct SegmentCache { uint32_t selector; target_ulong base; diff --git a/target/i386/tcg/translate.c b/target/i386/tcg/translate.c index a20fbb019c8..46062002c02 100644 --- a/target/i386/tcg/translate.c +++ b/target/i386/tcg/translate.c @@ -885,7 +885,7 @@ static CCPrepare gen_prepare_eflags_c(DisasContext *s, = TCGv reg) =20 case CC_OP_ADDB ... CC_OP_ADDQ: /* (DATA_TYPE)CC_DST < (DATA_TYPE)CC_SRC */ - size =3D s->cc_op - CC_OP_ADDB; + size =3D cc_op_size(s->cc_op); tcg_gen_ext_tl(cpu_cc_dst, cpu_cc_dst, size); tcg_gen_ext_tl(cpu_cc_src, cpu_cc_src, size); return (CCPrepare) { .cond =3D TCG_COND_LTU, .reg =3D cpu_cc_dst, @@ -902,7 +902,7 @@ static CCPrepare gen_prepare_eflags_c(DisasContext *s, = TCGv reg) =20 case CC_OP_SHLB ... CC_OP_SHLQ: /* (CC_SRC >> (DATA_BITS - 1)) & 1 */ - size =3D s->cc_op - CC_OP_SHLB; + size =3D cc_op_size(s->cc_op); return gen_prepare_sign_nz(cpu_cc_src, size); =20 case CC_OP_MULB ... CC_OP_MULQ: @@ -910,11 +910,11 @@ static CCPrepare gen_prepare_eflags_c(DisasContext *s= , TCGv reg) .reg =3D cpu_cc_src }; =20 case CC_OP_BMILGB ... CC_OP_BMILGQ: - size =3D s->cc_op - CC_OP_BMILGB; + size =3D cc_op_size(s->cc_op); return gen_prepare_val_nz(cpu_cc_src, size, true); =20 case CC_OP_BLSIB ... CC_OP_BLSIQ: - size =3D s->cc_op - CC_OP_BLSIB; + size =3D cc_op_size(s->cc_op); return gen_prepare_val_nz(cpu_cc_src, size, false); =20 case CC_OP_ADCX: @@ -966,10 +966,7 @@ static CCPrepare gen_prepare_eflags_s(DisasContext *s,= TCGv reg) case CC_OP_POPCNT: return (CCPrepare) { .cond =3D TCG_COND_NEVER }; default: - { - MemOp size =3D (s->cc_op - CC_OP_ADDB) & 3; - return gen_prepare_sign_nz(cpu_cc_dst, size); - } + return gen_prepare_sign_nz(cpu_cc_dst, cc_op_size(s->cc_op)); } } =20 @@ -1007,7 +1004,7 @@ static CCPrepare gen_prepare_eflags_z(DisasContext *s= , TCGv reg) .imm =3D CC_Z }; default: { - MemOp size =3D (s->cc_op - CC_OP_ADDB) & 3; + MemOp size =3D cc_op_size(s->cc_op); return gen_prepare_val_nz(cpu_cc_dst, size, true); } } @@ -1028,7 +1025,7 @@ static CCPrepare gen_prepare_cc(DisasContext *s, int = b, TCGv reg) switch (s->cc_op) { case CC_OP_SUBB ... CC_OP_SUBQ: /* We optimize relational operators for the cmp/jcc case. */ - size =3D s->cc_op - CC_OP_SUBB; + size =3D cc_op_size(s->cc_op); switch (jcc_op) { case JCC_BE: tcg_gen_ext_tl(s->cc_srcT, s->cc_srcT, size); diff --git a/target/i386/tcg/emit.c.inc b/target/i386/tcg/emit.c.inc index 790307dbba8..45ac5edb1ae 100644 --- a/target/i386/tcg/emit.c.inc +++ b/target/i386/tcg/emit.c.inc @@ -1466,7 +1466,7 @@ static void gen_bt_flags(DisasContext *s, X86DecodedI= nsn *decode, TCGv src, TCGv */ decode->cc_src =3D tcg_temp_new(); decode->cc_dst =3D cpu_cc_dst; - decode->cc_op =3D ((s->cc_op - CC_OP_MULB) & 3) + CC_OP_SARB; + decode->cc_op =3D CC_OP_SARB + cc_op_size(s->cc_op); tcg_gen_shr_tl(decode->cc_src, src, s->T1); } } @@ -3346,7 +3346,8 @@ static bool gen_eflags_adcox(DisasContext *s, X86Deco= dedInsn *decode, bool want_ * bit, we might as well fish CF out of EFLAGS and save a shift. */ if (want_carry && (!need_flags || s->cc_op =3D=3D CC_OP_SHLB + MO_= TL)) { - tcg_gen_shri_tl(decode->cc_dst, cpu_cc_src, (8 << (s->cc_op - = CC_OP_SHLB)) - 1); + MemOp size =3D cc_op_size(s->cc_op); + tcg_gen_shri_tl(decode->cc_dst, cpu_cc_src, (8 << size) - 1); got_cf =3D true; } gen_mov_eflags(s, decode->cc_src); --=20 2.46.2