From nobody Thu Sep 19 01:51:57 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=1719595977; cv=none; d=zohomail.com; s=zohoarc; b=hMfpjGwfSMOzTt9kVA5tUzgKTRKADlT0OeIiGYYne7FMgAv/cazcrID81U0b9aduU3vge8GAWV+e1eP2/oEo2h8coazU8dmI2h5ed6KeYRmd2Q9bdfwZXS5MCMGCjb9lRwRKbJG7J5nbLWr5Xw6nKgDAzCSGp2oUtxDcU9YhlnE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719595977; h=Content-Type:Content-Transfer-Encoding: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:Cc; bh=UpEB8RKh0nHTTV4SYs2ZNSxWI14Dka7ndAM1DOHLcLk=; b=G4VRRx9Kv5z9hY7HJ4FrT0VbOmu6QwidGBIdUTEDqOcpJZckkCLtNaw9iD2gkhyLgkgNMGCXAANT3Aq+4tL32RjAmQEDMKgQN1nw9SXXhvEiDIUui/E+t4aMY5/m7RNl6PpUw9EXEUvRAEqLkTozOPy9U1Uu5H7/UuIaCnv25Vw= 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 1719595977589129.30153847833503; Fri, 28 Jun 2024 10:32:57 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sNFPn-0005gj-Il; Fri, 28 Jun 2024 13:29:39 -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 1sNFPj-0005fk-S8 for qemu-devel@nongnu.org; Fri, 28 Jun 2024 13:29:35 -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 1sNFPh-0002EI-H5 for qemu-devel@nongnu.org; Fri, 28 Jun 2024 13:29:35 -0400 Received: from mail-ej1-f71.google.com (mail-ej1-f71.google.com [209.85.218.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-212-MpRZnYQRM4-QctaTEvycrg-1; Fri, 28 Jun 2024 13:29:31 -0400 Received: by mail-ej1-f71.google.com with SMTP id a640c23a62f3a-a71e1625bdbso59775566b.2 for ; Fri, 28 Jun 2024 10:29:30 -0700 (PDT) Received: from avogadro.local ([151.62.196.71]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a72ab0b56e6sm95334766b.202.2024.06.28.10.29.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 28 Jun 2024 10:29:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719595772; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UpEB8RKh0nHTTV4SYs2ZNSxWI14Dka7ndAM1DOHLcLk=; b=FTmNe3ldfizufMmFLJ11LcU8T5I/vsmh7N4YGiCPyIMFUTYcxoZB5GWkKyI+ZPtHzLE7bl /epYgufu0h3LjQ9CUkP4dyDxbfjqBrrOY7fI7xL5oar0cmT+Ppw7Mc9MYzzzKAeeM4yzC8 jR0BjrXCBzTHhguUM8OxPbBqqGtFbTQ= X-MC-Unique: MpRZnYQRM4-QctaTEvycrg-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719595769; x=1720200569; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=UpEB8RKh0nHTTV4SYs2ZNSxWI14Dka7ndAM1DOHLcLk=; b=W6+yhi4Wtfpo5p8lmjcJazelqSPyQsrOE9jZUmAWE5wIj5gMX1fxNEbqy5Qk95rdHV kcNJj05E/PoCUlq0DDTSyZMcbcjtCpyj3CFcfzD8tV7YWS6GwMX7CZqnXzH6qdUGtzkj 9riAiK4jnFX2jTGnc3uqdSi5f+wbMMz87C5f4sPC0IspnOrKg4G8sVUgupTQTtvfwUqr WT3n/ImTa1nKjG/wL95NNbTPqcIx+o8sg+KhvlxiG9NHOPkfxFgrAAd20IYGqmi2tTz1 BMwRZhfBQSA/6KAHBTI/zZYHtpj15HFLwpOYFoO1GbemoKbpep71Ul8iwv/J2qn/SIt+ 2wvA== X-Gm-Message-State: AOJu0YzhpT8u/YQSW4H+V01ugVCucpSxXbALWZBEUfJ75SBTV90pXsK6 kUxUW+zbuUJ0DDQdkQcdJj1MlwPmKvSfFMkmwxsb2hEqpGJwN8tbEfmHmDC+X07SGrdhwFb96Fj wabgSWiYjRKgvzQyJuL/edyx9qi4gZepB3RUrI3igbV/SZG2tcws64bPeVNquRspHDkKo8OCA2a OO1gw4w/mt98KTgZDjFOo2CgSedF3HrlCngmyw X-Received: by 2002:a17:907:198e:b0:a72:61f7:7a0d with SMTP id a640c23a62f3a-a727f8be53emr800809266b.54.1719595769713; Fri, 28 Jun 2024 10:29:29 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH0JhrTZXB5izSnjD0HY+jrEQJ3UHY6VbGMku7iSaWt+7eViISqg2e2qruSIDsTvhGPt0slcw== X-Received: by 2002:a17:907:198e:b0:a72:61f7:7a0d with SMTP id a640c23a62f3a-a727f8be53emr800806766b.54.1719595769203; Fri, 28 Jun 2024 10:29:29 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PULL 14/23] target/i386: fix CC_OP dump Date: Fri, 28 Jun 2024 19:28:46 +0200 Message-ID: <20240628172855.1147598-15-pbonzini@redhat.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240628172855.1147598-1-pbonzini@redhat.com> References: <20240628172855.1147598-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: -22 X-Spam_score: -2.3 X-Spam_bar: -- X-Spam_report: (-2.3 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.206, 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_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, UPPERCASE_50_75=0.008 autolearn=no 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: 1719595978799100003 Content-Type: text/plain; charset="utf-8" POPCNT was missing, and the entries were all out of order after ADCX/ADOX/ADCOX were moved close to EFLAGS. Just use designated initializers. Fixes: 4885c3c4953 ("target-i386: Use ctpop helper", 2017-01-10) Fixes: cc155f19717 ("target/i386: rewrite flags writeback for ADCX/ADOX", 2= 024-06-11) Signed-off-by: Paolo Bonzini --- target/i386/cpu-dump.c | 101 +++++++++++++++++++++-------------------- 1 file changed, 51 insertions(+), 50 deletions(-) diff --git a/target/i386/cpu-dump.c b/target/i386/cpu-dump.c index 40697064d92..3bb8e440916 100644 --- a/target/i386/cpu-dump.c +++ b/target/i386/cpu-dump.c @@ -28,69 +28,70 @@ /* x86 debug */ =20 static const char *cc_op_str[CC_OP_NB] =3D { - "DYNAMIC", - "EFLAGS", + [CC_OP_DYNAMIC] =3D "DYNAMIC", =20 - "MULB", - "MULW", - "MULL", - "MULQ", + [CC_OP_EFLAGS] =3D "EFLAGS", + [CC_OP_ADCX] =3D "ADCX", + [CC_OP_ADOX] =3D "ADOX", + [CC_OP_ADCOX] =3D "ADCOX", =20 - "ADDB", - "ADDW", - "ADDL", - "ADDQ", + [CC_OP_MULB] =3D "MULB", + [CC_OP_MULW] =3D "MULW", + [CC_OP_MULL] =3D "MULL", + [CC_OP_MULQ] =3D "MULQ", =20 - "ADCB", - "ADCW", - "ADCL", - "ADCQ", + [CC_OP_ADDB] =3D "ADDB", + [CC_OP_ADDW] =3D "ADDW", + [CC_OP_ADDL] =3D "ADDL", + [CC_OP_ADDQ] =3D "ADDQ", =20 - "SUBB", - "SUBW", - "SUBL", - "SUBQ", + [CC_OP_ADCB] =3D "ADCB", + [CC_OP_ADCW] =3D "ADCW", + [CC_OP_ADCL] =3D "ADCL", + [CC_OP_ADCQ] =3D "ADCQ", =20 - "SBBB", - "SBBW", - "SBBL", - "SBBQ", + [CC_OP_SUBB] =3D "SUBB", + [CC_OP_SUBW] =3D "SUBW", + [CC_OP_SUBL] =3D "SUBL", + [CC_OP_SUBQ] =3D "SUBQ", =20 - "LOGICB", - "LOGICW", - "LOGICL", - "LOGICQ", + [CC_OP_SBBB] =3D "SBBB", + [CC_OP_SBBW] =3D "SBBW", + [CC_OP_SBBL] =3D "SBBL", + [CC_OP_SBBQ] =3D "SBBQ", =20 - "INCB", - "INCW", - "INCL", - "INCQ", + [CC_OP_LOGICB] =3D "LOGICB", + [CC_OP_LOGICW] =3D "LOGICW", + [CC_OP_LOGICL] =3D "LOGICL", + [CC_OP_LOGICQ] =3D "LOGICQ", =20 - "DECB", - "DECW", - "DECL", - "DECQ", + [CC_OP_INCB] =3D "INCB", + [CC_OP_INCW] =3D "INCW", + [CC_OP_INCL] =3D "INCL", + [CC_OP_INCQ] =3D "INCQ", =20 - "SHLB", - "SHLW", - "SHLL", - "SHLQ", + [CC_OP_DECB] =3D "DECB", + [CC_OP_DECW] =3D "DECW", + [CC_OP_DECL] =3D "DECL", + [CC_OP_DECQ] =3D "DECQ", =20 - "SARB", - "SARW", - "SARL", - "SARQ", + [CC_OP_SHLB] =3D "SHLB", + [CC_OP_SHLW] =3D "SHLW", + [CC_OP_SHLL] =3D "SHLL", + [CC_OP_SHLQ] =3D "SHLQ", =20 - "BMILGB", - "BMILGW", - "BMILGL", - "BMILGQ", + [CC_OP_SARB] =3D "SARB", + [CC_OP_SARW] =3D "SARW", + [CC_OP_SARL] =3D "SARL", + [CC_OP_SARQ] =3D "SARQ", =20 - "ADCX", - "ADOX", - "ADCOX", + [CC_OP_BMILGB] =3D "BMILGB", + [CC_OP_BMILGW] =3D "BMILGW", + [CC_OP_BMILGL] =3D "BMILGL", + [CC_OP_BMILGQ] =3D "BMILGQ", =20 - "CLR", + [CC_OP_POPCNT] =3D "POPCNT", + [CC_OP_CLR] =3D "CLR", }; =20 static void --=20 2.45.2