[llvm-commits] [llvm] r75782 - in /llvm/trunk/lib/Target: ARM/ARMTargetMachine.cpp PowerPC/PPCTargetMachine.cpp X86/X86TargetMachine.cpp
Daniel Dunbar
daniel at zuster.org
Wed Jul 15 05:49:42 PDT 2009
Author: ddunbar
Date: Wed Jul 15 07:49:15 2009
New Revision: 75782
URL: http://llvm.org/viewvc/llvm-project?rev=75782&view=rev
Log:
Replace large swaths of copy-n-paste code with obvious helper function...
- Which was already present in the module!
- I skipped this xform for Alpha, since it runs an extra pass during assembly
emission, but not when emitting assembly via the DumpAsm flag.
- No functionality change.
--
ddunbar at giles:llvm$ svn diff | grep '^- ' | sort | uniq -c
18 - PM.add(AsmPrinterCtor(ferrs(), *this, true));
18 - assert(AsmPrinterCtor && "AsmPrinter was not linked in");
18 - if (AsmPrinterCtor)
18 - if (DumpAsm) {
18 - }
ddunbar at giles:llvm$ svn diff | grep '^+ ' | sort | uniq -c
18 + addAssemblyEmitter(PM, OptLevel, true, ferrs());
18 + if (DumpAsm)
--
Modified:
llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp
llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=75782&r1=75781&r2=75782&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Wed Jul 15 07:49:15 2009
@@ -155,11 +155,8 @@
// Machine code emitter pass for ARM.
PM.add(createARMCodeEmitterPass(*this, MCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -174,11 +171,8 @@
// Machine code emitter pass for ARM.
PM.add(createARMJITCodeEmitterPass(*this, JCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -193,11 +187,8 @@
// Machine code emitter pass for ARM.
PM.add(createARMObjectCodeEmitterPass(*this, OCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -208,11 +199,8 @@
MachineCodeEmitter &MCE) {
// Machine code emitter pass for ARM.
PM.add(createARMCodeEmitterPass(*this, MCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -223,11 +211,8 @@
JITCodeEmitter &JCE) {
// Machine code emitter pass for ARM.
PM.add(createARMJITCodeEmitterPass(*this, JCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -238,11 +223,8 @@
ObjectCodeEmitter &OCE) {
// Machine code emitter pass for ARM.
PM.add(createARMObjectCodeEmitterPass(*this, OCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
Modified: llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp?rev=75782&r1=75781&r2=75782&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCTargetMachine.cpp Wed Jul 15 07:49:15 2009
@@ -135,11 +135,8 @@
// Machine code emitter pass for PowerPC.
PM.add(createPPCCodeEmitterPass(*this, MCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -167,11 +164,8 @@
// Machine code emitter pass for PowerPC.
PM.add(createPPCJITCodeEmitterPass(*this, JCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -199,11 +193,8 @@
// Machine code emitter pass for PowerPC.
PM.add(createPPCObjectCodeEmitterPass(*this, OCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -214,11 +205,8 @@
MachineCodeEmitter &MCE) {
// Machine code emitter pass for PowerPC.
PM.add(createPPCCodeEmitterPass(*this, MCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -229,11 +217,8 @@
JITCodeEmitter &JCE) {
// Machine code emitter pass for PowerPC.
PM.add(createPPCJITCodeEmitterPass(*this, JCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -244,11 +229,8 @@
ObjectCodeEmitter &OCE) {
// Machine code emitter pass for PowerPC.
PM.add(createPPCObjectCodeEmitterPass(*this, OCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=75782&r1=75781&r2=75782&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Wed Jul 15 07:49:15 2009
@@ -217,11 +217,8 @@
}
PM.add(createX86CodeEmitterPass(*this, MCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -249,11 +246,8 @@
}
PM.add(createX86JITCodeEmitterPass(*this, JCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -263,11 +257,8 @@
bool DumpAsm,
ObjectCodeEmitter &OCE) {
PM.add(createX86ObjectCodeEmitterPass(*this, OCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -277,11 +268,8 @@
bool DumpAsm,
MachineCodeEmitter &MCE) {
PM.add(createX86CodeEmitterPass(*this, MCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -291,11 +279,8 @@
bool DumpAsm,
JITCodeEmitter &JCE) {
PM.add(createX86JITCodeEmitterPass(*this, JCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
@@ -305,11 +290,8 @@
bool DumpAsm,
ObjectCodeEmitter &OCE) {
PM.add(createX86ObjectCodeEmitterPass(*this, OCE));
- if (DumpAsm) {
- assert(AsmPrinterCtor && "AsmPrinter was not linked in");
- if (AsmPrinterCtor)
- PM.add(AsmPrinterCtor(ferrs(), *this, true));
- }
+ if (DumpAsm)
+ addAssemblyEmitter(PM, OptLevel, true, ferrs());
return false;
}
More information about the llvm-commits
mailing list