Changes in directory llvm/lib/Target/X86:
X86ATTAsmPrinter.cpp updated: 1.15 -> 1.16
X86AsmPrinter.cpp updated: 1.156 -> 1.157
X86AsmPrinter.h updated: 1.7 -> 1.8
X86IntelAsmPrinter.cpp updated: 1.10 -> 1.11
---
Log message:
Use HasDotTypeDotSizeDirective instead of forELF
---
Diffs of the changes: (+10 -18)
X86ATTAsmPrinter.cpp | 4 ++--
X86AsmPrinter.cpp | 19 ++++++-------------
X86AsmPrinter.h | 3 +--
X86IntelAsmPrinter.cpp | 2 +-
4 files changed, 10 insertions(+), 18 deletions(-)
Index: llvm/lib/Target/X86/X86ATTAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.15
llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.16
--- llvm/lib/Target/X86/X86ATTAsmPrinter.cpp:1.15 Mon Nov 21 16:39:40 2005
+++ llvm/lib/Target/X86/X86ATTAsmPrinter.cpp Mon Nov 21 17:06:54 2005
@@ -35,7 +35,7 @@
SwitchSection("\t.text\n", MF.getFunction());
EmitAlignment(4); // FIXME: This should be parameterized somewhere.
O << "\t.globl\t" << CurrentFnName << "\n";
- if (forELF)
+ if (HasDotTypeDotSizeDirective)
O << "\t.type\t" << CurrentFnName << ", @function\n";
O << CurrentFnName << ":\n";
@@ -54,7 +54,7 @@
printMachineInstruction(II);
}
}
- if (forELF)
+ if (HasDotTypeDotSizeDirective)
O << "\t.size " << CurrentFnName << ", .-" << CurrentFnName << "\n";
// We didn't modify anything.
Index: llvm/lib/Target/X86/X86AsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86AsmPrinter.cpp:1.156
llvm/lib/Target/X86/X86AsmPrinter.cpp:1.157
--- llvm/lib/Target/X86/X86AsmPrinter.cpp:1.156 Mon Nov 21 16:48:18 2005
+++ llvm/lib/Target/X86/X86AsmPrinter.cpp Mon Nov 21 17:06:54 2005
@@ -43,13 +43,9 @@
bool X86SharedAsmPrinter::doInitialization(Module &M) {
const X86Subtarget *Subtarget = &TM.getSubtarget<X86Subtarget>();
- forELF = false;
forDarwin = false;
switch (Subtarget->TargetType) {
- case X86Subtarget::isELF:
- forELF = true;
- break;
case X86Subtarget::isDarwin:
AlignmentIsInBytes = false;
GlobalPrefix = "_";
@@ -59,14 +55,17 @@
ConstantPoolSection = "\t.const\n";
LCOMMDirective = "\t.lcomm\t";
COMMDirectiveTakesAlignment = false;
+ HasDotTypeDotSizeDirective = false;
forDarwin = true;
break;
case X86Subtarget::isCygwin:
GlobalPrefix = "_";
COMMDirectiveTakesAlignment = false;
+ HasDotTypeDotSizeDirective = false;
break;
case X86Subtarget::isWindows:
GlobalPrefix = "_";
+ HasDotTypeDotSizeDirective = false;
break;
default: break;
}
@@ -96,9 +95,7 @@
O << COMMDirective << name << "," << Size;
if (COMMDirectiveTakesAlignment)
O << "," << (1 << Align);
- O << "\t\t# ";
- WriteAsOperand(O, I, true, true, &M);
- O << "\n";
+ O << "\t\t" << CommentString << " " << I->getName() << "\n";
continue;
}
@@ -137,15 +134,11 @@
}
EmitAlignment(Align);
- if (forELF) {
+ if (HasDotTypeDotSizeDirective) {
O << "\t.type " << name << ",@object\n";
O << "\t.size " << name << "," << Size << "\n";
}
- O << name << ":\t\t\t\t# ";
- WriteAsOperand(O, I, true, true, &M);
- O << " = ";
- WriteAsOperand(O, C, false, false, &M);
- O << "\n";
+ O << name << ":\t\t\t" << CommentString << ' ' << I->getName() << '\n';
EmitGlobalConstant(C);
}
Index: llvm/lib/Target/X86/X86AsmPrinter.h
diff -u llvm/lib/Target/X86/X86AsmPrinter.h:1.7
llvm/lib/Target/X86/X86AsmPrinter.h:1.8
--- llvm/lib/Target/X86/X86AsmPrinter.h:1.7 Mon Nov 21 16:39:40 2005
+++ llvm/lib/Target/X86/X86AsmPrinter.h Mon Nov 21 17:06:54 2005
@@ -29,12 +29,11 @@
struct X86SharedAsmPrinter : public AsmPrinter {
X86SharedAsmPrinter(std::ostream &O, TargetMachine &TM)
- : AsmPrinter(O, TM), forELF(false), forDarwin(false) { }
+ : AsmPrinter(O, TM), forDarwin(false) { }
bool doInitialization(Module &M);
bool doFinalization(Module &M);
- bool forELF;
bool forDarwin; // FIXME: eliminate.
// Necessary for Darwin to print out the apprioriate types of linker stubs
Index: llvm/lib/Target/X86/X86IntelAsmPrinter.cpp
diff -u llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.10
llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.11
--- llvm/lib/Target/X86/X86IntelAsmPrinter.cpp:1.10 Mon Nov 21 16:19:48 2005
+++ llvm/lib/Target/X86/X86IntelAsmPrinter.cpp Mon Nov 21 17:06:54 2005
@@ -35,7 +35,7 @@
SwitchSection("\t.text\n", MF.getFunction());
EmitAlignment(4);
O << "\t.globl\t" << CurrentFnName << "\n";
- if (forELF)
+ if (HasDotTypeDotSizeDirective)
O << "\t.type\t" << CurrentFnName << ", @function\n";
O << CurrentFnName << ":\n";
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
