From 8ba03b7ed73b410bde95dbcf528ece3782e84a1f Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 15 Jul 2009 12:49:15 +0000 Subject: 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@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@giles:llvm$ svn diff | grep '^+ ' | sort | uniq -c 18 + addAssemblyEmitter(PM, OptLevel, true, ferrs()); 18 + if (DumpAsm) -- git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75782 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/ARM/ARMTargetMachine.cpp | 42 +++++++++++-------------------------- 1 file changed, 12 insertions(+), 30 deletions(-) (limited to 'lib/Target/ARM') diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp index 78b2f8a..ad80020 100644 --- a/lib/Target/ARM/ARMTargetMachine.cpp +++ b/lib/Target/ARM/ARMTargetMachine.cpp @@ -155,11 +155,8 @@ bool ARMBaseTargetMachine::addCodeEmitter(PassManagerBase &PM, // 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 @@ bool ARMBaseTargetMachine::addCodeEmitter(PassManagerBase &PM, // 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 @@ bool ARMBaseTargetMachine::addCodeEmitter(PassManagerBase &PM, // 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 @@ bool ARMBaseTargetMachine::addSimpleCodeEmitter(PassManagerBase &PM, 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 @@ bool ARMBaseTargetMachine::addSimpleCodeEmitter(PassManagerBase &PM, 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 @@ bool ARMBaseTargetMachine::addSimpleCodeEmitter(PassManagerBase &PM, 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; } -- cgit v1.1