[llvm-commits] [llvm] r81710 - in /llvm/trunk/lib/Target/X86/AsmPrinter: X86ATTAsmPrinter.cpp X86ATTInstPrinter.cpp X86ATTInstPrinter.h X86IntelAsmPrinter.cpp X86IntelAsmPrinter.h
Chris Lattner
sabre at nondot.org
Sun Sep 13 13:15:17 PDT 2009
Author: lattner
Date: Sun Sep 13 15:15:16 2009
New Revision: 81710
URL: http://llvm.org/viewvc/llvm-project?rev=81710&view=rev
Log:
switch the x86 asmprinters to use getRegisterName instead
of getting it from TRI, inst printing now is codegen context
free!
Modified:
llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp?rev=81710&r1=81709&r2=81710&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTAsmPrinter.cpp Sun Sep 13 15:15:16 2009
@@ -48,7 +48,7 @@
//===----------------------------------------------------------------------===//
void X86ATTAsmPrinter::printMCInst(const MCInst *MI) {
- X86ATTInstPrinter(O, MAI, TRI).printInstruction(MI);
+ X86ATTInstPrinter(O, MAI).printInstruction(MI);
}
void X86ATTAsmPrinter::PrintPICBaseSymbol() const {
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp?rev=81710&r1=81709&r2=81710&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.cpp Sun Sep 13 15:15:16 2009
@@ -19,7 +19,6 @@
#include "llvm/MC/MCExpr.h"
#include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/FormattedStream.h"
-#include "llvm/Target/TargetRegisterInfo.h" // FIXME: REMOVE.
using namespace llvm;
// Include the auto-generated portion of the assembly writer.
@@ -70,7 +69,7 @@
const MCOperand &Op = MI->getOperand(OpNo);
if (Op.isReg()) {
- O << '%' << TRI->getAsmName(Op.getReg());
+ O << '%' << getRegisterName(Op.getReg());
return;
} else if (Op.isImm()) {
O << '$' << Op.getImm();
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h?rev=81710&r1=81709&r2=81710&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86ATTInstPrinter.h Sun Sep 13 15:15:16 2009
@@ -24,10 +24,8 @@
class X86ATTInstPrinter {
raw_ostream &O;
const MCAsmInfo *MAI;
- const TargetRegisterInfo *TRI; // FIXME: Elim.
public:
- X86ATTInstPrinter(raw_ostream &o, const MCAsmInfo *mai,
- const TargetRegisterInfo *tri) : O(o), MAI(mai), TRI(tri) {}
+ X86ATTInstPrinter(raw_ostream &o, const MCAsmInfo *mai) : O(o), MAI(mai) {}
// Autogenerated by tblgen.
void printInstruction(const MCInst *MI);
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp?rev=81710&r1=81709&r2=81710&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.cpp Sun Sep 13 15:15:16 2009
@@ -214,6 +214,11 @@
O << (char)toupper(RegName[i]);
}
+void X86IntelAsmPrinter::printOperand(const MachineInstr *MI, unsigned OpNo,
+ const char *Modifier) {
+ printOp(MI->getOperand(OpNo), Modifier);
+}
+
void X86IntelAsmPrinter::printOp(const MachineOperand &MO,
const char *Modifier) {
switch (MO.getType()) {
@@ -226,7 +231,7 @@
((strcmp(Modifier,"subreg16") == 0) ? MVT::i16 :MVT::i8));
Reg = getX86SubSuperRegister(Reg, VT);
}
- PrintRegName(O, TRI->getAsmName(Reg));
+ PrintRegName(O, getRegisterName(Reg));
return;
}
case MachineOperand::MO_Immediate:
@@ -399,7 +404,7 @@
break;
}
- PrintRegName(O, TRI->getAsmName(Reg));
+ PrintRegName(O, getRegisterName(Reg));
return false;
}
Modified: llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h?rev=81710&r1=81709&r2=81710&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h (original)
+++ llvm/trunk/lib/Target/X86/AsmPrinter/X86IntelAsmPrinter.h Sun Sep 13 15:15:16 2009
@@ -43,16 +43,7 @@
// This method is used by the tablegen'erated instruction printer.
void printOperand(const MachineInstr *MI, unsigned OpNo,
- const char *Modifier = 0) {
- const MachineOperand &MO = MI->getOperand(OpNo);
- if (MO.isReg()) {
- assert(TargetRegisterInfo::isPhysicalRegister(MO.getReg()) &&
- "Not physreg??");
- O << TM.getRegisterInfo()->get(MO.getReg()).Name; // Capitalized names
- } else {
- printOp(MO, Modifier);
- }
- }
+ const char *Modifier = 0);
void print_pcrel_imm(const MachineInstr *MI, unsigned OpNo);
More information about the llvm-commits
mailing list