From nobody Mon Feb 9 03:48:08 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=1767761598; cv=none; d=zohomail.com; s=zohoarc; b=A7bgXyPNinRoezfT8ftGUdFIZPUSFjYFceA3A50u6k/CA9ejzS0uDbTAA+RC2WYcoqOrWbEGJ7LL9JZz8xASdGgI1JBsBwlGqxUXc1cTvH3j9ucEG7RNPtRzO19RH2LQnOkoAXJhDR2eCqaFXI4TwuUSPuV/TaTvfh6iuHMo4cg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1767761598; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=L1ipOddK14ruNLkuMSUgqvjUQnelCDaxp1SObaYsrog=; b=frfTyHZyqVlhbWhPgwVduWKre/s1xwD3p/D6HWr2nktWl+lI/CMVV2bPiONvHi1GN8ecVTu7S7W6vVNZOifZkl6W85v9/+W5XdKjTkJS2f3TmI6P6D8Z0VELTiqCrM8dNhQE+htvhZTs95IPsPrP4DwfOTZXo6p59Kl1AgIMbFc= 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 1767761598227507.53662308436503; Tue, 6 Jan 2026 20:53:18 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1vdLXS-00073A-Mm; Tue, 06 Jan 2026 23:52:54 -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 1vdLXR-00072b-Tc for qemu-devel@nongnu.org; Tue, 06 Jan 2026 23:52:53 -0500 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 1vdLXQ-0005mb-A0 for qemu-devel@nongnu.org; Tue, 06 Jan 2026 23:52:53 -0500 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-246-fvbCa4KjNmiFn5uJuNSPQw-1; Tue, 06 Jan 2026 23:52:42 -0500 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-47d3ffa98fcso11855435e9.3 for ; Tue, 06 Jan 2026 20:52:42 -0800 (PST) Received: from [192.168.10.48] ([151.61.26.160]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-47d8660be14sm4098035e9.1.2026.01.06.20.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Jan 2026 20:52:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1767761567; 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; bh=L1ipOddK14ruNLkuMSUgqvjUQnelCDaxp1SObaYsrog=; b=WDFkZjnJHd65ueGalOvz/3kGeGVmott19ZdoY04NiZA0QIsmDziH1xyShRoOkvRfdkeXdT S4wwrnmWXcRW3nvnza7FozAiOsIXSbjVV4BjniIPGDvYIF+Sv+E+Pp/6SaEF/aHipXn1MH UVUzzGGTKUwdG/I2OKlKred1HhZ8Q60= X-MC-Unique: fvbCa4KjNmiFn5uJuNSPQw-1 X-Mimecast-MFC-AGG-ID: fvbCa4KjNmiFn5uJuNSPQw_1767761558 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1767761557; x=1768366357; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=L1ipOddK14ruNLkuMSUgqvjUQnelCDaxp1SObaYsrog=; b=ckXSmJVGC1Lz2w/VfqRjuUMGHl3HXil+hxnnqwjIHCAvKb3Cn+g+/nIDfkT5+7CJUA qj0sPvYVaTbYkB4cBM1vSGreSE/Bvj66bzD25GMnDAa6UrfBDmJTfhb01aVHD6ZFIahM 9MZ3vt2MVBa5hkrd9b3MgS4pGgATv+Yzbd2MiUwgI2YPCLKAQnIOY5mP4ej3ZLyqrELZ 6dzBQE+/Y92YXDx9KdlWFO+Dg9Y9lfdbwdHCxmFH6n5xjSZiq1E1Pqyt/+mwpyLyNC6g W/2bGpV0HfIpWxfzqAlWAiVA5ylMy82ZkDHbe6Q3HwiTz0Fc4iBQoWRr0oWlYO1zQ+7n 3PEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1767761557; x=1768366357; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=L1ipOddK14ruNLkuMSUgqvjUQnelCDaxp1SObaYsrog=; b=NoyNAF5q3jYZ16kqJddi6XkX0Tn80VuTGrgJeWzm1LDLBYUhkoVFn+L3kCEQQo5kog 9p6zoLwmWw7xw76O2dypm1cHqF3T9xBRg5zKdJFOQrSwiiz6emlTApXRUXk+DXTUC1h8 7mioakRZT5ZMWvYr+nIHYaO3Y5scm0PEMuFvO0Q4/rpin6ddTwG9knAYAbGRNROM6BLa NVoC+Yla5Osn1nKoE1w4qqbQdycq9FEdsXyujPwTVU4FnN4H9q6KK2mEpeE5OdhPeEbJ kHaEdMh+4jhZKblTIfupFM+x2nWSqWlxfMFDsGtQWdOgqMSZRJsO+RRPJV+qQS+n8LXB +ncw== X-Gm-Message-State: AOJu0YxInQbf6zBQR+3FZc1AZixXoyIKyIet1J3+UZqmNCL53mgBol0J b8Pm+QJEZvv91jF+dJECE4TwkiHAq0uoZbBofbK204v5MQ4FziAKrrf75wwj9svufw5k1A+3VoK vioitnNP1F89J0rjcHpibxDjMp9vlTxn229/WQ3Xew9FFsyw3SzZbkhH1L3B+HGldAL16ApTE6f PVTktQWzDN0IipdAEvKk5QbRNAtJ5fg/a9ahMbBn9y X-Gm-Gg: AY/fxX4BtZ7S54vmZiJ2DxpfThtum3kRrKRDpBGkDKGSaExOolPeeHzNTMTHq338WVG cSstJb6sVGfhJsvkR2ngcVCVHhajiXCdqwnom4IsBjuF8j4q4G+XXegi0Uv0pr0l17C6BzO3uKy 3rFcIgg/OD+E9EUYDVIKY1H15XXhPN3BxHhp11NSxW/rcbOsBrvH2MRd/mzQqBgmn8rPRgarT7U eYUVBYaZ0OG/9msJ/mf2bWldDJGuInCPGrKBYMWoxAxjIV8l/yjc3yP59p6WW/OWC3IH3l+8I1o sCcErsR6Sbjue2QXi0/K+b/90Vg7Yxd2cHOuDRpPKRCPGUo1MUTpdM85rzzdYoNYq4oLuoB1p13 lInHJhDOVvvhKW8vAbkJ8J9zeTvMODTg3SKq9ACqTTjrPtd2qyjFkFxlvug0Hv1jwtkgJPgW0NR wtWwZZOlmeYUxqYg== X-Received: by 2002:a05:600c:8484:b0:47a:8cce:2940 with SMTP id 5b1f17b1804b1-47d84b1a095mr9112355e9.14.1767761557276; Tue, 06 Jan 2026 20:52:37 -0800 (PST) X-Google-Smtp-Source: AGHT+IGA0YCZevNqMudE++7YosyBxCLX27FBuA1uI5YmIgQFml6gvnYIK+jJmp6jGVDtpSWHSGLQXg== X-Received: by 2002:a05:600c:8484:b0:47a:8cce:2940 with SMTP id 5b1f17b1804b1-47d84b1a095mr9112185e9.14.1767761556691; Tue, 06 Jan 2026 20:52:36 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: Mark Cave-Ayland Subject: [PATCH] target/i386/tcg: do not leave non-arithmetic flags in CC_SRC after PUSHF Date: Wed, 7 Jan 2026 05:52:35 +0100 Message-ID: <20260107045235.94348-1-pbonzini@redhat.com> X-Mailer: git-send-email 2.52.0 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 (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: -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_H3=0.001, RCVD_IN_MSPIKE_WL=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: 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: 1767761601423158500 Content-Type: text/plain; charset="utf-8" The value that is pushed by PUSHF is the full EFLAGS, while CC_OP_EFLAGS only wants arithmetic flags in CC_SRC. To avoid this, follow what other helpers to and set CC_SRC/CC_OP directly in helper_read_eflags. This is basically free and fixes an issue booting Windows 3.11. Reported-by: Mark Cave-Ayland Fixes: e661e2d7a37 ("target/i386/tcg: update cc_op after PUSHF", 2025-12-27) Signed-off-by: Paolo Bonzini Tested-by: Mark Cave-Ayland --- target/i386/tcg/cc_helper.c | 4 +++- target/i386/tcg/emit.c.inc | 3 +-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/target/i386/tcg/cc_helper.c b/target/i386/tcg/cc_helper.c index 91e492196af..6ddd64fcb07 100644 --- a/target/i386/tcg/cc_helper.c +++ b/target/i386/tcg/cc_helper.c @@ -414,7 +414,9 @@ target_ulong helper_read_eflags(CPUX86State *env) { uint32_t eflags; =20 - eflags =3D cpu_cc_compute_all(env); + CC_SRC =3D eflags =3D cpu_cc_compute_all(env); + CC_OP =3D CC_OP_EFLAGS; + eflags |=3D (env->df & DF_MASK); eflags |=3D env->eflags & ~(VM_MASK | RF_MASK); return eflags; diff --git a/target/i386/tcg/emit.c.inc b/target/i386/tcg/emit.c.inc index 0fde3d669d9..e55b65176fc 100644 --- a/target/i386/tcg/emit.c.inc +++ b/target/i386/tcg/emit.c.inc @@ -3253,8 +3253,7 @@ static void gen_PUSHF(DisasContext *s, X86DecodedInsn= *decode) gen_update_cc_op(s); gen_helper_read_eflags(s->T0, tcg_env); gen_push_v(s, s->T0); - decode->cc_src =3D s->T0; - decode->cc_op =3D CC_OP_EFLAGS; + assume_cc_op(s, CC_OP_EFLAGS); } =20 static MemOp gen_shift_count(DisasContext *s, X86DecodedInsn *decode, --=20 2.52.0