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",
2024-06-11)
Signed-off-by: Paolo Bonzini <pbonz...@redhat.com>
---
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 */
static const char *cc_op_str[CC_OP_NB] = {
- "DYNAMIC",
- "EFLAGS",
+ [CC_OP_DYNAMIC] = "DYNAMIC",
- "MULB",
- "MULW",
- "MULL",
- "MULQ",
+ [CC_OP_EFLAGS] = "EFLAGS",
+ [CC_OP_ADCX] = "ADCX",
+ [CC_OP_ADOX] = "ADOX",
+ [CC_OP_ADCOX] = "ADCOX",
- "ADDB",
- "ADDW",
- "ADDL",
- "ADDQ",
+ [CC_OP_MULB] = "MULB",
+ [CC_OP_MULW] = "MULW",
+ [CC_OP_MULL] = "MULL",
+ [CC_OP_MULQ] = "MULQ",
- "ADCB",
- "ADCW",
- "ADCL",
- "ADCQ",
+ [CC_OP_ADDB] = "ADDB",
+ [CC_OP_ADDW] = "ADDW",
+ [CC_OP_ADDL] = "ADDL",
+ [CC_OP_ADDQ] = "ADDQ",
- "SUBB",
- "SUBW",
- "SUBL",
- "SUBQ",
+ [CC_OP_ADCB] = "ADCB",
+ [CC_OP_ADCW] = "ADCW",
+ [CC_OP_ADCL] = "ADCL",
+ [CC_OP_ADCQ] = "ADCQ",
- "SBBB",
- "SBBW",
- "SBBL",
- "SBBQ",
+ [CC_OP_SUBB] = "SUBB",
+ [CC_OP_SUBW] = "SUBW",
+ [CC_OP_SUBL] = "SUBL",
+ [CC_OP_SUBQ] = "SUBQ",
- "LOGICB",
- "LOGICW",
- "LOGICL",
- "LOGICQ",
+ [CC_OP_SBBB] = "SBBB",
+ [CC_OP_SBBW] = "SBBW",
+ [CC_OP_SBBL] = "SBBL",
+ [CC_OP_SBBQ] = "SBBQ",
- "INCB",
- "INCW",
- "INCL",
- "INCQ",
+ [CC_OP_LOGICB] = "LOGICB",
+ [CC_OP_LOGICW] = "LOGICW",
+ [CC_OP_LOGICL] = "LOGICL",
+ [CC_OP_LOGICQ] = "LOGICQ",
- "DECB",
- "DECW",
- "DECL",
- "DECQ",
+ [CC_OP_INCB] = "INCB",
+ [CC_OP_INCW] = "INCW",
+ [CC_OP_INCL] = "INCL",
+ [CC_OP_INCQ] = "INCQ",
- "SHLB",
- "SHLW",
- "SHLL",
- "SHLQ",
+ [CC_OP_DECB] = "DECB",
+ [CC_OP_DECW] = "DECW",
+ [CC_OP_DECL] = "DECL",
+ [CC_OP_DECQ] = "DECQ",
- "SARB",
- "SARW",
- "SARL",
- "SARQ",
+ [CC_OP_SHLB] = "SHLB",
+ [CC_OP_SHLW] = "SHLW",
+ [CC_OP_SHLL] = "SHLL",
+ [CC_OP_SHLQ] = "SHLQ",
- "BMILGB",
- "BMILGW",
- "BMILGL",
- "BMILGQ",
+ [CC_OP_SARB] = "SARB",
+ [CC_OP_SARW] = "SARW",
+ [CC_OP_SARL] = "SARL",
+ [CC_OP_SARQ] = "SARQ",
- "ADCX",
- "ADOX",
- "ADCOX",
+ [CC_OP_BMILGB] = "BMILGB",
+ [CC_OP_BMILGW] = "BMILGW",
+ [CC_OP_BMILGL] = "BMILGL",
+ [CC_OP_BMILGQ] = "BMILGQ",
- "CLR",
+ [CC_OP_POPCNT] = "POPCNT",
+ [CC_OP_CLR] = "CLR",
};
static void
--
2.45.2
