Typo.

[oota-llvm.git] / lib / CodeGen / DwarfWriter.cpp

diff --git a/lib/CodeGen/DwarfWriter.cpp b/lib/CodeGen/DwarfWriter.cpp
index 0261a00f590a7563dbc23e6def6ac01270c8efe9..e6ec43eed3df86ffb83a3014dc04bc9688135862 100644 (file)
--- a/lib/CodeGen/DwarfWriter.cpp
+++ b/lib/CodeGen/DwarfWriter.cpp
@@ -870,18 +870,20 @@ public:
   
   /// EmitReference - Emit a reference to a label.
   ///
-  void EmitReference(DWLabel Label, bool IsPCRelative = false) const {
-    EmitReference(Label.Tag, Label.Number, IsPCRelative);
+  void EmitReference(DWLabel Label, bool IsPCRelative = false,
+                     bool Force32Bit = false) const {
+    EmitReference(Label.Tag, Label.Number, IsPCRelative, Force32Bit);
   }
   void EmitReference(const char *Tag, unsigned Number,
-                     bool IsPCRelative = false) const {
-    PrintRelDirective();
+                     bool IsPCRelative = false, bool Force32Bit = false) const {
+    PrintRelDirective(Force32Bit);
     PrintLabelName(Tag, Number);
     
     if (IsPCRelative) O << "-" << TAI->getPCSymbol();
   }
-  void EmitReference(const std::string &Name, bool IsPCRelative = false) const {
-    PrintRelDirective();
+  void EmitReference(const std::string &Name, bool IsPCRelative = false,
+                     bool Force32Bit = false) const {
+    PrintRelDirective(Force32Bit);
     
     O << Name;
     
@@ -1969,19 +1971,6 @@ private:
     if (didInitial) return;
     didInitial = true;
     
-    // Print out .file directives to specify files for .loc directives.
-    if (TAI->hasDotLocAndDotFile()) {
-      const UniqueVector<SourceFileInfo> &SourceFiles = MMI->getSourceFiles();
-      const UniqueVector<std::string> &Directories = MMI->getDirectories();
-      for (unsigned i = 1, e = SourceFiles.size(); i <= e; ++i) {
-        sys::Path FullPath(Directories[SourceFiles[i].getDirectoryID()]);
-        bool AppendOk = FullPath.appendComponent(SourceFiles[i].getName());
-        assert(AppendOk && "Could not append filename to directory!");
-        Asm->EmitFile(i, FullPath.toString());
-        Asm->EOL();
-      }
-    }
-
     // Dwarf sections base addresses.
     if (TAI->doesDwarfRequireFrameSection()) {
       Asm->SwitchToDataSection(TAI->getDwarfFrameSection());
@@ -2624,9 +2613,6 @@ public:
       MMI = mmi;
       shouldEmit = true;
       
-      // Emit initial sections
-      EmitInitial();
-    
       // Create all the compile unit DIEs.
       ConstructCompileUnitDIEs();
       
@@ -2638,6 +2624,23 @@ public:
       
       // Prime section data.
       SectionMap.insert(TAI->getTextSection());
+
+      // Print out .file directives to specify files for .loc directives. These
+      // are printed out early so that they precede any .loc directives.
+      if (TAI->hasDotLocAndDotFile()) {
+        const UniqueVector<SourceFileInfo> &SourceFiles = MMI->getSourceFiles();
+        const UniqueVector<std::string> &Directories = MMI->getDirectories();
+        for (unsigned i = 1, e = SourceFiles.size(); i <= e; ++i) {
+          sys::Path FullPath(Directories[SourceFiles[i].getDirectoryID()]);
+          bool AppendOk = FullPath.appendComponent(SourceFiles[i].getName());
+          assert(AppendOk && "Could not append filename to directory!");
+          Asm->EmitFile(i, FullPath.toString());
+          Asm->EOL();
+        }
+      }
+
+      // Emit initial sections
+      EmitInitial();
     }
   }
 
@@ -3479,12 +3482,14 @@ void DIEString::EmitValue(DwarfDebug &DD, unsigned Form) {
 /// EmitValue - Emit label value.
 ///
 void DIEDwarfLabel::EmitValue(DwarfDebug &DD, unsigned Form) {
-  DD.EmitReference(Label);
+  bool IsSmall = Form == DW_FORM_data4;
+  DD.EmitReference(Label, false, IsSmall);
 }
 
 /// SizeOf - Determine size of label value in bytes.
 ///
 unsigned DIEDwarfLabel::SizeOf(const DwarfDebug &DD, unsigned Form) const {
+  if (Form == DW_FORM_data4) return 4;
   return DD.getTargetData()->getPointerSize();
 }
 
@@ -3493,12 +3498,14 @@ unsigned DIEDwarfLabel::SizeOf(const DwarfDebug &DD, unsigned Form) const {
 /// EmitValue - Emit label value.
 ///
 void DIEObjectLabel::EmitValue(DwarfDebug &DD, unsigned Form) {
-  DD.EmitReference(Label);
+  bool IsSmall = Form == DW_FORM_data4;
+  DD.EmitReference(Label, false, IsSmall);
 }
 
 /// SizeOf - Determine size of label value in bytes.
 ///
 unsigned DIEObjectLabel::SizeOf(const DwarfDebug &DD, unsigned Form) const {
+  if (Form == DW_FORM_data4) return 4;
   return DD.getTargetData()->getPointerSize();
 }