diff options
Diffstat (limited to 'llvm/lib/Target/X86/InstPrinter')
4 files changed, 28 insertions, 63 deletions
diff --git a/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp b/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp index 1e986f67a35..6bd00ee76ce 100644 --- a/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp +++ b/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.cpp @@ -100,7 +100,7 @@ bool X86ATTInstPrinter::printVecCompareInstr(const MCInst *MI, printVPCOMMnemonic(MI, OS); if ((Desc.TSFlags & X86II::FormMask) == X86II::MRMSrcMem) - printi128mem(MI, 2, OS); + printxmmwordmem(MI, 2, OS); else printOperand(MI, 2, OS); @@ -182,9 +182,9 @@ bool X86ATTInstPrinter::printVecCompareInstr(const MCInst *MI, // Broadcast form. // Load size is based on W-bit as only D and Q are supported. if (Desc.TSFlags & X86II::VEX_W) - printi64mem(MI, CurOp--, OS); + printqwordmem(MI, CurOp--, OS); else - printi32mem(MI, CurOp--, OS); + printdwordmem(MI, CurOp--, OS); // Print the number of elements broadcasted. unsigned NumElts; @@ -197,11 +197,11 @@ bool X86ATTInstPrinter::printVecCompareInstr(const MCInst *MI, OS << "{1to" << NumElts << "}"; } else { if (Desc.TSFlags & X86II::EVEX_L2) - printi512mem(MI, CurOp--, OS); + printzmmwordmem(MI, CurOp--, OS); else if (Desc.TSFlags & X86II::VEX_L) - printi256mem(MI, CurOp--, OS); + printymmwordmem(MI, CurOp--, OS); else - printi128mem(MI, CurOp--, OS); + printxmmwordmem(MI, CurOp--, OS); } } else { printOperand(MI, CurOp--, OS); diff --git a/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h b/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h index 1f6f38abffb..498a9d17b06 100644 --- a/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h +++ b/llvm/lib/Target/X86/InstPrinter/X86ATTInstPrinter.h @@ -53,43 +53,28 @@ public: printMemReference(MI, OpNo, O); } - void printi8mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printbytemem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { printMemReference(MI, OpNo, O); } - void printi16mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { printMemReference(MI, OpNo, O); } - void printi32mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printdwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { printMemReference(MI, OpNo, O); } - void printi64mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printqwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { printMemReference(MI, OpNo, O); } - void printi128mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printxmmwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { printMemReference(MI, OpNo, O); } - void printi256mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printymmwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { printMemReference(MI, OpNo, O); } - void printi512mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printzmmwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { printMemReference(MI, OpNo, O); } - void printf32mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - printMemReference(MI, OpNo, O); - } - void printf64mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - printMemReference(MI, OpNo, O); - } - void printf80mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - printMemReference(MI, OpNo, O); - } - void printf128mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - printMemReference(MI, OpNo, O); - } - void printf256mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - printMemReference(MI, OpNo, O); - } - void printf512mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printtbytemem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { printMemReference(MI, OpNo, O); } diff --git a/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp b/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp index d8edf90e4cc..a7a0e02ec5f 100644 --- a/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp +++ b/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.cpp @@ -84,7 +84,7 @@ bool X86IntelInstPrinter::printVecCompareInstr(const MCInst *MI, raw_ostream &OS printOperand(MI, 1, OS); OS << ", "; if ((Desc.TSFlags & X86II::FormMask) == X86II::MRMSrcMem) - printi128mem(MI, 2, OS); + printxmmwordmem(MI, 2, OS); else printOperand(MI, 2, OS); return true; @@ -172,9 +172,9 @@ bool X86IntelInstPrinter::printVecCompareInstr(const MCInst *MI, raw_ostream &OS // Broadcast form. // Load size is based on W-bit as only D and Q are supported. if (Desc.TSFlags & X86II::VEX_W) - printi64mem(MI, CurOp++, OS); + printqwordmem(MI, CurOp++, OS); else - printi32mem(MI, CurOp++, OS); + printdwordmem(MI, CurOp++, OS); // Print the number of elements broadcasted. unsigned NumElts; @@ -187,11 +187,11 @@ bool X86IntelInstPrinter::printVecCompareInstr(const MCInst *MI, raw_ostream &OS OS << "{1to" << NumElts << "}"; } else { if (Desc.TSFlags & X86II::EVEX_L2) - printi512mem(MI, CurOp++, OS); + printzmmwordmem(MI, CurOp++, OS); else if (Desc.TSFlags & X86II::VEX_L) - printi256mem(MI, CurOp++, OS); + printymmwordmem(MI, CurOp++, OS); else - printi128mem(MI, CurOp++, OS); + printxmmwordmem(MI, CurOp++, OS); } } else { printOperand(MI, CurOp++, OS); diff --git a/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.h b/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.h index 1496612685c..1227bafffd0 100644 --- a/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.h +++ b/llvm/lib/Target/X86/InstPrinter/X86IntelInstPrinter.h @@ -55,58 +55,38 @@ public: printMemReference(MI, OpNo, O); } - void printi8mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printbytemem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { O << "byte ptr "; printMemReference(MI, OpNo, O); } - void printi16mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { O << "word ptr "; printMemReference(MI, OpNo, O); } - void printi32mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printdwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { O << "dword ptr "; printMemReference(MI, OpNo, O); } - void printi64mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printqwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { O << "qword ptr "; printMemReference(MI, OpNo, O); } - void printi128mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printxmmwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { O << "xmmword ptr "; printMemReference(MI, OpNo, O); } - void printi256mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printymmwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { O << "ymmword ptr "; printMemReference(MI, OpNo, O); } - void printi512mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printzmmwordmem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { O << "zmmword ptr "; printMemReference(MI, OpNo, O); } - void printf32mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - O << "dword ptr "; - printMemReference(MI, OpNo, O); - } - void printf64mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - O << "qword ptr "; - printMemReference(MI, OpNo, O); - } - void printf80mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { + void printtbytemem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { O << "tbyte ptr "; printMemReference(MI, OpNo, O); } - void printf128mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - O << "xmmword ptr "; - printMemReference(MI, OpNo, O); - } - void printf256mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - O << "ymmword ptr "; - printMemReference(MI, OpNo, O); - } - void printf512mem(const MCInst *MI, unsigned OpNo, raw_ostream &O) { - O << "zmmword ptr "; - printMemReference(MI, OpNo, O); - } void printSrcIdx8(const MCInst *MI, unsigned OpNo, raw_ostream &O) { |
