From 21dc46e2561284602e04b05810b9c486556603ba Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sun, 4 Apr 2010 18:06:11 +0000 Subject: remove TargetMachine.h #include, also, TRI isn't used frequently enough to warrant caching in AsmPrinter, so remove it. llvm-svn: 100336 --- llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp | 7 ++++--- llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp | 1 + llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp | 1 + llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) (limited to 'llvm/lib/CodeGen') diff --git a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp index 9007d0d0beb..2a8e3eee459 100644 --- a/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/AsmPrinter.cpp @@ -65,7 +65,7 @@ static gcp_map_type &getGCMap(void *&P) { AsmPrinter::AsmPrinter(TargetMachine &tm, MCStreamer &Streamer) : MachineFunctionPass(&ID), - TM(tm), MAI(tm.getMCAsmInfo()), TRI(tm.getRegisterInfo()), + TM(tm), MAI(tm.getMCAsmInfo()), OutContext(Streamer.getContext()), OutStreamer(Streamer), LastMI(0), LastFn(0), Counter(~0U), SetCounter(0) { @@ -1610,8 +1610,9 @@ void AsmPrinter::printInlineAsm(const MachineInstr *MI) const { /// that is an implicit def. void AsmPrinter::printImplicitDef(const MachineInstr *MI) const { if (!VerboseAsm) return; + unsigned RegNo = MI->getOperand(0).getReg(); OutStreamer.AddComment(Twine("implicit-def: ") + - TRI->getName(MI->getOperand(0).getReg())); + TM.getRegisterInfo()->getName(RegNo)); OutStreamer.AddBlankLine(); } @@ -1623,7 +1624,7 @@ void AsmPrinter::printKill(const MachineInstr *MI) const { const MachineOperand &Op = MI->getOperand(n); assert(Op.isReg() && "KILL instruction must have only register operands"); Str += ' '; - Str += TRI->getName(Op.getReg()); + Str += TM.getRegisterInfo()->getName(Op.getReg()); Str += (Op.isDef() ? "" : ""); } OutStreamer.AddComment(Str); diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp index 07b35e2ba38..6d6071a3b5e 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp @@ -24,6 +24,7 @@ #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" +#include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetRegisterInfo.h" #include "llvm/ADT/STLExtras.h" #include "llvm/ADT/StringExtras.h" diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp index bf89cd6da18..60136cfe4a3 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfException.cpp @@ -27,6 +27,7 @@ #include "llvm/Target/TargetData.h" #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" +#include "llvm/Target/TargetMachine.h" #include "llvm/Target/TargetOptions.h" #include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Support/Dwarf.h" diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp index 4106c7ae75a..2ae7d476b6a 100644 --- a/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp +++ b/llvm/lib/CodeGen/AsmPrinter/DwarfPrinter.cpp @@ -26,6 +26,7 @@ #include "llvm/Target/TargetFrameInfo.h" #include "llvm/Target/TargetLoweringObjectFile.h" #include "llvm/Target/TargetRegisterInfo.h" +#include "llvm/Target/TargetMachine.h" #include "llvm/Support/Dwarf.h" #include "llvm/Support/ErrorHandling.h" #include "llvm/ADT/SmallString.h" -- cgit v1.2.3