target/i386: fix CC_OP dump

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: 4885c3c495 ("target-i386: Use ctpop helper", 2017-01-10)
Fixes: cc155f1971 ("target/i386: rewrite flags writeback for ADCX/ADOX", 2024-06-11)
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2024-06-20 19:46:07 +02:00
parent eb350d1d01
commit e36b976da4
1 changed files with 51 additions and 50 deletions

View File

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