Skip to content

Commit d3ddb93

Browse files
KanRobertKanRobert
committed
[X86] Fix typo about the internal name of instructions
64ri -> 64ri32
1 parent a22c8ef commit d3ddb93

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

‎llvm/lib/Target/X86/X86InstrArithmetic.td

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -455,7 +455,7 @@ multiclass ArithBinOp_RF<bits<8> BaseOpc, bits<8> BaseOpc2, bits<8> BaseOpc4,
455455
def NAME#8ri_NF_ND : BinOpRI_R<0x80, mnemonic, Xi8, RegMRM, 1>, EVEX_NF;
456456
def NAME#16ri_NF_ND : BinOpRI_R<0x81, mnemonic, Xi16, RegMRM, 1>, EVEX_NF, PD;
457457
def NAME#32ri_NF_ND : BinOpRI_R<0x81, mnemonic, Xi32, RegMRM, 1>, EVEX_NF;
458-
def NAME#64ri_NF_ND : BinOpRI_R<0x81, mnemonic, Xi64, RegMRM, 1>, EVEX_NF;
458+
def NAME#64ri32_NF_ND : BinOpRI_R<0x81, mnemonic, Xi64, RegMRM, 1>, EVEX_NF;
459459
}
460460
let Predicates = [In64BitMode] in {
461461
def NAME#16ri8_NF : BinOpRI8_R<0x83, mnemonic, Xi16, RegMRM>, NF, PD;
@@ -464,7 +464,7 @@ multiclass ArithBinOp_RF<bits<8> BaseOpc, bits<8> BaseOpc2, bits<8> BaseOpc4,
464464
def NAME#8ri_NF : BinOpRI_R<0x80, mnemonic, Xi8, RegMRM>, NF;
465465
def NAME#16ri_NF : BinOpRI_R<0x81, mnemonic, Xi16, RegMRM>, NF, PD;
466466
def NAME#32ri_NF : BinOpRI_R<0x81, mnemonic, Xi32, RegMRM>, NF;
467-
def NAME#64ri_NF : BinOpRI_R<0x81, mnemonic, Xi64, RegMRM>, NF;
467+
def NAME#64ri32_NF : BinOpRI_R<0x81, mnemonic, Xi64, RegMRM>, NF;
468468
def NAME#16ri8_EVEX : BinOpRI8_RF<0x83, mnemonic, Xi16, RegMRM>, PL, PD;
469469
def NAME#32ri8_EVEX : BinOpRI8_RF<0x83, mnemonic, Xi32, RegMRM>, PL;
470470
def NAME#64ri8_EVEX : BinOpRI8_RF<0x83, mnemonic, Xi64, RegMRM>, PL;

‎llvm/test/TableGen/x86-fold-tables.inc

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ static const X86FoldTableEntry Table2Addr[] = {
3232
{X86::ADD32rr, X86::ADD32mr, TB_NO_REVERSE},
3333
{X86::ADD32rr_NF, X86::ADD32mr_NF, TB_NO_REVERSE},
3434
{X86::ADD64ri32, X86::ADD64mi32, TB_NO_REVERSE},
35+
{X86::ADD64ri32_NF, X86::ADD64mi32_NF, TB_NO_REVERSE},
3536
{X86::ADD64ri8, X86::ADD64mi8, TB_NO_REVERSE},
3637
{X86::ADD64ri8_NF, X86::ADD64mi8_NF, TB_NO_REVERSE},
37-
{X86::ADD64ri_NF, X86::ADD64mi32_NF, TB_NO_REVERSE},
3838
{X86::ADD64rr, X86::ADD64mr, TB_NO_REVERSE},
3939
{X86::ADD64rr_NF, X86::ADD64mr_NF, TB_NO_REVERSE},
4040
{X86::ADD8ri, X86::ADD8mi, TB_NO_REVERSE},
@@ -55,9 +55,9 @@ static const X86FoldTableEntry Table2Addr[] = {
5555
{X86::AND32rr, X86::AND32mr, TB_NO_REVERSE},
5656
{X86::AND32rr_NF, X86::AND32mr_NF, TB_NO_REVERSE},
5757
{X86::AND64ri32, X86::AND64mi32, TB_NO_REVERSE},
58+
{X86::AND64ri32_NF, X86::AND64mi32_NF, TB_NO_REVERSE},
5859
{X86::AND64ri8, X86::AND64mi8, TB_NO_REVERSE},
5960
{X86::AND64ri8_NF, X86::AND64mi8_NF, TB_NO_REVERSE},
60-
{X86::AND64ri_NF, X86::AND64mi32_NF, TB_NO_REVERSE},
6161
{X86::AND64rr, X86::AND64mr, TB_NO_REVERSE},
6262
{X86::AND64rr_NF, X86::AND64mr_NF, TB_NO_REVERSE},
6363
{X86::AND8ri, X86::AND8mi, TB_NO_REVERSE},
@@ -107,9 +107,9 @@ static const X86FoldTableEntry Table2Addr[] = {
107107
{X86::OR32rr, X86::OR32mr, TB_NO_REVERSE},
108108
{X86::OR32rr_NF, X86::OR32mr_NF, TB_NO_REVERSE},
109109
{X86::OR64ri32, X86::OR64mi32, TB_NO_REVERSE},
110+
{X86::OR64ri32_NF, X86::OR64mi32_NF, TB_NO_REVERSE},
110111
{X86::OR64ri8, X86::OR64mi8, TB_NO_REVERSE},
111112
{X86::OR64ri8_NF, X86::OR64mi8_NF, TB_NO_REVERSE},
112-
{X86::OR64ri_NF, X86::OR64mi32_NF, TB_NO_REVERSE},
113113
{X86::OR64rr, X86::OR64mr, TB_NO_REVERSE},
114114
{X86::OR64rr_NF, X86::OR64mr_NF, TB_NO_REVERSE},
115115
{X86::OR8ri, X86::OR8mi, TB_NO_REVERSE},
@@ -238,9 +238,9 @@ static const X86FoldTableEntry Table2Addr[] = {
238238
{X86::SUB32rr, X86::SUB32mr, TB_NO_REVERSE},
239239
{X86::SUB32rr_NF, X86::SUB32mr_NF, TB_NO_REVERSE},
240240
{X86::SUB64ri32, X86::SUB64mi32, TB_NO_REVERSE},
241+
{X86::SUB64ri32_NF, X86::SUB64mi32_NF, TB_NO_REVERSE},
241242
{X86::SUB64ri8, X86::SUB64mi8, TB_NO_REVERSE},
242243
{X86::SUB64ri8_NF, X86::SUB64mi8_NF, TB_NO_REVERSE},
243-
{X86::SUB64ri_NF, X86::SUB64mi32_NF, TB_NO_REVERSE},
244244
{X86::SUB64rr, X86::SUB64mr, TB_NO_REVERSE},
245245
{X86::SUB64rr_NF, X86::SUB64mr_NF, TB_NO_REVERSE},
246246
{X86::SUB8ri, X86::SUB8mi, TB_NO_REVERSE},
@@ -261,9 +261,9 @@ static const X86FoldTableEntry Table2Addr[] = {
261261
{X86::XOR32rr, X86::XOR32mr, TB_NO_REVERSE},
262262
{X86::XOR32rr_NF, X86::XOR32mr_NF, TB_NO_REVERSE},
263263
{X86::XOR64ri32, X86::XOR64mi32, TB_NO_REVERSE},
264+
{X86::XOR64ri32_NF, X86::XOR64mi32_NF, TB_NO_REVERSE},
264265
{X86::XOR64ri8, X86::XOR64mi8, TB_NO_REVERSE},
265266
{X86::XOR64ri8_NF, X86::XOR64mi8_NF, TB_NO_REVERSE},
266-
{X86::XOR64ri_NF, X86::XOR64mi32_NF, TB_NO_REVERSE},
267267
{X86::XOR64rr, X86::XOR64mr, TB_NO_REVERSE},
268268
{X86::XOR64rr_NF, X86::XOR64mr_NF, TB_NO_REVERSE},
269269
{X86::XOR8ri, X86::XOR8mi, TB_NO_REVERSE},
@@ -491,9 +491,9 @@ static const X86FoldTableEntry Table1[] = {
491491
{X86::ADD32rr_ND, X86::ADD32mr_ND, 0},
492492
{X86::ADD32rr_NF_ND, X86::ADD32mr_NF_ND, 0},
493493
{X86::ADD64ri32_ND, X86::ADD64mi32_ND, 0},
494+
{X86::ADD64ri32_NF_ND, X86::ADD64mi32_NF_ND, 0},
494495
{X86::ADD64ri8_ND, X86::ADD64mi8_ND, 0},
495496
{X86::ADD64ri8_NF_ND, X86::ADD64mi8_NF_ND, 0},
496-
{X86::ADD64ri_NF_ND, X86::ADD64mi32_NF_ND, 0},
497497
{X86::ADD64rr_ND, X86::ADD64mr_ND, 0},
498498
{X86::ADD64rr_NF_ND, X86::ADD64mr_NF_ND, 0},
499499
{X86::ADD8ri_ND, X86::ADD8mi_ND, 0},
@@ -515,9 +515,9 @@ static const X86FoldTableEntry Table1[] = {
515515
{X86::AND32rr_ND, X86::AND32mr_ND, 0},
516516
{X86::AND32rr_NF_ND, X86::AND32mr_NF_ND, 0},
517517
{X86::AND64ri32_ND, X86::AND64mi32_ND, 0},
518+
{X86::AND64ri32_NF_ND, X86::AND64mi32_NF_ND, 0},
518519
{X86::AND64ri8_ND, X86::AND64mi8_ND, 0},
519520
{X86::AND64ri8_NF_ND, X86::AND64mi8_NF_ND, 0},
520-
{X86::AND64ri_NF_ND, X86::AND64mi32_NF_ND, 0},
521521
{X86::AND64rr_ND, X86::AND64mr_ND, 0},
522522
{X86::AND64rr_NF_ND, X86::AND64mr_NF_ND, 0},
523523
{X86::AND8ri_ND, X86::AND8mi_ND, 0},
@@ -694,9 +694,9 @@ static const X86FoldTableEntry Table1[] = {
694694
{X86::OR32rr_ND, X86::OR32mr_ND, 0},
695695
{X86::OR32rr_NF_ND, X86::OR32mr_NF_ND, 0},
696696
{X86::OR64ri32_ND, X86::OR64mi32_ND, 0},
697+
{X86::OR64ri32_NF_ND, X86::OR64mi32_NF_ND, 0},
697698
{X86::OR64ri8_ND, X86::OR64mi8_ND, 0},
698699
{X86::OR64ri8_NF_ND, X86::OR64mi8_NF_ND, 0},
699-
{X86::OR64ri_NF_ND, X86::OR64mi32_NF_ND, 0},
700700
{X86::OR64rr_ND, X86::OR64mr_ND, 0},
701701
{X86::OR64rr_NF_ND, X86::OR64mr_NF_ND, 0},
702702
{X86::OR8ri_ND, X86::OR8mi_ND, 0},
@@ -789,9 +789,9 @@ static const X86FoldTableEntry Table1[] = {
789789
{X86::SUB32rr_ND, X86::SUB32mr_ND, 0},
790790
{X86::SUB32rr_NF_ND, X86::SUB32mr_NF_ND, 0},
791791
{X86::SUB64ri32_ND, X86::SUB64mi32_ND, 0},
792+
{X86::SUB64ri32_NF_ND, X86::SUB64mi32_NF_ND, 0},
792793
{X86::SUB64ri8_ND, X86::SUB64mi8_ND, 0},
793794
{X86::SUB64ri8_NF_ND, X86::SUB64mi8_NF_ND, 0},
794-
{X86::SUB64ri_NF_ND, X86::SUB64mi32_NF_ND, 0},
795795
{X86::SUB64rr_ND, X86::SUB64mr_ND, 0},
796796
{X86::SUB64rr_NF_ND, X86::SUB64mr_NF_ND, 0},
797797
{X86::SUB8ri_ND, X86::SUB8mi_ND, 0},
@@ -1508,9 +1508,9 @@ static const X86FoldTableEntry Table1[] = {
15081508
{X86::XOR32rr_ND, X86::XOR32mr_ND, 0},
15091509
{X86::XOR32rr_NF_ND, X86::XOR32mr_NF_ND, 0},
15101510
{X86::XOR64ri32_ND, X86::XOR64mi32_ND, 0},
1511+
{X86::XOR64ri32_NF_ND, X86::XOR64mi32_NF_ND, 0},
15111512
{X86::XOR64ri8_ND, X86::XOR64mi8_ND, 0},
15121513
{X86::XOR64ri8_NF_ND, X86::XOR64mi8_NF_ND, 0},
1513-
{X86::XOR64ri_NF_ND, X86::XOR64mi32_NF_ND, 0},
15141514
{X86::XOR64rr_ND, X86::XOR64mr_ND, 0},
15151515
{X86::XOR64rr_NF_ND, X86::XOR64mr_NF_ND, 0},
15161516
{X86::XOR8ri_ND, X86::XOR8mi_ND, 0},

0 commit comments

Comments
 (0)