From nobody Sat Jan 31 20:40:19 2026 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=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1769506916; cv=none; d=zohomail.com; s=zohoarc; b=S7i9mwi82Tf9/xmIUVb0tOXcek1etMduiOIiX1JmSQQiypcJdMNU/pWue/kUci4kXgVIv/smLxkS9EvCNmFU66wVRN5zFKtktLuTJYbQnEc3tmyynxc1oQL7Jca6msaHFmaf7TZdcAfhax02kXrssVJuqdQy84yTg1AgaXs0fwk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1769506916; 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=ri0PpFxdGtvnr5kIAuaORUQH3My73OqYc8urlNvvvtw=; b=lIMh3zAjsZ+C1Br6Ju+kVHEIAM6OkQkR+JPW6j7NXFnaSKeFknYYPiIPcUuzceJqbiZG6dgkbehJSc/2Km+rWc15PQmqcIBeO0W43xQVRJQYi0eXp/+wtHoARkCy0FqBhqISAdbO9vjfwkS3+XahFNl/vpg2BTqILdqJ1T/DXp8= 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=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1769506916563602.6980165009404; Tue, 27 Jan 2026 01:41:56 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vkfXx-0000oo-3M; Tue, 27 Jan 2026 04:39:41 -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 1vkfXs-0000iv-Vp for qemu-devel@nongnu.org; Tue, 27 Jan 2026 04:39:38 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1vkfXr-0008Vj-1E for qemu-devel@nongnu.org; Tue, 27 Jan 2026 04:39:36 -0500 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-441-OLTc_dB1PEaR7qcozXtwwQ-1; Tue, 27 Jan 2026 04:39:32 -0500 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-47edfdc6c1aso39622685e9.3 for ; Tue, 27 Jan 2026 01:39:32 -0800 (PST) Received: from [192.168.10.48] ([151.61.26.160]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48066bee7d0sm49719565e9.4.2026.01.27.01.39.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jan 2026 01:39:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1769506774; 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=ri0PpFxdGtvnr5kIAuaORUQH3My73OqYc8urlNvvvtw=; b=HjlR6X0wtg8cknHbxQRwdPpREgqgXzLlxF7poN0woAlm3ifS4dQrLREjkw4s9BFk397+P7 kHrjF4TGFc+BXYktdYcHoPzenR2hZfHN/W7GtCeop3AaG0W84bdk31EOBTuBNA0gfIDyUn Mn0kgQpLW/fylL4fytXQPuPtZeQo/DY= X-MC-Unique: OLTc_dB1PEaR7qcozXtwwQ-1 X-Mimecast-MFC-AGG-ID: OLTc_dB1PEaR7qcozXtwwQ_1769506772 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1769506771; x=1770111571; darn=nongnu.org; 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=ri0PpFxdGtvnr5kIAuaORUQH3My73OqYc8urlNvvvtw=; b=crnCvOPtGEtVz/SOtvWBmbfoVA70lCBrgUKwsdB45M7a8jx5pdsLyE2BKrfLql1gFk 7yGIezh4T3c/FQxDohHpv86TkukKRCR3apnMtn95w/wo/IRi1FVjexGvzuk1Oq/VdcYv 0UTC5CqeIWeA2aC8ztJbvW27/5eVJXDBJEBmjR4kSfsVcgYerx1svsVMVrvM/13s/20A SuIZ6cK3pXEdV/jPMPIKJNYLkRD5IsWfh+eIeSWCUuD9xGeSH1OqZkSDUY5im5dDOsOY u6/FkEnAtoo07aePC+k7eyyDjZsNxGZnX7Lj8sADU5XIZ06CgW0cTjMX8feY1hHEEPWp RRlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1769506771; x=1770111571; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=ri0PpFxdGtvnr5kIAuaORUQH3My73OqYc8urlNvvvtw=; b=hvJ0FsqbitzYv0aGqU9/8OE80wmOhtoX0TO4DoG1L+SEWyanTXIAg9sV9X/TQyCnhP aIAP6TSCu3YShpegL+lbl40xyXEiYDv7Vpthvk/sqeDXiC5D4qtac1vCfP1hceY3+cB6 aAzFPBH9Hq0eE/VXXBhee+uPHFx9NuirxH16D3AxyEhE2CuNfAUL4Qjtet3m/1pzNBIe w0m2oBGONNctktrxMJy78lv4joNb0+zasibwOVIc57fJxvdr+uH5O2NR56KYPQ77eFUI VcaAWEi9l/E3s+Zb4a6MQnfrfp194mEv9RGWkyhSEUtfA+W7xPpcfvDprDdnDin2mlxU dnKg== X-Gm-Message-State: AOJu0YzyYC9HNuG7EZ0GLkjZeEm8AnYc4n/vwfuA8MnH1+3rJM6rhjXi hgD/wuB8UKZ82Y9mP1ZUJ6g9W2t2TGjHz5ZPBVQtqY6CdAVf2D2lZst83VOsLu3LeRcsPveeHnH odGjcWvzbWOd69gMByYE8k/aRQKhkx+KhNWWSNBoU28OfLo09zBlt+UPtxAQjQxrUuyVd0LmFVM MeWqBBrpv8oOvi4Zvr+GmzoYUsYRq5cOrd5uAH1iAV X-Gm-Gg: AZuq6aIpvXH1b1opAc6vu9Jp0EAKJoP+XG0+Rk6KdzGSX2S0LBcvGkofHrMV9t6B78o B3zdtzAiq8RUApvyEN8GLw4aoec8Mdf6aJIzqjWbeLwO0Mt+0g8Q/ZWk70RPgFVGMqCQH5Iv6xj TovK+GMbEZKPKauYEfRMBC1YPz76+Y4dJdcBbqurqsXm/kMXODKKSJAGPjtDrZ4J7zSVW0pUfz1 ySy9VoSy3pKxN6Mv2c0cgv06UkhPaXxT4VaVkGMKWULu4baoH+yBgPnKQilT2yDVJWA796PxybX SRu5nIM5BvHRtj6gEdA0yB2aUDdfKMmqzD+K698ls4tMcXCBdqTEx2tnbS8wICuh/bDAQmrBYBA C8bEU0aUsbjoMAx8WKDw1itBQ6HnN9KYshl6idxg9QwflUD1QFIBKH7CA775omcylDB2OGzruJ8 dviCLHFluCSwoSDw== X-Received: by 2002:a05:600c:1c17:b0:480:462e:d640 with SMTP id 5b1f17b1804b1-48069c7f78cmr15505465e9.36.1769506771176; Tue, 27 Jan 2026 01:39:31 -0800 (PST) X-Received: by 2002:a05:600c:1c17:b0:480:462e:d640 with SMTP id 5b1f17b1804b1-48069c7f78cmr15505175e9.36.1769506770660; Tue, 27 Jan 2026 01:39:30 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Richard Henderson Subject: [PULL 10/13] target/i386/tcg: merge decode_modrm and decode_modrm_address split Date: Tue, 27 Jan 2026 10:39:03 +0100 Message-ID: <20260127093906.353741-11-pbonzini@redhat.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260127093906.353741-1-pbonzini@redhat.com> References: <20260127093906.353741-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.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, 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_H2=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-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: qemu development 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: 1769506919074158500 Content-Type: text/plain; charset="utf-8" Unlike the older code in translate.c, mod=3D11b *is* filtered out earlier by decode_modrm, and it would have returned bogus code. Since the register case is so simple, just inline decode_modrm_address into its caller instead of removing the "if". Reviewed-by: Richard Henderson Signed-off-by: Paolo Bonzini --- target/i386/tcg/decode-new.c.inc | 64 ++++++++++++-------------------- 1 file changed, 24 insertions(+), 40 deletions(-) diff --git a/target/i386/tcg/decode-new.c.inc b/target/i386/tcg/decode-new.= c.inc index b00ea3e86e8..662d1d707d0 100644 --- a/target/i386/tcg/decode-new.c.inc +++ b/target/i386/tcg/decode-new.c.inc @@ -2007,33 +2007,34 @@ static void decode_root(DisasContext *s, CPUX86Stat= e *env, X86OpEntry *entry, ui *entry =3D opcodes_root[*b]; } =20 -/* Decompose an address. */ -static AddressParts decode_modrm_address(CPUX86State *env, DisasContext *s, - int modrm, bool is_vsib) +/* Decode the MODRM and SIB bytes into a register or memory operand. */ +static void decode_modrm(DisasContext *s, CPUX86State *env, + X86DecodedInsn *decode, X86DecodedOp *op) { - int def_seg, base, index, scale, mod, rm; - target_long disp; - bool havesib; - - def_seg =3D R_DS; - index =3D -1; - scale =3D 0; - disp =3D 0; - - mod =3D (modrm >> 6) & 3; - rm =3D modrm & 7; - base =3D rm | REX_B(s); + int modrm =3D get_modrm(s, env); + int mod =3D (modrm >> 6) & 3; + int rm =3D modrm & 7; + bool is_vsib =3D decode->e.vex_class =3D=3D 12; + bool havesib =3D false; =20 if (mod =3D=3D 3) { - /* Normally filtered out earlier, but including this path - simplifies multi-byte nop, as well as bndcl, bndcu, bndcn. */ - goto done; + op->n =3D rm; + if (op->unit !=3D X86_OP_MMX) { + op->n |=3D REX_B(s); + } + return; } =20 + /* Decompose an address. */ + int def_seg =3D R_DS; + int base =3D rm | REX_B(s); + int index =3D -1; + int scale =3D 0; + target_ulong disp =3D 0; + switch (s->aflag) { case MO_64: case MO_32: - havesib =3D 0; if (rm =3D=3D 4) { int code =3D x86_ldub_code(env, s); scale =3D (code >> 6) & 3; @@ -2042,7 +2043,7 @@ static AddressParts decode_modrm_address(CPUX86State = *env, DisasContext *s, index =3D -1; /* no index */ } base =3D (code & 7) | REX_B(s); - havesib =3D 1; + havesib =3D true; } =20 switch (mod) { @@ -2127,26 +2128,9 @@ static AddressParts decode_modrm_address(CPUX86State= *env, DisasContext *s, g_assert_not_reached(); } =20 - done: - return (AddressParts){ def_seg, base, index, scale, disp }; -} - -static int decode_modrm(DisasContext *s, CPUX86State *env, - X86DecodedInsn *decode, X86DecodedOp *op) -{ - int modrm =3D get_modrm(s, env); - if ((modrm >> 6) =3D=3D 3) { - op->n =3D (modrm & 7); - if (op->unit !=3D X86_OP_MMX) { - op->n |=3D REX_B(s); - } - } else { - op->has_ea =3D true; - op->n =3D -1; - decode->mem =3D decode_modrm_address(env, s, get_modrm(s, env), - decode->e.vex_class =3D=3D 12); - } - return modrm; + op->has_ea =3D true; + op->n =3D -1; + decode->mem =3D (AddressParts){ def_seg, base, index, scale, disp }; } =20 static bool decode_op_size(DisasContext *s, X86OpEntry *e, X86OpSize size,= MemOp *ot) --=20 2.52.0