Sort out mangled names for globals
[oota-llvm.git] / lib / CodeGen / DwarfWriter.cpp
index 92eab0cd5d13d646d1edc3aeec57ac1a6fa4dca6..0921cc5c6478971da21fe7a64a1ab920d9235967 100644 (file)
 #include "llvm/Type.h"
 #include "llvm/CodeGen/AsmPrinter.h"
 #include "llvm/CodeGen/MachineDebugInfo.h"
+#include "llvm/CodeGen/MachineFrameInfo.h"
+#include "llvm/CodeGen/MachineLocation.h"
 #include "llvm/Support/Dwarf.h"
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Mangler.h"
+#include "llvm/Target/TargetAsmInfo.h"
+#include "llvm/Target/MRegisterInfo.h"
+#include "llvm/Target/TargetData.h"
 #include "llvm/Target/TargetMachine.h"
+#include "llvm/Target/TargetFrameInfo.h"
 
 #include <iostream>
 
 using namespace llvm;
+using namespace llvm::dwarf;
 
 static cl::opt<bool>
 DwarfVerbose("dwarf-verbose", cl::Hidden,
-                                cl::desc("Add comments to Dwarf directives."));
+                              cl::desc("Add comments to Dwarf directives."));
+
+namespace llvm {
 
 //===----------------------------------------------------------------------===//
+// Forward declarations.
+//
+class DIE;
 
-/// TagString - Return the string for the specified tag.
-///
-static const char *TagString(unsigned Tag) {
-  switch(Tag) {
-    case DW_TAG_array_type:                return "TAG_array_type";
-    case DW_TAG_class_type:                return "TAG_class_type";
-    case DW_TAG_entry_point:               return "TAG_entry_point";
-    case DW_TAG_enumeration_type:          return "TAG_enumeration_type";
-    case DW_TAG_formal_parameter:          return "TAG_formal_parameter";
-    case DW_TAG_imported_declaration:      return "TAG_imported_declaration";
-    case DW_TAG_label:                     return "TAG_label";
-    case DW_TAG_lexical_block:             return "TAG_lexical_block";
-    case DW_TAG_member:                    return "TAG_member";
-    case DW_TAG_pointer_type:              return "TAG_pointer_type";
-    case DW_TAG_reference_type:            return "TAG_reference_type";
-    case DW_TAG_compile_unit:              return "TAG_compile_unit";
-    case DW_TAG_string_type:               return "TAG_string_type";
-    case DW_TAG_structure_type:            return "TAG_structure_type";
-    case DW_TAG_subroutine_type:           return "TAG_subroutine_type";
-    case DW_TAG_typedef:                   return "TAG_typedef";
-    case DW_TAG_union_type:                return "TAG_union_type";
-    case DW_TAG_unspecified_parameters:    return "TAG_unspecified_parameters";
-    case DW_TAG_variant:                   return "TAG_variant";
-    case DW_TAG_common_block:              return "TAG_common_block";
-    case DW_TAG_common_inclusion:          return "TAG_common_inclusion";
-    case DW_TAG_inheritance:               return "TAG_inheritance";
-    case DW_TAG_inlined_subroutine:        return "TAG_inlined_subroutine";
-    case DW_TAG_module:                    return "TAG_module";
-    case DW_TAG_ptr_to_member_type:        return "TAG_ptr_to_member_type";
-    case DW_TAG_set_type:                  return "TAG_set_type";
-    case DW_TAG_subrange_type:             return "TAG_subrange_type";
-    case DW_TAG_with_stmt:                 return "TAG_with_stmt";
-    case DW_TAG_access_declaration:        return "TAG_access_declaration";
-    case DW_TAG_base_type:                 return "TAG_base_type";
-    case DW_TAG_catch_block:               return "TAG_catch_block";
-    case DW_TAG_const_type:                return "TAG_const_type";
-    case DW_TAG_constant:                  return "TAG_constant";
-    case DW_TAG_enumerator:                return "TAG_enumerator";
-    case DW_TAG_file_type:                 return "TAG_file_type";
-    case DW_TAG_friend:                    return "TAG_friend";
-    case DW_TAG_namelist:                  return "TAG_namelist";
-    case DW_TAG_namelist_item:             return "TAG_namelist_item";
-    case DW_TAG_packed_type:               return "TAG_packed_type";
-    case DW_TAG_subprogram:                return "TAG_subprogram";
-    case DW_TAG_template_type_parameter:   return "TAG_template_type_parameter";
-    case DW_TAG_template_value_parameter: return "TAG_template_value_parameter";
-    case DW_TAG_thrown_type:               return "TAG_thrown_type";
-    case DW_TAG_try_block:                 return "TAG_try_block";
-    case DW_TAG_variant_part:              return "TAG_variant_part";
-    case DW_TAG_variable:                  return "TAG_variable";
-    case DW_TAG_volatile_type:             return "TAG_volatile_type";
-    case DW_TAG_dwarf_procedure:           return "TAG_dwarf_procedure";
-    case DW_TAG_restrict_type:             return "TAG_restrict_type";
-    case DW_TAG_interface_type:            return "TAG_interface_type";
-    case DW_TAG_namespace:                 return "TAG_namespace";
-    case DW_TAG_imported_module:           return "TAG_imported_module";
-    case DW_TAG_unspecified_type:          return "TAG_unspecified_type";
-    case DW_TAG_partial_unit:              return "TAG_partial_unit";
-    case DW_TAG_imported_unit:             return "TAG_imported_unit";
-    case DW_TAG_condition:                 return "TAG_condition";
-    case DW_TAG_shared_type:               return "TAG_shared_type";
-    case DW_TAG_lo_user:                   return "TAG_lo_user";
-    case DW_TAG_hi_user:                   return "TAG_hi_user";
+//===----------------------------------------------------------------------===//
+// CompileUnit - This dwarf writer support class manages information associate
+// with a source file.
+class CompileUnit {
+private:
+  CompileUnitDesc *Desc;                // Compile unit debug descriptor.
+  unsigned ID;                          // File ID for source.
+  DIE *Die;                             // Compile unit debug information entry.
+  std::map<std::string, DIE *> Globals; // A map of globally visible named
+                                        // entities for this unit.
+  std::map<DebugInfoDesc *, DIE *> DescToDieMap;
+                                        // Tracks the mapping of unit level
+                                        // debug informaton descriptors to debug
+                                        // information entries.
+
+public:
+  CompileUnit(CompileUnitDesc *CUD, unsigned I, DIE *D)
+  : Desc(CUD)
+  , ID(I)
+  , Die(D)
+  , Globals()
+  , DescToDieMap()
+  {}
+  
+  ~CompileUnit();
+  
+  // Accessors.
+  CompileUnitDesc *getDesc() const { return Desc; }
+  unsigned getID()           const { return ID; }
+  DIE* getDie()              const { return Die; }
+  std::map<std::string, DIE *> &getGlobals() { return Globals; }
+  
+  /// hasContent - Return true if this compile unit has something to write out.
+  ///
+  bool hasContent() const;
+  
+  /// AddGlobal - Add a new global entity to the compile unit.
+  ///
+  void AddGlobal(const std::string &Name, DIE *Die);
+  
+  /// getDieMapSlotFor - Returns the debug information entry map slot for the
+  /// specified debug descriptor.
+  DIE *&getDieMapSlotFor(DebugInfoDesc *DD) {
+    return DescToDieMap[DD];
   }
-  assert(0 && "Unknown Dwarf Tag");
-  return "";
-}
+};
 
-/// ChildrenString - Return the string for the specified children flag.
-///
-static const char *ChildrenString(unsigned Children) {
-  switch(Children) {
-    case DW_CHILDREN_no:                   return "CHILDREN_no";
-    case DW_CHILDREN_yes:                  return "CHILDREN_yes";
-  }
-  assert(0 && "Unknown Dwarf ChildrenFlag");
-  return "";
-}
-
-/// AttributeString - Return the string for the specified attribute.
-///
-static const char *AttributeString(unsigned Attribute) {
-  switch(Attribute) {
-    case DW_AT_sibling:                    return "AT_sibling";
-    case DW_AT_location:                   return "AT_location";
-    case DW_AT_name:                       return "AT_name";
-    case DW_AT_ordering:                   return "AT_ordering";
-    case DW_AT_byte_size:                  return "AT_byte_size";
-    case DW_AT_bit_offset:                 return "AT_bit_offset";
-    case DW_AT_bit_size:                   return "AT_bit_size";
-    case DW_AT_stmt_list:                  return "AT_stmt_list";
-    case DW_AT_low_pc:                     return "AT_low_pc";
-    case DW_AT_high_pc:                    return "AT_high_pc";
-    case DW_AT_language:                   return "AT_language";
-    case DW_AT_discr:                      return "AT_discr";
-    case DW_AT_discr_value:                return "AT_discr_value";
-    case DW_AT_visibility:                 return "AT_visibility";
-    case DW_AT_import:                     return "AT_import";
-    case DW_AT_string_length:              return "AT_string_length";
-    case DW_AT_common_reference:           return "AT_common_reference";
-    case DW_AT_comp_dir:                   return "AT_comp_dir";
-    case DW_AT_const_value:                return "AT_const_value";
-    case DW_AT_containing_type:            return "AT_containing_type";
-    case DW_AT_default_value:              return "AT_default_value";
-    case DW_AT_inline:                     return "AT_inline";
-    case DW_AT_is_optional:                return "AT_is_optional";
-    case DW_AT_lower_bound:                return "AT_lower_bound";
-    case DW_AT_producer:                   return "AT_producer";
-    case DW_AT_prototyped:                 return "AT_prototyped";
-    case DW_AT_return_addr:                return "AT_return_addr";
-    case DW_AT_start_scope:                return "AT_start_scope";
-    case DW_AT_bit_stride:                 return "AT_bit_stride";
-    case DW_AT_upper_bound:                return "AT_upper_bound";
-    case DW_AT_abstract_origin:            return "AT_abstract_origin";
-    case DW_AT_accessibility:              return "AT_accessibility";
-    case DW_AT_address_class:              return "AT_address_class";
-    case DW_AT_artificial:                 return "AT_artificial";
-    case DW_AT_base_types:                 return "AT_base_types";
-    case DW_AT_calling_convention:         return "AT_calling_convention";
-    case DW_AT_count:                      return "AT_count";
-    case DW_AT_data_member_location:       return "AT_data_member_location";
-    case DW_AT_decl_column:                return "AT_decl_column";
-    case DW_AT_decl_file:                  return "AT_decl_file";
-    case DW_AT_decl_line:                  return "AT_decl_line";
-    case DW_AT_declaration:                return "AT_declaration";
-    case DW_AT_discr_list:                 return "AT_discr_list";
-    case DW_AT_encoding:                   return "AT_encoding";
-    case DW_AT_external:                   return "AT_external";
-    case DW_AT_frame_base:                 return "AT_frame_base";
-    case DW_AT_friend:                     return "AT_friend";
-    case DW_AT_identifier_case:            return "AT_identifier_case";
-    case DW_AT_macro_info:                 return "AT_macro_info";
-    case DW_AT_namelist_item:              return "AT_namelist_item";
-    case DW_AT_priority:                   return "AT_priority";
-    case DW_AT_segment:                    return "AT_segment";
-    case DW_AT_specification:              return "AT_specification";
-    case DW_AT_static_link:                return "AT_static_link";
-    case DW_AT_type:                       return "AT_type";
-    case DW_AT_use_location:               return "AT_use_location";
-    case DW_AT_variable_parameter:         return "AT_variable_parameter";
-    case DW_AT_virtuality:                 return "AT_virtuality";
-    case DW_AT_vtable_elem_location:       return "AT_vtable_elem_location";
-    case DW_AT_allocated:                  return "AT_allocated";
-    case DW_AT_associated:                 return "AT_associated";
-    case DW_AT_data_location:              return "AT_data_location";
-    case DW_AT_byte_stride:                return "AT_byte_stride";
-    case DW_AT_entry_pc:                   return "AT_entry_pc";
-    case DW_AT_use_UTF8:                   return "AT_use_UTF8";
-    case DW_AT_extension:                  return "AT_extension";
-    case DW_AT_ranges:                     return "AT_ranges";
-    case DW_AT_trampoline:                 return "AT_trampoline";
-    case DW_AT_call_column:                return "AT_call_column";
-    case DW_AT_call_file:                  return "AT_call_file";
-    case DW_AT_call_line:                  return "AT_call_line";
-    case DW_AT_description:                return "AT_description";
-    case DW_AT_binary_scale:               return "AT_binary_scale";
-    case DW_AT_decimal_scale:              return "AT_decimal_scale";
-    case DW_AT_small:                      return "AT_small";
-    case DW_AT_decimal_sign:               return "AT_decimal_sign";
-    case DW_AT_digit_count:                return "AT_digit_count";
-    case DW_AT_picture_string:             return "AT_picture_string";
-    case DW_AT_mutable:                    return "AT_mutable";
-    case DW_AT_threads_scaled:             return "AT_threads_scaled";
-    case DW_AT_explicit:                   return "AT_explicit";
-    case DW_AT_object_pointer:             return "AT_object_pointer";
-    case DW_AT_endianity:                  return "AT_endianity";
-    case DW_AT_elemental:                  return "AT_elemental";
-    case DW_AT_pure:                       return "AT_pure";
-    case DW_AT_recursive:                  return "AT_recursive";
-    case DW_AT_lo_user:                    return "AT_lo_user";
-    case DW_AT_hi_user:                    return "AT_hi_user";
+//===----------------------------------------------------------------------===//
+// DIEAbbrevData - Dwarf abbreviation data, describes the one attribute of a
+// Dwarf abbreviation.
+class DIEAbbrevData {
+private:
+  unsigned Attribute;                 // Dwarf attribute code.
+  unsigned Form;                      // Dwarf form code.
+  
+public:
+  DIEAbbrevData(unsigned A, unsigned F)
+  : Attribute(A)
+  , Form(F)
+  {}
+  
+  // Accessors.
+  unsigned getAttribute() const { return Attribute; }
+  unsigned getForm()      const { return Form; }
+  
+  /// operator== - Used by DIEAbbrev to locate entry.
+  ///
+  bool operator==(const DIEAbbrevData &DAD) const {
+    return Attribute == DAD.Attribute && Form == DAD.Form;
   }
-  assert(0 && "Unknown Dwarf Attribute");
-  return "";
-}
-
-/// FormEncodingString - Return the string for the specified form encoding.
-///
-static const char *FormEncodingString(unsigned Encoding) {
-  switch(Encoding) {
-    case DW_FORM_addr:                     return "FORM_addr";
-    case DW_FORM_block2:                   return "FORM_block2";
-    case DW_FORM_block4:                   return "FORM_block4";
-    case DW_FORM_data2:                    return "FORM_data2";
-    case DW_FORM_data4:                    return "FORM_data4";
-    case DW_FORM_data8:                    return "FORM_data8";
-    case DW_FORM_string:                   return "FORM_string";
-    case DW_FORM_block:                    return "FORM_block";
-    case DW_FORM_block1:                   return "FORM_block1";
-    case DW_FORM_data1:                    return "FORM_data1";
-    case DW_FORM_flag:                     return "FORM_flag";
-    case DW_FORM_sdata:                    return "FORM_sdata";
-    case DW_FORM_strp:                     return "FORM_strp";
-    case DW_FORM_udata:                    return "FORM_udata";
-    case DW_FORM_ref_addr:                 return "FORM_ref_addr";
-    case DW_FORM_ref1:                     return "FORM_ref1";
-    case DW_FORM_ref2:                     return "FORM_ref2";
-    case DW_FORM_ref4:                     return "FORM_ref4";
-    case DW_FORM_ref8:                     return "FORM_ref8";
-    case DW_FORM_ref_udata:                return "FORM_ref_udata";
-    case DW_FORM_indirect:                 return "FORM_indirect";
+
+  /// operator!= - Used by DIEAbbrev to locate entry.
+  ///
+  bool operator!=(const DIEAbbrevData &DAD) const {
+    return Attribute != DAD.Attribute || Form != DAD.Form;
   }
-  assert(0 && "Unknown Dwarf Form Encoding");
-  return "";
-}
-
-/// OperationEncodingString - Return the string for the specified operation
-/// encoding.
-static const char *OperationEncodingString(unsigned Encoding) {
-  switch(Encoding) {
-    case DW_OP_addr:                       return "OP_addr";
-    case DW_OP_deref:                      return "OP_deref";
-    case DW_OP_const1u:                    return "OP_const1u";
-    case DW_OP_const1s:                    return "OP_const1s";
-    case DW_OP_const2u:                    return "OP_const2u";
-    case DW_OP_const2s:                    return "OP_const2s";
-    case DW_OP_const4u:                    return "OP_const4u";
-    case DW_OP_const4s:                    return "OP_const4s";
-    case DW_OP_const8u:                    return "OP_const8u";
-    case DW_OP_const8s:                    return "OP_const8s";
-    case DW_OP_constu:                     return "OP_constu";
-    case DW_OP_consts:                     return "OP_consts";
-    case DW_OP_dup:                        return "OP_dup";
-    case DW_OP_drop:                       return "OP_drop";
-    case DW_OP_over:                       return "OP_over";
-    case DW_OP_pick:                       return "OP_pick";
-    case DW_OP_swap:                       return "OP_swap";
-    case DW_OP_rot:                        return "OP_rot";
-    case DW_OP_xderef:                     return "OP_xderef";
-    case DW_OP_abs:                        return "OP_abs";
-    case DW_OP_and:                        return "OP_and";
-    case DW_OP_div:                        return "OP_div";
-    case DW_OP_minus:                      return "OP_minus";
-    case DW_OP_mod:                        return "OP_mod";
-    case DW_OP_mul:                        return "OP_mul";
-    case DW_OP_neg:                        return "OP_neg";
-    case DW_OP_not:                        return "OP_not";
-    case DW_OP_or:                         return "OP_or";
-    case DW_OP_plus:                       return "OP_plus";
-    case DW_OP_plus_uconst:                return "OP_plus_uconst";
-    case DW_OP_shl:                        return "OP_shl";
-    case DW_OP_shr:                        return "OP_shr";
-    case DW_OP_shra:                       return "OP_shra";
-    case DW_OP_xor:                        return "OP_xor";
-    case DW_OP_skip:                       return "OP_skip";
-    case DW_OP_bra:                        return "OP_bra";
-    case DW_OP_eq:                         return "OP_eq";
-    case DW_OP_ge:                         return "OP_ge";
-    case DW_OP_gt:                         return "OP_gt";
-    case DW_OP_le:                         return "OP_le";
-    case DW_OP_lt:                         return "OP_lt";
-    case DW_OP_ne:                         return "OP_ne";
-    case DW_OP_lit0:                       return "OP_lit0";
-    case DW_OP_lit1:                       return "OP_lit1";
-    case DW_OP_lit31:                      return "OP_lit31";
-    case DW_OP_reg0:                       return "OP_reg0";
-    case DW_OP_reg1:                       return "OP_reg1";
-    case DW_OP_reg31:                      return "OP_reg31";
-    case DW_OP_breg0:                      return "OP_breg0";
-    case DW_OP_breg1:                      return "OP_breg1";
-    case DW_OP_breg31:                     return "OP_breg31";
-    case DW_OP_regx:                       return "OP_regx";
-    case DW_OP_fbreg:                      return "OP_fbreg";
-    case DW_OP_bregx:                      return "OP_bregx";
-    case DW_OP_piece:                      return "OP_piece";
-    case DW_OP_deref_size:                 return "OP_deref_size";
-    case DW_OP_xderef_size:                return "OP_xderef_size";
-    case DW_OP_nop:                        return "OP_nop";
-    case DW_OP_push_object_address:        return "OP_push_object_address";
-    case DW_OP_call2:                      return "OP_call2";
-    case DW_OP_call4:                      return "OP_call4";
-    case DW_OP_call_ref:                   return "OP_call_ref";
-    case DW_OP_form_tls_address:           return "OP_form_tls_address";
-    case DW_OP_call_frame_cfa:             return "OP_call_frame_cfa";
-    case DW_OP_lo_user:                    return "OP_lo_user";
-    case DW_OP_hi_user:                    return "OP_hi_user";
+  
+  /// operator< - Used by DIEAbbrev to locate entry.
+  ///
+  bool operator<(const DIEAbbrevData &DAD) const {
+    return Attribute < DAD.Attribute ||
+          (Attribute == DAD.Attribute && Form < DAD.Form);
   }
-  assert(0 && "Unknown Dwarf Operation Encoding");
-  return "";
-}
-
-/// AttributeEncodingString - Return the string for the specified attribute
-/// encoding.
-static const char *AttributeEncodingString(unsigned Encoding) {
-  switch(Encoding) {
-    case DW_ATE_address:                   return "ATE_address";
-    case DW_ATE_boolean:                   return "ATE_boolean";
-    case DW_ATE_complex_float:             return "ATE_complex_float";
-    case DW_ATE_float:                     return "ATE_float";
-    case DW_ATE_signed:                    return "ATE_signed";
-    case DW_ATE_signed_char:               return "ATE_signed_char";
-    case DW_ATE_unsigned:                  return "ATE_unsigned";
-    case DW_ATE_unsigned_char:             return "ATE_unsigned_char";
-    case DW_ATE_imaginary_float:           return "ATE_imaginary_float";
-    case DW_ATE_packed_decimal:            return "ATE_packed_decimal";
-    case DW_ATE_numeric_string:            return "ATE_numeric_string";
-    case DW_ATE_edited:                    return "ATE_edited";
-    case DW_ATE_signed_fixed:              return "ATE_signed_fixed";
-    case DW_ATE_unsigned_fixed:            return "ATE_unsigned_fixed";
-    case DW_ATE_decimal_float:             return "ATE_decimal_float";
-    case DW_ATE_lo_user:                   return "ATE_lo_user";
-    case DW_ATE_hi_user:                   return "ATE_hi_user";
+};
+
+//===----------------------------------------------------------------------===//
+// DIEAbbrev - Dwarf abbreviation, describes the organization of a debug
+// information object.
+class DIEAbbrev {
+private:
+  unsigned Tag;                       // Dwarf tag code.
+  unsigned ChildrenFlag;              // Dwarf children flag.
+  std::vector<DIEAbbrevData> Data;    // Raw data bytes for abbreviation.
+
+public:
+
+  DIEAbbrev(unsigned T, unsigned C)
+  : Tag(T)
+  , ChildrenFlag(C)
+  , Data()
+  {}
+  ~DIEAbbrev() {}
+  
+  // Accessors.
+  unsigned getTag()                           const { return Tag; }
+  unsigned getChildrenFlag()                  const { return ChildrenFlag; }
+  const std::vector<DIEAbbrevData> &getData() const { return Data; }
+  void setChildrenFlag(unsigned CF)                 { ChildrenFlag = CF; }
+
+  /// operator== - Used by UniqueVector to locate entry.
+  ///
+  bool operator==(const DIEAbbrev &DA) const;
+
+  /// operator< - Used by UniqueVector to locate entry.
+  ///
+  bool operator<(const DIEAbbrev &DA) const;
+
+  /// AddAttribute - Adds another set of attribute information to the
+  /// abbreviation.
+  void AddAttribute(unsigned Attribute, unsigned Form) {
+    Data.push_back(DIEAbbrevData(Attribute, Form));
   }
-  assert(0 && "Unknown Dwarf Attribute Encoding");
-  return "";
-}
-
-/// DecimalSignString - Return the string for the specified decimal sign
-/// attribute.
-static const char *DecimalSignString(unsigned Sign) {
-  switch(Sign) {
-    case DW_DS_unsigned:                   return "DS_unsigned";
-    case DW_DS_leading_overpunch:          return "DS_leading_overpunch";
-    case DW_DS_trailing_overpunch:         return "DS_trailing_overpunch";
-    case DW_DS_leading_separate:           return "DS_leading_separate";
-    case DW_DS_trailing_separate:          return "DS_trailing_separate";
+  
+  /// AddFirstAttribute - Adds a set of attribute information to the front
+  /// of the abbreviation.
+  void AddFirstAttribute(unsigned Attribute, unsigned Form) {
+    Data.insert(Data.begin(), DIEAbbrevData(Attribute, Form));
   }
-  assert(0 && "Unknown Dwarf Decimal Sign Attribute");
-  return "";
-}
+  
+  /// Emit - Print the abbreviation using the specified Dwarf writer.
+  ///
+  void Emit(const DwarfWriter &DW) const; 
+      
+#ifndef NDEBUG
+  void print(std::ostream &O);
+  void dump();
+#endif
+};
 
-/// EndianityString - Return the string for the specified endianity.
-///
-static const char *EndianityString(unsigned Endian) {
-  switch(Endian) {
-    case DW_END_default:                   return "END_default";
-    case DW_END_big:                       return "END_big";
-    case DW_END_little:                    return "END_little";
-    case DW_END_lo_user:                   return "END_lo_user";
-    case DW_END_hi_user:                   return "END_hi_user";
-  }
-  assert(0 && "Unknown Dwarf Endianity");
-  return "";
-}
+//===----------------------------------------------------------------------===//
+// DIEValue - A debug information entry value.
+//
+class DIEValue {
+public:
+  enum {
+    isInteger,
+    isString,
+    isLabel,
+    isAsIsLabel,
+    isDelta,
+    isEntry,
+    isBlock
+  };
+  
+  unsigned Type;                      // Type of the value
+  
+  DIEValue(unsigned T) : Type(T) {}
+  virtual ~DIEValue() {}
+  
+  // Implement isa/cast/dyncast.
+  static bool classof(const DIEValue *) { return true; }
+  
+  /// EmitValue - Emit value via the Dwarf writer.
+  ///
+  virtual void EmitValue(const DwarfWriter &DW, unsigned Form) const = 0;
+  
+  /// SizeOf - Return the size of a value in bytes.
+  ///
+  virtual unsigned SizeOf(const DwarfWriter &DW, unsigned Form) const = 0;
+};
 
-/// AccessibilityString - Return the string for the specified accessibility.
-///
-static const char *AccessibilityString(unsigned Access) {
-  switch(Access) {
-    // Accessibility codes
-    case DW_ACCESS_public:                 return "ACCESS_public";
-    case DW_ACCESS_protected:              return "ACCESS_protected";
-    case DW_ACCESS_private:                return "ACCESS_private";
-  }
-  assert(0 && "Unknown Dwarf Accessibility");
-  return "";
-}
+//===----------------------------------------------------------------------===//
+// DWInteger - An integer value DIE.
+// 
+class DIEInteger : public DIEValue {
+private:
+  uint64_t Integer;
+  
+public:
+  DIEInteger(uint64_t I) : DIEValue(isInteger), Integer(I) {}
 
-/// VisibilityString - Return the string for the specified visibility.
-///
-static const char *VisibilityString(unsigned Visibility) {
-  switch(Visibility) {
-    case DW_VIS_local:                     return "VIS_local";
-    case DW_VIS_exported:                  return "VIS_exported";
-    case DW_VIS_qualified:                 return "VIS_qualified";
-  }
-  assert(0 && "Unknown Dwarf Visibility");
-  return "";
-}
+  // Implement isa/cast/dyncast.
+  static bool classof(const DIEInteger *) { return true; }
+  static bool classof(const DIEValue *I)  { return I->Type == isInteger; }
+  
+  /// BestForm - Choose the best form for integer.
+  ///
+  unsigned BestForm(bool IsSigned);
 
-/// VirtualityString - Return the string for the specified virtuality.
-///
-static const char *VirtualityString(unsigned Virtuality) {
-  switch(Virtuality) {
-    case DW_VIRTUALITY_none:               return "VIRTUALITY_none";
-    case DW_VIRTUALITY_virtual:            return "VIRTUALITY_virtual";
-    case DW_VIRTUALITY_pure_virtual:       return "VIRTUALITY_pure_virtual";
-  }
-  assert(0 && "Unknown Dwarf Virtuality");
-  return "";
-}
-
-/// LanguageString - Return the string for the specified language.
-///
-static const char *LanguageString(unsigned Language) {
-  switch(Language) {
-    case DW_LANG_C89:                      return "LANG_C89";
-    case DW_LANG_C:                        return "LANG_C";
-    case DW_LANG_Ada83:                    return "LANG_Ada83";
-    case DW_LANG_C_plus_plus:              return "LANG_C_plus_plus";
-    case DW_LANG_Cobol74:                  return "LANG_Cobol74";
-    case DW_LANG_Cobol85:                  return "LANG_Cobol85";
-    case DW_LANG_Fortran77:                return "LANG_Fortran77";
-    case DW_LANG_Fortran90:                return "LANG_Fortran90";
-    case DW_LANG_Pascal83:                 return "LANG_Pascal83";
-    case DW_LANG_Modula2:                  return "LANG_Modula2";
-    case DW_LANG_Java:                     return "LANG_Java";
-    case DW_LANG_C99:                      return "LANG_C99";
-    case DW_LANG_Ada95:                    return "LANG_Ada95";
-    case DW_LANG_Fortran95:                return "LANG_Fortran95";
-    case DW_LANG_PLI:                      return "LANG_PLI";
-    case DW_LANG_ObjC:                     return "LANG_ObjC";
-    case DW_LANG_ObjC_plus_plus:           return "LANG_ObjC_plus_plus";
-    case DW_LANG_UPC:                      return "LANG_UPC";
-    case DW_LANG_D:                        return "LANG_D";
-    case DW_LANG_lo_user:                  return "LANG_lo_user";
-    case DW_LANG_hi_user:                  return "LANG_hi_user";
-  }
-  assert(0 && "Unknown Dwarf Language");
-  return "";
-}
+  /// EmitValue - Emit integer of appropriate size.
+  ///
+  virtual void EmitValue(const DwarfWriter &DW, unsigned Form) const;
+  
+  /// SizeOf - Determine size of integer value in bytes.
+  ///
+  virtual unsigned SizeOf(const DwarfWriter &DW, unsigned Form) const;
+};
 
-/// CaseString - Return the string for the specified identifier case.
-///
-static const char *CaseString(unsigned Case) {
-   switch(Case) {
-    case DW_ID_case_sensitive:             return "ID_case_sensitive";
-    case DW_ID_up_case:                    return "ID_up_case";
-    case DW_ID_down_case:                  return "ID_down_case";
-    case DW_ID_case_insensitive:           return "ID_case_insensitive";
-  }
-  assert(0 && "Unknown Dwarf Identifier Case");
-  return "";
-}
+//===----------------------------------------------------------------------===//
+// DIEString - A string value DIE.
+// 
+struct DIEString : public DIEValue {
+  const std::string String;
+  
+  DIEString(const std::string &S) : DIEValue(isString), String(S) {}
 
-/// ConventionString - Return the string for the specified calling convention.
-///
-static const char *ConventionString(unsigned Convention) {
-   switch(Convention) {
-    case DW_CC_normal:                     return "CC_normal";
-    case DW_CC_program:                    return "CC_program";
-    case DW_CC_nocall:                     return "CC_nocall";
-    case DW_CC_lo_user:                    return "CC_lo_user";
-    case DW_CC_hi_user:                    return "CC_hi_user";
-  }
-  assert(0 && "Unknown Dwarf Calling Convention");
-  return "";
-}
+  // Implement isa/cast/dyncast.
+  static bool classof(const DIEString *) { return true; }
+  static bool classof(const DIEValue *S) { return S->Type == isString; }
+  
+  /// EmitValue - Emit string value.
+  ///
+  virtual void EmitValue(const DwarfWriter &DW, unsigned Form) const;
+  
+  /// SizeOf - Determine size of string value in bytes.
+  ///
+  virtual unsigned SizeOf(const DwarfWriter &DW, unsigned Form) const;
+};
 
-/// InlineCodeString - Return the string for the specified inline code.
-///
-static const char *InlineCodeString(unsigned Code) {
-   switch(Code) {
-    case DW_INL_not_inlined:               return "INL_not_inlined";
-    case DW_INL_inlined:                   return "INL_inlined";
-    case DW_INL_declared_not_inlined:      return "INL_declared_not_inlined";
-    case DW_INL_declared_inlined:          return "INL_declared_inlined";
-  }
-  assert(0 && "Unknown Dwarf Inline Code");
-  return "";
-}
+//===----------------------------------------------------------------------===//
+// DIEDwarfLabel - A Dwarf internal label expression DIE.
+//
+struct DIEDwarfLabel : public DIEValue {
+  const DWLabel Label;
+  
+  DIEDwarfLabel(const DWLabel &L) : DIEValue(isLabel), Label(L) {}
 
-/// ArrayOrderString - Return the string for the specified array order.
-///
-static const char *ArrayOrderString(unsigned Order) {
-   switch(Order) {
-    case DW_ORD_row_major:                 return "ORD_row_major";
-    case DW_ORD_col_major:                 return "ORD_col_major";
-  }
-  assert(0 && "Unknown Dwarf Array Order");
-  return "";
+  // Implement isa/cast/dyncast.
+  static bool classof(const DIEDwarfLabel *)  { return true; }
+  static bool classof(const DIEValue *L) { return L->Type == isLabel; }
+  
+  /// EmitValue - Emit label value.
+  ///
+  virtual void EmitValue(const DwarfWriter &DW, unsigned Form) const;
+  
+  /// SizeOf - Determine size of label value in bytes.
+  ///
+  virtual unsigned SizeOf(const DwarfWriter &DW, unsigned Form) const;
+};
+
+
+//===----------------------------------------------------------------------===//
+// DIEObjectLabel - A label to an object in code or data.
+//
+struct DIEObjectLabel : public DIEValue {
+  const std::string Label;
+  
+  DIEObjectLabel(const std::string &L) : DIEValue(isAsIsLabel), Label(L) {}
+
+  // Implement isa/cast/dyncast.
+  static bool classof(const DIEObjectLabel *) { return true; }
+  static bool classof(const DIEValue *L)    { return L->Type == isAsIsLabel; }
+  
+  /// EmitValue - Emit label value.
+  ///
+  virtual void EmitValue(const DwarfWriter &DW, unsigned Form) const;
+  
+  /// SizeOf - Determine size of label value in bytes.
+  ///
+  virtual unsigned SizeOf(const DwarfWriter &DW, unsigned Form) const;
+};
+
+//===----------------------------------------------------------------------===//
+// DIEDelta - A simple label difference DIE.
+// 
+struct DIEDelta : public DIEValue {
+  const DWLabel LabelHi;
+  const DWLabel LabelLo;
+  
+  DIEDelta(const DWLabel &Hi, const DWLabel &Lo)
+  : DIEValue(isDelta), LabelHi(Hi), LabelLo(Lo) {}
+
+  // Implement isa/cast/dyncast.
+  static bool classof(const DIEDelta *)  { return true; }
+  static bool classof(const DIEValue *D) { return D->Type == isDelta; }
+  
+  /// EmitValue - Emit delta value.
+  ///
+  virtual void EmitValue(const DwarfWriter &DW, unsigned Form) const;
+  
+  /// SizeOf - Determine size of delta value in bytes.
+  ///
+  virtual unsigned SizeOf(const DwarfWriter &DW, unsigned Form) const;
+};
+
+//===----------------------------------------------------------------------===//
+// DIEntry - A pointer to a debug information entry.
+// 
+struct DIEntry : public DIEValue {
+  DIE *Entry;
+  
+  DIEntry(DIE *E) : DIEValue(isEntry), Entry(E) {}
+
+  // Implement isa/cast/dyncast.
+  static bool classof(const DIEntry *)   { return true; }
+  static bool classof(const DIEValue *E) { return E->Type == isEntry; }
+  
+  /// EmitValue - Emit debug information entry offset.
+  ///
+  virtual void EmitValue(const DwarfWriter &DW, unsigned Form) const;
+  
+  /// SizeOf - Determine size of debug information entry in bytes.
+  ///
+  virtual unsigned SizeOf(const DwarfWriter &DW, unsigned Form) const;
+};
+
+//===----------------------------------------------------------------------===//
+// DIEBlock - A block of values.  Primarily used for location expressions.
+//
+struct DIEBlock : public DIEValue {
+  unsigned Size;                        // Size in bytes excluding size header.
+  std::vector<unsigned> Forms;          // Data forms.
+  std::vector<DIEValue *> Values;       // Block values.
+  
+  DIEBlock()
+  : DIEValue(isBlock)
+  , Size(0)
+  , Forms()
+  , Values()
+  {}
+  ~DIEBlock();
+
+  // Implement isa/cast/dyncast.
+  static bool classof(const DIEBlock *)  { return true; }
+  static bool classof(const DIEValue *E) { return E->Type == isBlock; }
+  
+  /// ComputeSize - calculate the size of the block.
+  ///
+  unsigned ComputeSize(DwarfWriter &DW);
+  
+  /// BestForm - Choose the best form for data.
+  ///
+  unsigned BestForm();
+
+  /// EmitValue - Emit block data.
+  ///
+  virtual void EmitValue(const DwarfWriter &DW, unsigned Form) const;
+  
+  /// SizeOf - Determine size of block data in bytes.
+  ///
+  virtual unsigned SizeOf(const DwarfWriter &DW, unsigned Form) const;
+
+  /// AddUInt - Add an unsigned integer value.
+  ///
+  void AddUInt(unsigned Form, uint64_t Integer);
+
+  /// AddSInt - Add an signed integer value.
+  ///
+  void AddSInt(unsigned Form, int64_t Integer);
+      
+  /// AddString - Add a std::string value.
+  ///
+  void AddString(unsigned Form, const std::string &String);
+      
+  /// AddLabel - Add a Dwarf label value.
+  ///
+  void AddLabel(unsigned Form, const DWLabel &Label);
+      
+  /// AddObjectLabel - Add a non-Dwarf label value.
+  ///
+  void AddObjectLabel(unsigned Form, const std::string &Label);
+      
+  /// AddDelta - Add a label delta value.
+  ///
+  void AddDelta(unsigned Form, const DWLabel &Hi, const DWLabel &Lo);
+      
+  /// AddDIEntry - Add a DIE value.
+  ///
+  void AddDIEntry(unsigned Form, DIE *Entry);
+
+};
+
+//===----------------------------------------------------------------------===//
+// DIE - A structured debug information entry.  Has an abbreviation which
+// describes it's organization.
+class DIE {
+private:
+  DIEAbbrev *Abbrev;                    // Temporary buffer for abbreviation.
+  unsigned AbbrevID;                    // Decribing abbreviation ID.
+  unsigned Offset;                      // Offset in debug info section.
+  unsigned Size;                        // Size of instance + children.
+  std::vector<DIE *> Children;          // Children DIEs.
+  std::vector<DIEValue *> Values;       // Attributes values.
+  
+public:
+  DIE(unsigned Tag);
+  ~DIE();
+  
+  // Accessors.
+  unsigned   getAbbrevID()                   const { return AbbrevID; }
+  unsigned   getOffset()                     const { return Offset; }
+  unsigned   getSize()                       const { return Size; }
+  const std::vector<DIE *> &getChildren()    const { return Children; }
+  const std::vector<DIEValue *> &getValues() const { return Values; }
+  void setOffset(unsigned O)                 { Offset = O; }
+  void setSize(unsigned S)                   { Size = S; }
+  
+  /// SiblingOffset - Return the offset of the debug information entry's
+  /// sibling.
+  unsigned SiblingOffset() const { return Offset + Size; }
+  
+  /// AddSiblingOffset - Add a sibling offset field to the front of the DIE.
+  ///
+  void AddSiblingOffset();
+
+  /// AddUInt - Add an unsigned integer attribute data and value.
+  ///
+  void AddUInt(unsigned Attribute, unsigned Form, uint64_t Integer);
+
+  /// AddSInt - Add an signed integer attribute data and value.
+  ///
+  void AddSInt(unsigned Attribute, unsigned Form, int64_t Integer);
+      
+  /// AddString - Add a std::string attribute data and value.
+  ///
+  void AddString(unsigned Attribute, unsigned Form,
+                 const std::string &String);
+      
+  /// AddLabel - Add a Dwarf label attribute data and value.
+  ///
+  void AddLabel(unsigned Attribute, unsigned Form, const DWLabel &Label);
+      
+  /// AddObjectLabel - Add a non-Dwarf label attribute data and value.
+  ///
+  void AddObjectLabel(unsigned Attribute, unsigned Form,
+                      const std::string &Label);
+      
+  /// AddDelta - Add a label delta attribute data and value.
+  ///
+  void AddDelta(unsigned Attribute, unsigned Form,
+                const DWLabel &Hi, const DWLabel &Lo);
+      
+  /// AddDIEntry - Add a DIE attribute data and value.
+  ///
+  void AddDIEntry(unsigned Attribute, unsigned Form, DIE *Entry);
+
+  /// AddBlock - Add block data.
+  ///
+  void AddBlock(unsigned Attribute, unsigned Form, DIEBlock *Block);
+
+  /// Complete - Indicate that all attributes have been added and
+  /// ready to get an abbreviation ID.
+  ///
+  void Complete(DwarfWriter &DW);
+  
+  /// AddChild - Add a child to the DIE.
+  void AddChild(DIE *Child);
+};
+
+} // End of namespace llvm
+
+//===----------------------------------------------------------------------===//
+
+CompileUnit::~CompileUnit() {
+  delete Die;
 }
 
-/// DiscriminantString - Return the string for the specified discriminant
-/// descriptor.
-static const char *DiscriminantString(unsigned Discriminant) {
-   switch(Discriminant) {
-    case DW_DSC_label:                     return "DSC_label";
-    case DW_DSC_range:                     return "DSC_range";
-  }
-  assert(0 && "Unknown Dwarf Discriminant Descriptor");
-  return "";
-}
-
-/// LNStandardString - Return the string for the specified line number standard.
-///
-static const char *LNStandardString(unsigned Standard) {
-   switch(Standard) {
-    case DW_LNS_copy:                      return "LNS_copy";
-    case DW_LNS_advance_pc:                return "LNS_advance_pc";
-    case DW_LNS_advance_line:              return "LNS_advance_line";
-    case DW_LNS_set_file:                  return "LNS_set_file";
-    case DW_LNS_set_column:                return "LNS_set_column";
-    case DW_LNS_negate_stmt:               return "LNS_negate_stmt";
-    case DW_LNS_set_basic_block:           return "LNS_set_basic_block";
-    case DW_LNS_const_add_pc:              return "LNS_const_add_pc";
-    case DW_LNS_fixed_advance_pc:          return "LNS_fixed_advance_pc";
-    case DW_LNS_set_prologue_end:          return "LNS_set_prologue_end";
-    case DW_LNS_set_epilogue_begin:        return "LNS_set_epilogue_begin";
-    case DW_LNS_set_isa:                   return "LNS_set_isa";
-  }
-  assert(0 && "Unknown Dwarf Line Number Standard");
-  return "";
-}
-
-/// LNExtendedString - Return the string for the specified line number extended
-/// opcode encodings.
-static const char *LNExtendedString(unsigned Encoding) {
-   switch(Encoding) {
-    // Line Number Extended Opcode Encodings
-    case DW_LNE_end_sequence:              return "LNE_end_sequence";
-    case DW_LNE_set_address:               return "LNE_set_address";
-    case DW_LNE_define_file:               return "LNE_define_file";
-    case DW_LNE_lo_user:                   return "LNE_lo_user";
-    case DW_LNE_hi_user:                   return "LNE_hi_user";
-  }
-  assert(0 && "Unknown Dwarf Line Number Extended Opcode Encoding");
-  return "";
+/// hasContent - Return true if this compile unit has something to write out.
+///
+bool CompileUnit::hasContent() const {
+  return !Die->getChildren().empty();
 }
 
-/// MacinfoString - Return the string for the specified macinfo type encodings.
+/// AddGlobal - Add a new global entity to the compile unit.
 ///
-static const char *MacinfoString(unsigned Encoding) {
-   switch(Encoding) {
-    // Macinfo Type Encodings
-    case DW_MACINFO_define:                return "MACINFO_define";
-    case DW_MACINFO_undef:                 return "MACINFO_undef";
-    case DW_MACINFO_start_file:            return "MACINFO_start_file";
-    case DW_MACINFO_end_file:              return "MACINFO_end_file";
-    case DW_MACINFO_vendor_ext:            return "MACINFO_vendor_ext";
-  }
-  assert(0 && "Unknown Dwarf Macinfo Type Encodings");
-  return "";
-}
-
-/// CallFrameString - Return the string for the specified call frame instruction
-/// encodings.
-static const char *CallFrameString(unsigned Encoding) {
-   switch(Encoding) {
-    case DW_CFA_advance_loc:               return "CFA_advance_loc";
-    case DW_CFA_offset:                    return "CFA_offset";
-    case DW_CFA_restore:                   return "CFA_restore";
-    case DW_CFA_set_loc:                   return "CFA_set_loc";
-    case DW_CFA_advance_loc1:              return "CFA_advance_loc1";
-    case DW_CFA_advance_loc2:              return "CFA_advance_loc2";
-    case DW_CFA_advance_loc4:              return "CFA_advance_loc4";
-    case DW_CFA_offset_extended:           return "CFA_offset_extended";
-    case DW_CFA_restore_extended:          return "CFA_restore_extended";
-    case DW_CFA_undefined:                 return "CFA_undefined";
-    case DW_CFA_same_value:                return "CFA_same_value";
-    case DW_CFA_register:                  return "CFA_register";
-    case DW_CFA_remember_state:            return "CFA_remember_state";
-    case DW_CFA_restore_state:             return "CFA_restore_state";
-    case DW_CFA_def_cfa:                   return "CFA_def_cfa";
-    case DW_CFA_def_cfa_register:          return "CFA_def_cfa_register";
-    case DW_CFA_def_cfa_offset:            return "CFA_def_cfa_offset";
-    case DW_CFA_def_cfa_expression:        return "CFA_def_cfa_expression";
-    case DW_CFA_expression:                return "CFA_expression";
-    case DW_CFA_offset_extended_sf:        return "CFA_offset_extended_sf";
-    case DW_CFA_def_cfa_sf:                return "CFA_def_cfa_sf";
-    case DW_CFA_def_cfa_offset_sf:         return "CFA_def_cfa_offset_sf";
-    case DW_CFA_val_offset:                return "CFA_val_offset";
-    case DW_CFA_val_offset_sf:             return "CFA_val_offset_sf";
-    case DW_CFA_val_expression:            return "CFA_val_expression";
-    case DW_CFA_lo_user:                   return "CFA_lo_user";
-    case DW_CFA_hi_user:                   return "CFA_hi_user";
-  }
-  assert(0 && "Unknown Dwarf Call Frame Instruction Encodings");
-  return "";
+void CompileUnit::AddGlobal(const std::string &Name, DIE *Die) {
+  Globals[Name] = Die;
 }
 
 //===----------------------------------------------------------------------===//
@@ -644,37 +574,56 @@ void DIEAbbrev::Emit(const DwarfWriter &DW) const {
 }
 
 #ifndef NDEBUG
-  void DIEAbbrev::print(std::ostream &O) {
-    O << "Abbreviation @"
-      << std::hex << (intptr_t)this << std::dec
+void DIEAbbrev::print(std::ostream &O) {
+  O << "Abbreviation @"
+    << std::hex << (intptr_t)this << std::dec
+    << "  "
+    << TagString(Tag)
+    << " "
+    << ChildrenString(ChildrenFlag)
+    << "\n";
+  
+  for (unsigned i = 0, N = Data.size(); i < N; ++i) {
+    O << "  "
+      << AttributeString(Data[i].getAttribute())
       << "  "
-      << TagString(Tag)
-      << " "
-      << ChildrenString(ChildrenFlag)
+      << FormEncodingString(Data[i].getForm())
       << "\n";
-    
-    for (unsigned i = 0, N = Data.size(); i < N; ++i) {
-      O << "  "
-        << AttributeString(Data[i].getAttribute())
-        << "  "
-        << FormEncodingString(Data[i].getForm())
-        << "\n";
-    }
   }
-  void DIEAbbrev::dump() { print(std::cerr); }
+}
+void DIEAbbrev::dump() { print(std::cerr); }
 #endif
 
 //===----------------------------------------------------------------------===//
 
+/// BestForm - Choose the best form for integer.
+///
+unsigned DIEInteger::BestForm(bool IsSigned) {
+  if (IsSigned) {
+    if ((char)Integer == (signed)Integer)   return DW_FORM_data1;
+    if ((short)Integer == (signed)Integer)  return DW_FORM_data2;
+    if ((int)Integer == (signed)Integer)    return DW_FORM_data4;
+  } else {
+    if ((unsigned char)Integer == Integer)  return DW_FORM_data1;
+    if ((unsigned short)Integer == Integer) return DW_FORM_data2;
+    if ((unsigned int)Integer == Integer)   return DW_FORM_data4;
+  }
+  return DW_FORM_data8;
+}
+    
 /// EmitValue - Emit integer of appropriate size.
 ///
 void DIEInteger::EmitValue(const DwarfWriter &DW, unsigned Form) const {
   switch (Form) {
   case DW_FORM_flag:  // Fall thru
-  case DW_FORM_data1: DW.EmitByte(Integer);         break;
-  case DW_FORM_data2: DW.EmitShort(Integer);        break;
-  case DW_FORM_data4: DW.EmitLong(Integer);         break;
-  case DW_FORM_data8: DW.EmitLongLong(Integer);     break;
+  case DW_FORM_ref1:  // Fall thru
+  case DW_FORM_data1: DW.EmitInt8(Integer);         break;
+  case DW_FORM_ref2:  // Fall thru
+  case DW_FORM_data2: DW.EmitInt16(Integer);        break;
+  case DW_FORM_ref4:  // Fall thru
+  case DW_FORM_data4: DW.EmitInt32(Integer);        break;
+  case DW_FORM_ref8:  // Fall thru
+  case DW_FORM_data8: DW.EmitInt64(Integer);        break;
   case DW_FORM_udata: DW.EmitULEB128Bytes(Integer); break;
   case DW_FORM_sdata: DW.EmitSLEB128Bytes(Integer); break;
   default: assert(0 && "DIE Value form not supported yet"); break;
@@ -686,9 +635,13 @@ void DIEInteger::EmitValue(const DwarfWriter &DW, unsigned Form) const {
 unsigned DIEInteger::SizeOf(const DwarfWriter &DW, unsigned Form) const {
   switch (Form) {
   case DW_FORM_flag:  // Fall thru
+  case DW_FORM_ref1:  // Fall thru
   case DW_FORM_data1: return sizeof(int8_t);
+  case DW_FORM_ref2:  // Fall thru
   case DW_FORM_data2: return sizeof(int16_t);
+  case DW_FORM_ref4:  // Fall thru
   case DW_FORM_data4: return sizeof(int32_t);
+  case DW_FORM_ref8:  // Fall thru
   case DW_FORM_data8: return sizeof(int64_t);
   case DW_FORM_udata: return DW.SizeULEB128(Integer);
   case DW_FORM_sdata: return DW.SizeSLEB128(Integer);
@@ -722,7 +675,7 @@ void DIEDwarfLabel::EmitValue(const DwarfWriter &DW, unsigned Form) const {
 /// SizeOf - Determine size of label value in bytes.
 ///
 unsigned DIEDwarfLabel::SizeOf(const DwarfWriter &DW, unsigned Form) const {
-  return DW.getAddressSize();
+  return DW.getTargetAsmInfo()->getAddressSize();
 }
     
 //===----------------------------------------------------------------------===//
@@ -730,19 +683,13 @@ unsigned DIEDwarfLabel::SizeOf(const DwarfWriter &DW, unsigned Form) const {
 /// EmitValue - Emit label value.
 ///
 void DIEObjectLabel::EmitValue(const DwarfWriter &DW, unsigned Form) const {
-  DW.EmitByte(sizeof(int8_t) + DW.getAddressSize());
-  DW.EOL("DW_FORM_block1 length");
-  
-  DW.EmitByte(DW_OP_addr);
-  DW.EOL("DW_OP_addr");
-  
   DW.EmitReference(Label);
 }
 
 /// SizeOf - Determine size of label value in bytes.
 ///
 unsigned DIEObjectLabel::SizeOf(const DwarfWriter &DW, unsigned Form) const {
-  return sizeof(int8_t) + sizeof(int8_t) + DW.getAddressSize();
+  return DW.getTargetAsmInfo()->getAddressSize();
 }
     
 //===----------------------------------------------------------------------===//
@@ -756,17 +703,17 @@ void DIEDelta::EmitValue(const DwarfWriter &DW, unsigned Form) const {
 /// SizeOf - Determine size of delta value in bytes.
 ///
 unsigned DIEDelta::SizeOf(const DwarfWriter &DW, unsigned Form) const {
-  return DW.getAddressSize();
+  return DW.getTargetAsmInfo()->getAddressSize();
 }
 
 //===----------------------------------------------------------------------===//
-/// EmitValue - Emit extry offset.
+/// EmitValue - Emit debug information entry offset.
 ///
 void DIEntry::EmitValue(const DwarfWriter &DW, unsigned Form) const {
-  DW.EmitLong(Entry->getOffset());
+  DW.EmitInt32(Entry->getOffset());
 }
 
-/// SizeOf - Determine size of label value in bytes.
+/// SizeOf - Determine size of debug information entry value in bytes.
 ///
 unsigned DIEntry::SizeOf(const DwarfWriter &DW, unsigned Form) const {
   return sizeof(int32_t);
@@ -774,12 +721,120 @@ unsigned DIEntry::SizeOf(const DwarfWriter &DW, unsigned Form) const {
     
 //===----------------------------------------------------------------------===//
 
-DIE::DIE(unsigned Tag, unsigned ChildrenFlag)
-: Abbrev(new DIEAbbrev(Tag, ChildrenFlag))
+DIEBlock::~DIEBlock() {
+  for (unsigned i = 0, N = Values.size(); i < N; ++i) {
+    delete Values[i];
+  }
+}
+
+/// ComputeSize - calculate the size of the block.
+///
+unsigned DIEBlock::ComputeSize(DwarfWriter &DW) {
+  Size = 0;
+  for (unsigned i = 0, N = Values.size(); i < N; ++i) {
+    Size += Values[i]->SizeOf(DW, Forms[i]);
+  }
+  return Size;
+}
+
+/// BestForm - Choose the best form for data.
+///
+unsigned DIEBlock::BestForm() {
+  if ((unsigned char)Size == Size)  return DW_FORM_block1;
+  if ((unsigned short)Size == Size) return DW_FORM_block2;
+  if ((unsigned int)Size == Size)   return DW_FORM_block4;
+  return DW_FORM_block;
+}
+
+/// EmitValue - Emit block data.
+///
+void DIEBlock::EmitValue(const DwarfWriter &DW, unsigned Form) const {
+  switch (Form) {
+  case DW_FORM_block1: DW.EmitInt8(Size);         break;
+  case DW_FORM_block2: DW.EmitInt16(Size);        break;
+  case DW_FORM_block4: DW.EmitInt32(Size);        break;
+  case DW_FORM_block:  DW.EmitULEB128Bytes(Size); break;
+  default: assert(0 && "Improper form for block"); break;
+  }
+  for (unsigned i = 0, N = Values.size(); i < N; ++i) {
+    DW.EOL("");
+    Values[i]->EmitValue(DW, Forms[i]);
+  }
+}
+
+/// SizeOf - Determine size of block data in bytes.
+///
+unsigned DIEBlock::SizeOf(const DwarfWriter &DW, unsigned Form) const {
+  switch (Form) {
+  case DW_FORM_block1: return Size + sizeof(int8_t);
+  case DW_FORM_block2: return Size + sizeof(int16_t);
+  case DW_FORM_block4: return Size + sizeof(int32_t);
+  case DW_FORM_block: return Size + DW.SizeULEB128(Size);
+  default: assert(0 && "Improper form for block"); break;
+  }
+  return 0;
+}
+
+/// AddUInt - Add an unsigned integer value.
+///
+void DIEBlock::AddUInt(unsigned Form, uint64_t Integer) {
+  DIEInteger *DI = new DIEInteger(Integer);
+  Values.push_back(DI);
+  if (Form == 0) Form = DI->BestForm(false);
+  Forms.push_back(Form);
+}
+
+/// AddSInt - Add an signed integer value.
+///
+void DIEBlock::AddSInt(unsigned Form, int64_t Integer) {
+  DIEInteger *DI = new DIEInteger(Integer);
+  Values.push_back(DI);
+  if (Form == 0) Form = DI->BestForm(true);
+  Forms.push_back(Form);
+}
+    
+/// AddString - Add a std::string value.
+///
+void DIEBlock::AddString(unsigned Form, const std::string &String) {
+  Values.push_back(new DIEString(String));
+  Forms.push_back(Form);
+}
+    
+/// AddLabel - Add a Dwarf label value.
+///
+void DIEBlock::AddLabel(unsigned Form, const DWLabel &Label) {
+  Values.push_back(new DIEDwarfLabel(Label));
+  Forms.push_back(Form);
+}
+    
+/// AddObjectLabel - Add a non-Dwarf label value.
+///
+void DIEBlock::AddObjectLabel(unsigned Form, const std::string &Label) {
+  Values.push_back(new DIEObjectLabel(Label));
+  Forms.push_back(Form);
+}
+    
+/// AddDelta - Add a label delta value.
+///
+void DIEBlock::AddDelta(unsigned Form, const DWLabel &Hi, const DWLabel &Lo) {
+  Values.push_back(new DIEDelta(Hi, Lo));
+  Forms.push_back(Form);
+}
+    
+/// AddDIEntry - Add a DIE value.
+///
+void DIEBlock::AddDIEntry(unsigned Form, DIE *Entry) {
+  Values.push_back(new DIEntry(Entry));
+  Forms.push_back(Form);
+}
+
+//===----------------------------------------------------------------------===//
+
+DIE::DIE(unsigned Tag)
+: Abbrev(new DIEAbbrev(Tag, DW_CHILDREN_no))
 , AbbrevID(0)
 , Offset(0)
 , Size(0)
-, Context(NULL)
 , Children()
 , Values()
 {}
@@ -794,74 +849,80 @@ DIE::~DIE() {
   for (unsigned j = 0, M = Values.size(); j < M; ++j) {
     delete Values[j];
   }
-  
-  if (Context) delete Context;
 }
     
+/// AddSiblingOffset - Add a sibling offset field to the front of the DIE.
+///
+void DIE::AddSiblingOffset() {
+  DIEInteger *DI = new DIEInteger(0);
+  Values.insert(Values.begin(), DI);
+  Abbrev->AddFirstAttribute(DW_AT_sibling, DW_FORM_ref4);
+}
+
 /// AddUInt - Add an unsigned integer attribute data and value.
 ///
 void DIE::AddUInt(unsigned Attribute, unsigned Form, uint64_t Integer) {
-  if (Form == 0) {
-      if ((unsigned char)Integer == Integer)       Form = DW_FORM_data1;
-      else if ((unsigned short)Integer == Integer) Form = DW_FORM_data2;
-      else if ((unsigned int)Integer == Integer)   Form = DW_FORM_data4;
-      else                                         Form = DW_FORM_data8;
-  }
+  DIEInteger *DI = new DIEInteger(Integer);
+  Values.push_back(DI);
+  if (!Form) Form = DI->BestForm(false);
   Abbrev->AddAttribute(Attribute, Form);
-  Values.push_back(new DIEInteger(Integer));
 }
     
 /// AddSInt - Add an signed integer attribute data and value.
 ///
 void DIE::AddSInt(unsigned Attribute, unsigned Form, int64_t Integer) {
-  if (Form == 0) {
-      if ((char)Integer == Integer)       Form = DW_FORM_data1;
-      else if ((short)Integer == Integer) Form = DW_FORM_data2;
-      else if ((int)Integer == Integer)   Form = DW_FORM_data4;
-      else                                Form = DW_FORM_data8;
-  }
+  DIEInteger *DI = new DIEInteger(Integer);
+  Values.push_back(DI);
+  if (!Form) Form = DI->BestForm(true);
   Abbrev->AddAttribute(Attribute, Form);
-  Values.push_back(new DIEInteger(Integer));
 }
     
 /// AddString - Add a std::string attribute data and value.
 ///
 void DIE::AddString(unsigned Attribute, unsigned Form,
                     const std::string &String) {
-  Abbrev->AddAttribute(Attribute, Form);
   Values.push_back(new DIEString(String));
+  Abbrev->AddAttribute(Attribute, Form);
 }
     
 /// AddLabel - Add a Dwarf label attribute data and value.
 ///
 void DIE::AddLabel(unsigned Attribute, unsigned Form,
                    const DWLabel &Label) {
-  Abbrev->AddAttribute(Attribute, Form);
   Values.push_back(new DIEDwarfLabel(Label));
+  Abbrev->AddAttribute(Attribute, Form);
 }
     
 /// AddObjectLabel - Add an non-Dwarf label attribute data and value.
 ///
 void DIE::AddObjectLabel(unsigned Attribute, unsigned Form,
                          const std::string &Label) {
-  Abbrev->AddAttribute(Attribute, Form);
   Values.push_back(new DIEObjectLabel(Label));
+  Abbrev->AddAttribute(Attribute, Form);
 }
     
 /// AddDelta - Add a label delta attribute data and value.
 ///
 void DIE::AddDelta(unsigned Attribute, unsigned Form,
                    const DWLabel &Hi, const DWLabel &Lo) {
-  Abbrev->AddAttribute(Attribute, Form);
   Values.push_back(new DIEDelta(Hi, Lo));
+  Abbrev->AddAttribute(Attribute, Form);
 }
     
 /// AddDIEntry - Add a DIE attribute data and value.
 ///
-void DIE::AddDIEntry(unsigned Attribute,
-                     unsigned Form, DIE *Entry) {
-  Abbrev->AddAttribute(Attribute, Form);
+void DIE::AddDIEntry(unsigned Attribute, unsigned Form, DIE *Entry) {
   Values.push_back(new DIEntry(Entry));
+  Abbrev->AddAttribute(Attribute, Form);
+}
+
+/// AddBlock - Add block data.
+///
+void DIE::AddBlock(unsigned Attribute, unsigned Form, DIEBlock *Block) {
+  assert(Block->Size && "Block size has not been computed");
+  Values.push_back(Block);
+  if (!Form) Form = Block->BestForm();
+  Abbrev->AddAttribute(Attribute, Form);
 }
 
 /// Complete - Indicate that all attributes have been added and ready to get an
@@ -875,115 +936,14 @@ void DIE::Complete(DwarfWriter &DW) {
 /// AddChild - Add a child to the DIE.
 ///
 void DIE::AddChild(DIE *Child) {
+  assert(Abbrev && "Adding children without an abbreviation");
+  Abbrev->setChildrenFlag(DW_CHILDREN_yes);
   Children.push_back(Child);
 }
 
 //===----------------------------------------------------------------------===//
 
-/// NewBasicType - Creates a new basic type if necessary, then adds to the
-/// context and owner.
-DIE *DWContext::NewBasicType(const Type *Ty, unsigned Size, unsigned Align) {
-  DIE *TypeDie = Types[Ty];
-  
-  // If first occurance of type.
-  if (!TypeDie) {
-    const char *Name;
-    unsigned Encoding = 0;
-    
-    switch (Ty->getTypeID()) {
-    case Type::UByteTyID:
-      Name = "unsigned char";
-      Encoding = DW_ATE_unsigned_char;
-      break;
-    case Type::SByteTyID:
-      Name = "char";
-      Encoding = DW_ATE_signed_char;
-      break;
-    case Type::UShortTyID:
-      Name = "unsigned short";
-      Encoding = DW_ATE_unsigned;
-      break;
-    case Type::ShortTyID:
-      Name = "short";
-      Encoding = DW_ATE_signed;
-      break;
-    case Type::UIntTyID:
-      Name = "unsigned int";
-      Encoding = DW_ATE_unsigned;
-      break;
-    case Type::IntTyID:
-      Name = "int";
-      Encoding = DW_ATE_signed;
-      break;
-    case Type::ULongTyID:
-      Name = "unsigned long long";
-      Encoding = DW_ATE_unsigned;
-      break;
-    case Type::LongTyID:
-      Name = "long long";
-      Encoding = DW_ATE_signed;
-      break;
-    case Type::FloatTyID:
-      Name = "float";
-      Encoding = DW_ATE_float;
-      break;
-    case Type::DoubleTyID:
-      Name = "float";
-      Encoding = DW_ATE_float;
-      break;
-    default: 
-    // FIXME - handle more complex types.
-      Name = "unknown";
-      Encoding = DW_ATE_address;
-      break;
-    }
-    
-    // construct the type DIE.
-    TypeDie = new DIE(DW_TAG_base_type, DW_CHILDREN_no);
-    TypeDie->AddString(DW_AT_name,      DW_FORM_string, Name);
-    TypeDie->AddUInt  (DW_AT_byte_size, DW_FORM_data1,  Size);
-    TypeDie->AddUInt  (DW_AT_encoding,  DW_FORM_data1,  Encoding);
-    TypeDie->Complete(DW);
-    
-    // Add to context owner.
-    Owner->AddChild(TypeDie);
-
-    // Add to map.
-    Types[Ty] = TypeDie;
-  }
-  
-  return TypeDie;
-}
-
-/// NewGlobalVariable - Creates a global variable, if necessary, then adds in
-/// the context and owner.
-DIE *DWContext::NewGlobalVariable(const std::string &Name,
-                                  const std::string &MangledName,
-                                  DIE *Type) {
-  DIE *VariableDie = Variables[MangledName];
-  
-  // If first occurance of variable.
-  if (!VariableDie) {
-    // FIXME - need source file name line number.
-    VariableDie = new DIE(DW_TAG_variable, DW_CHILDREN_no);
-    VariableDie->AddString     (DW_AT_name,      DW_FORM_string, Name);
-    VariableDie->AddUInt       (DW_AT_decl_file, 0,              0);
-    VariableDie->AddUInt       (DW_AT_decl_line, 0,              0);
-    VariableDie->AddDIEntry    (DW_AT_type,      DW_FORM_ref4,   Type);
-    VariableDie->AddUInt       (DW_AT_external,  DW_FORM_flag,   1);
-    // FIXME - needs to be a proper expression.
-    VariableDie->AddObjectLabel(DW_AT_location,  DW_FORM_block1, MangledName);
-    VariableDie->Complete(DW);
-    // Add to context owner.
-    Owner->AddChild(VariableDie);
-    
-    // Add to map.
-    Variables[MangledName] = VariableDie;
-  }
-  
-  return VariableDie;
-}
+/// DwarfWriter
 
 //===----------------------------------------------------------------------===//
 
@@ -996,23 +956,29 @@ void DwarfWriter::PrintHex(int Value) const {
 /// EOL - Print a newline character to asm stream.  If a comment is present
 /// then it will be printed first.  Comments should not contain '\n'.
 void DwarfWriter::EOL(const std::string &Comment) const {
-  if (DwarfVerbose) {
+  if (DwarfVerbose && !Comment.empty()) {
     O << "\t"
-      << Asm->CommentString
+      << TAI->getCommentString()
       << " "
       << Comment;
   }
   O << "\n";
 }
 
+/// EmitAlign - Print a align directive.
+///
+void DwarfWriter::EmitAlign(unsigned Alignment) const {
+  O << TAI->getAlignDirective() << Alignment << "\n";
+}
+
 /// EmitULEB128Bytes - Emit an assembler byte data directive to compose an
 /// unsigned leb128 value.
 void DwarfWriter::EmitULEB128Bytes(unsigned Value) const {
-  if (hasLEB128) {
+  if (TAI->hasLEB128()) {
     O << "\t.uleb128\t"
       << Value;
   } else {
-    O << Asm->Data8bitsDirective;
+    O << TAI->getData8bitsDirective();
     PrintULEB128(Value);
   }
 }
@@ -1020,11 +986,11 @@ void DwarfWriter::EmitULEB128Bytes(unsigned Value) const {
 /// EmitSLEB128Bytes - Emit an assembler byte data directive to compose a
 /// signed leb128 value.
 void DwarfWriter::EmitSLEB128Bytes(int Value) const {
-  if (hasLEB128) {
+  if (TAI->hasLEB128()) {
     O << "\t.sleb128\t"
       << Value;
   } else {
-    O << Asm->Data8bitsDirective;
+    O << TAI->getData8bitsDirective();
     PrintSLEB128(Value);
   }
 }
@@ -1084,41 +1050,39 @@ unsigned DwarfWriter::SizeSLEB128(int Value) {
   return Size;
 }
 
-/// EmitByte - Emit a byte directive and value.
+/// EmitInt8 - Emit a byte directive and value.
 ///
-void DwarfWriter::EmitByte(int Value) const {
-  O << Asm->Data8bitsDirective;
-  PrintHex(Value);
+void DwarfWriter::EmitInt8(int Value) const {
+  O << TAI->getData8bitsDirective();
+  PrintHex(Value & 0xFF);
 }
 
-/// EmitShort - Emit a short directive and value.
+/// EmitInt16 - Emit a short directive and value.
 ///
-void DwarfWriter::EmitShort(int Value) const {
-  O << Asm->Data16bitsDirective;
-  PrintHex(Value);
+void DwarfWriter::EmitInt16(int Value) const {
+  O << TAI->getData16bitsDirective();
+  PrintHex(Value & 0xFFFF);
 }
 
-/// EmitLong - Emit a long directive and value.
+/// EmitInt32 - Emit a long directive and value.
 ///
-void DwarfWriter::EmitLong(int Value) const {
-  O << Asm->Data32bitsDirective;
+void DwarfWriter::EmitInt32(int Value) const {
+  O << TAI->getData32bitsDirective();
   PrintHex(Value);
 }
 
-/// EmitLongLong - Emit a long long directive and value.
+/// EmitInt64 - Emit a long long directive and value.
 ///
-void DwarfWriter::EmitLongLong(uint64_t Value) const {
-  if (Asm->Data64bitsDirective) {
-    O << Asm->Data64bitsDirective << "0x" << std::hex << Value << std::dec;
+void DwarfWriter::EmitInt64(uint64_t Value) const {
+  if (TAI->getData64bitsDirective()) {
+    O << TAI->getData64bitsDirective() << "0x" << std::hex << Value << std::dec;
   } else {
-    const TargetData &TD = Asm->TM.getTargetData();
-    
-    if (TD.isBigEndian()) {
-      EmitLong(unsigned(Value >> 32)); O << "\n";
-      EmitLong(unsigned(Value));
+    if (TD->isBigEndian()) {
+      EmitInt32(unsigned(Value >> 32)); O << "\n";
+      EmitInt32(unsigned(Value));
     } else {
-      EmitLong(unsigned(Value)); O << "\n";
-      EmitLong(unsigned(Value >> 32));
+      EmitInt32(unsigned(Value)); O << "\n";
+      EmitInt32(unsigned(Value >> 32));
     }
   }
 }
@@ -1126,7 +1090,7 @@ void DwarfWriter::EmitLongLong(uint64_t Value) const {
 /// EmitString - Emit a string with quotes and a null terminator.
 /// Special characters are emitted properly. (Eg. '\t')
 void DwarfWriter::EmitString(const std::string &String) const {
-  O << Asm->AsciiDirective
+  O << TAI->getAsciiDirective()
     << "\"";
   for (unsigned i = 0, N = String.size(); i < N; ++i) {
     unsigned char C = String[i];
@@ -1140,9 +1104,9 @@ void DwarfWriter::EmitString(const std::string &String) const {
       case '\t': O << "\\t"; break;
       default:
         O << '\\';
-        O << char('0' + (C >> 6));
-        O << char('0' + (C >> 3));
-        O << char('0' + (C >> 0));
+        O << char('0' + ((C >> 6) & 7));
+        O << char('0' + ((C >> 3) & 7));
+        O << char('0' + ((C >> 0) & 7));
         break;
       }
     } else if (C == '\"') {
@@ -1159,10 +1123,10 @@ void DwarfWriter::EmitString(const std::string &String) const {
 /// PrintLabelName - Print label name in form used by Dwarf writer.
 ///
 void DwarfWriter::PrintLabelName(const char *Tag, unsigned Number) const {
-  O << Asm->PrivateGlobalPrefix
+  O << TAI->getPrivateGlobalPrefix()
     << "debug_"
-    << Tag
-    << Number;
+    << Tag;
+  if (Number) O << Number;
 }
 
 /// EmitLabel - Emit location label for internal use by Dwarf.
@@ -1175,18 +1139,18 @@ void DwarfWriter::EmitLabel(const char *Tag, unsigned Number) const {
 /// EmitReference - Emit a reference to a label.
 ///
 void DwarfWriter::EmitReference(const char *Tag, unsigned Number) const {
-  if (AddressSize == 4)
-    O << Asm->Data32bitsDirective;
+  if (TAI->getAddressSize() == 4)
+    O << TAI->getData32bitsDirective();
   else
-    O << Asm->Data64bitsDirective;
+    O << TAI->getData64bitsDirective();
     
   PrintLabelName(Tag, Number);
 }
 void DwarfWriter::EmitReference(const std::string &Name) const {
-  if (AddressSize == 4)
-    O << Asm->Data32bitsDirective;
+  if (TAI->getAddressSize() == 4)
+    O << TAI->getData32bitsDirective();
   else
-    O << Asm->Data64bitsDirective;
+    O << TAI->getData64bitsDirective();
     
   O << Name;
 }
@@ -1196,7 +1160,7 @@ void DwarfWriter::EmitReference(const std::string &Name) const {
 /// is an option (needsSet) to use an intermediary 'set' expression.
 void DwarfWriter::EmitDifference(const char *TagHi, unsigned NumberHi,
                                  const char *TagLo, unsigned NumberLo) const {
-  if (needsSet) {
+  if (TAI->needsSet()) {
     static unsigned SetCounter = 0;
     
     O << "\t.set\t";
@@ -1207,19 +1171,19 @@ void DwarfWriter::EmitDifference(const char *TagHi, unsigned NumberHi,
     PrintLabelName(TagLo, NumberLo);
     O << "\n";
     
-    if (AddressSize == sizeof(int32_t))
-      O << Asm->Data32bitsDirective;
+    if (TAI->getAddressSize() == sizeof(int32_t))
+      O << TAI->getData32bitsDirective();
     else
-      O << Asm->Data64bitsDirective;
+      O << TAI->getData64bitsDirective();
       
     PrintLabelName("set", SetCounter);
     
     ++SetCounter;
   } else {
-    if (AddressSize == sizeof(int32_t))
-      O << Asm->Data32bitsDirective;
+    if (TAI->getAddressSize() == sizeof(int32_t))
+      O << TAI->getData32bitsDirective();
     else
-      O << Asm->Data64bitsDirective;
+      O << TAI->getData64bitsDirective();
       
     PrintLabelName(TagHi, NumberHi);
     O << "-";
@@ -1240,67 +1204,626 @@ DWLabel DwarfWriter::NewString(const std::string &String) {
   return DWLabel("string", StringID);
 }
 
-/// NewGlobalType - Make the type visible globally using the given name.
+/// AddSourceLine - Add location information to specified debug information
+/// entry.
+void DwarfWriter::AddSourceLine(DIE *Die, CompileUnitDesc *File, unsigned Line){
+  if (File && Line) {
+    CompileUnit *FileUnit = FindCompileUnit(File);
+    unsigned FileID = FileUnit->getID();
+    Die->AddUInt(DW_AT_decl_file, 0, FileID);
+    Die->AddUInt(DW_AT_decl_line, 0, Line);
+  }
+}
+
+/// AddAddress - Add an address attribute to a die based on the location
+/// provided.
+void DwarfWriter::AddAddress(DIE *Die, unsigned Attribute,
+                             const MachineLocation &Location) {
+  DIEBlock *Block = new DIEBlock();
+  unsigned Reg = RI->getDwarfRegNum(Location.getRegister());
+  
+  if (Location.isRegister()) {
+    if (Reg < 32) {
+      Block->AddUInt(DW_FORM_data1, DW_OP_reg0 + Reg);
+    } else {
+      Block->AddUInt(DW_FORM_data1, DW_OP_regx);
+      Block->AddUInt(DW_FORM_udata, Reg);
+    }
+  } else {
+    if (Reg < 32) {
+      Block->AddUInt(DW_FORM_data1, DW_OP_breg0 + Reg);
+    } else {
+      Block->AddUInt(DW_FORM_data1, DW_OP_bregx);
+      Block->AddUInt(DW_FORM_udata, Reg);
+    }
+    Block->AddUInt(DW_FORM_sdata, Location.getOffset());
+  }
+  Block->ComputeSize(*this);
+  Die->AddBlock(Attribute, 0, Block);
+}
+
+/// getDieMapSlotFor - Returns the debug information entry map slot for the
+/// specified debug descriptor.
+DIE *&DwarfWriter::getDieMapSlotFor(DebugInfoDesc *DD) {
+  return DescToDieMap[DD];
+}
+
+/// NewType - Create a new type DIE.
 ///
-void DwarfWriter::NewGlobalType(const std::string &Name, DIE *Type) {
-  assert(!GlobalTypes[Name] && "Duplicate global type");
-  GlobalTypes[Name] = Type;
+DIE *DwarfWriter::NewType(DIE *Context, TypeDesc *TyDesc, CompileUnit *Unit) {
+  if (!TyDesc) {
+    // FIXME - Hack for missing types
+    DIE *Die = new DIE(DW_TAG_base_type);
+    Die->AddUInt(DW_AT_byte_size, 0, 4);
+    Die->AddUInt(DW_AT_encoding, DW_FORM_data1, DW_ATE_signed);
+    Unit->getDie()->AddChild(Die);
+    return Die;
+  }
+  
+  // Check for pre-existence.
+  DIE *&Slot = Unit->getDieMapSlotFor(TyDesc);
+  if (Slot) return Slot;
+
+  // Get core information.
+  const std::string &Name = TyDesc->getName();
+  uint64_t Size = TyDesc->getSize() >> 3;
+  
+  DIE *Ty = NULL;
+  
+  if (BasicTypeDesc *BasicTy = dyn_cast<BasicTypeDesc>(TyDesc)) {
+    // Fundamental types like int, float, bool
+    Slot = Ty = new DIE(DW_TAG_base_type);
+    unsigned Encoding = BasicTy->getEncoding();
+    Ty->AddUInt(DW_AT_encoding,  DW_FORM_data1, Encoding);
+  } else if (DerivedTypeDesc *DerivedTy = dyn_cast<DerivedTypeDesc>(TyDesc)) {
+    // Create specific DIE.
+    Slot = Ty = new DIE(DerivedTy->getTag());
+    
+    // Map to main type, void will not have a type.
+    if (TypeDesc *FromTy = DerivedTy->getFromType()) {
+      Ty->AddDIEntry(DW_AT_type, DW_FORM_ref4,
+                     NewType(Context, FromTy, Unit));
+    }
+  } else if (CompositeTypeDesc *CompTy = dyn_cast<CompositeTypeDesc>(TyDesc)) {
+    // Fetch tag
+    unsigned Tag = CompTy->getTag();
+    
+    // Create specific DIE.
+    Slot = Ty = Tag == DW_TAG_vector_type ? new DIE(DW_TAG_array_type) :
+                                            new DIE(Tag);
+    
+    std::vector<DebugInfoDesc *> &Elements = CompTy->getElements();
+    
+    switch (Tag) {
+    case DW_TAG_vector_type: Ty->AddUInt(DW_AT_GNU_vector, DW_FORM_flag, 1);
+      // Fall thru
+    case DW_TAG_array_type: {
+      // Add element type.
+      if (TypeDesc *FromTy = CompTy->getFromType()) {
+        Ty->AddDIEntry(DW_AT_type, DW_FORM_ref4,
+                       NewType(Context, FromTy, Unit));
+      }
+      
+      // Don't emit size attribute.
+      Size = 0;
+      
+      // Construct an anonymous type for index type.
+      DIE *IndexTy = new DIE(DW_TAG_base_type);
+      IndexTy->AddUInt(DW_AT_byte_size, 0, 4);
+      IndexTy->AddUInt(DW_AT_encoding, DW_FORM_data1, DW_ATE_signed);
+      // Add to context.
+      Context->AddChild(IndexTy);
+    
+      // Add subranges to array type.
+      for(unsigned i = 0, N = Elements.size(); i < N; ++i) {
+        SubrangeDesc *SRD = cast<SubrangeDesc>(Elements[i]);
+        int64_t Lo = SRD->getLo();
+        int64_t Hi = SRD->getHi();
+        DIE *Subrange = new DIE(DW_TAG_subrange_type);
+        
+        // If a range is available.
+        if (Lo != Hi) {
+          Subrange->AddDIEntry(DW_AT_type, DW_FORM_ref4, IndexTy);
+          // Only add low if non-zero.
+          if (Lo) Subrange->AddSInt(DW_AT_lower_bound, 0, Lo);
+          Subrange->AddSInt(DW_AT_upper_bound, 0, Hi);
+        }
+        Ty->AddChild(Subrange);
+      }
+      
+      break;
+    }
+    case DW_TAG_structure_type:
+    case DW_TAG_union_type: {
+      // Add elements to structure type.
+      for(unsigned i = 0, N = Elements.size(); i < N; ++i) {
+        DebugInfoDesc *Element = Elements[i];
+        
+        if (DerivedTypeDesc *MemberDesc = dyn_cast<DerivedTypeDesc>(Element)) {
+          // Add field or base class.
+          
+          unsigned Tag = MemberDesc->getTag();
+        
+          // Extract the basic information.
+          const std::string &Name = MemberDesc->getName();
+          TypeDesc *MemTy = MemberDesc->getFromType();
+          uint64_t Size = MemberDesc->getSize();
+          uint64_t Align = MemberDesc->getAlign();
+          uint64_t Offset = MemberDesc->getOffset();
+     
+          // Construct member debug information entry.
+          DIE *Member = new DIE(Tag);
+          
+          // Add name if not "".
+          if (!Name.empty())Member->AddString(DW_AT_name, DW_FORM_string, Name);
+          // Add location if available.
+          AddSourceLine(Member, MemberDesc->getFile(), MemberDesc->getLine());
+          
+          // Most of the time the field info is the same as the members.
+          uint64_t FieldSize = Size;
+          uint64_t FieldAlign = Align;
+          uint64_t FieldOffset = Offset;
+          
+          if (TypeDesc *FromTy = MemberDesc->getFromType()) {
+            Member->AddDIEntry(DW_AT_type, DW_FORM_ref4,
+                               NewType(Context, FromTy, Unit));
+            FieldSize = FromTy->getSize();
+            FieldAlign = FromTy->getSize();
+          }
+          
+          // Unless we have a bit field.
+          if (Tag == DW_TAG_member && FieldSize != Size) {
+            // Construct the alignment mask.
+            uint64_t AlignMask = ~(FieldAlign - 1);
+            // Determine the high bit + 1 of the declared size.
+            uint64_t HiMark = (Offset + FieldSize) & AlignMask;
+            // Work backwards to determine the base offset of the field.
+            FieldOffset = HiMark - FieldSize;
+            // Now normalize offset to the field.
+            Offset -= FieldOffset;
+            
+            // Maybe we need to work from the other end.
+            if (TD->isLittleEndian()) Offset = FieldSize - (Offset + Size);
+            
+            // Add size and offset.
+            Member->AddUInt(DW_AT_byte_size, 0, FieldSize >> 3);
+            Member->AddUInt(DW_AT_bit_size, 0, Size);
+            Member->AddUInt(DW_AT_bit_offset, 0, Offset);
+          }
+          
+          // Add computation for offset.
+          DIEBlock *Block = new DIEBlock();
+          Block->AddUInt(DW_FORM_data1, DW_OP_plus_uconst);
+          Block->AddUInt(DW_FORM_udata, FieldOffset >> 3);
+          Block->ComputeSize(*this);
+          Member->AddBlock(DW_AT_data_member_location, 0, Block);
+
+          // Add accessibility (public default unless is base class.
+          if (MemberDesc->isProtected()) {
+            Member->AddUInt(DW_AT_accessibility, 0, DW_ACCESS_protected);
+          } else if (MemberDesc->isPrivate()) {
+            Member->AddUInt(DW_AT_accessibility, 0, DW_ACCESS_private);
+          } else if (Tag == DW_TAG_inheritance) {
+            Member->AddUInt(DW_AT_accessibility, 0, DW_ACCESS_public);
+          }
+          
+          Ty->AddChild(Member);
+        } else if (GlobalVariableDesc *StaticDesc =
+                                        dyn_cast<GlobalVariableDesc>(Element)) {
+          // Add static member.
+          
+          // Construct member debug information entry.
+          DIE *Static = new DIE(DW_TAG_variable);
+          
+          // Add name and mangled name.
+          const std::string &Name = StaticDesc->getDisplayName();
+          const std::string &MangledName = StaticDesc->getName();
+          Static->AddString(DW_AT_name, DW_FORM_string, Name);
+          Static->AddString(DW_AT_MIPS_linkage_name, DW_FORM_string,
+                            MangledName);
+          
+          // Add location.
+          AddSourceLine(Static, StaticDesc->getFile(), StaticDesc->getLine());
+         
+          // Add type.
+          if (TypeDesc *StaticTy = StaticDesc->getType()) {
+            Static->AddDIEntry(DW_AT_type, DW_FORM_ref4, 
+                               NewType(Context, StaticTy, Unit));
+          }
+          
+          // Add flags.
+          Static->AddUInt(DW_AT_external, DW_FORM_flag, 1);
+          Static->AddUInt(DW_AT_declaration, DW_FORM_flag, 1);
+          
+          Ty->AddChild(Static);
+        } else if (SubprogramDesc *MethodDesc =
+                                            dyn_cast<SubprogramDesc>(Element)) {
+          // Add member function.
+          
+          // Construct member debug information entry.
+          DIE *Method = new DIE(DW_TAG_subprogram);
+         
+          // Add name and mangled name.
+          const std::string &Name = MethodDesc->getDisplayName();
+          const std::string &MangledName = MethodDesc->getName();
+          bool IsCTor = false;
+          
+          if (Name.empty()) {
+            Method->AddString(DW_AT_name, DW_FORM_string, MangledName);            
+            IsCTor = TyDesc->getName() == MangledName;
+          } else {
+            Method->AddString(DW_AT_name, DW_FORM_string, Name);            
+            Method->AddString(DW_AT_MIPS_linkage_name, DW_FORM_string,
+                              MangledName);
+          }
+          
+          // Add location.
+          AddSourceLine(Method, MethodDesc->getFile(), MethodDesc->getLine());
+         
+          // Add type.
+          if (CompositeTypeDesc *MethodTy =
+                   dyn_cast_or_null<CompositeTypeDesc>(MethodDesc->getType())) {
+            // Get argument information.
+            std::vector<DebugInfoDesc *> &Args = MethodTy->getElements();
+           
+            // If not a ctor.
+            if (!IsCTor) {
+              // Add return type.
+              Method->AddDIEntry(DW_AT_type, DW_FORM_ref4,
+                                 NewType(Context, dyn_cast<TypeDesc>(Args[0]),
+                                 Unit));
+            }
+            
+            // Add arguments.
+            for(unsigned i = 1, N = Args.size(); i < N; ++i) {
+              DIE *Arg = new DIE(DW_TAG_formal_parameter);
+              Arg->AddDIEntry(DW_AT_type, DW_FORM_ref4,
+                              NewType(Context, cast<TypeDesc>(Args[i]), Unit));
+              Arg->AddUInt(DW_AT_artificial, DW_FORM_flag, 1);
+              Method->AddChild(Arg);
+            }
+          }
+
+          // Add flags.
+          Method->AddUInt(DW_AT_external, DW_FORM_flag, 1);
+          Method->AddUInt(DW_AT_declaration, DW_FORM_flag, 1);
+            
+          Ty->AddChild(Method);
+        }
+      }
+      break;
+    }
+    case DW_TAG_enumeration_type: {
+      // Add enumerators to enumeration type.
+      for(unsigned i = 0, N = Elements.size(); i < N; ++i) {
+        EnumeratorDesc *ED = cast<EnumeratorDesc>(Elements[i]);
+        const std::string &Name = ED->getName();
+        int64_t Value = ED->getValue();
+        DIE *Enumerator = new DIE(DW_TAG_enumerator);
+        Enumerator->AddString(DW_AT_name, DW_FORM_string, Name);
+        Enumerator->AddSInt(DW_AT_const_value, DW_FORM_sdata, Value);
+        Ty->AddChild(Enumerator);
+      }
+
+      break;
+    }
+    case DW_TAG_subroutine_type: {
+      // Add prototype flag.
+      Ty->AddUInt(DW_AT_prototyped, DW_FORM_flag, 1);
+      // Add return type.
+      Ty->AddDIEntry(DW_AT_type, DW_FORM_ref4,
+                     NewType(Context, dyn_cast<TypeDesc>(Elements[0]), Unit));
+      
+      // Add arguments.
+      for(unsigned i = 1, N = Elements.size(); i < N; ++i) {
+        DIE *Arg = new DIE(DW_TAG_formal_parameter);
+        Arg->AddDIEntry(DW_AT_type, DW_FORM_ref4,
+                        NewType(Context, cast<TypeDesc>(Elements[i]), Unit));
+        Ty->AddChild(Arg);
+      }
+      
+      break;
+    }
+    default: break;
+    }
+  }
+  
+  assert(Ty && "Type not supported yet");
+  // Add size if non-zero (derived types don't have a size.)
+  if (Size) Ty->AddUInt(DW_AT_byte_size, 0, Size);
+  // Add name if not anonymous or intermediate type.
+  if (!Name.empty()) Ty->AddString(DW_AT_name, DW_FORM_string, Name);
+  // Add source line info if available.
+  AddSourceLine(Ty, TyDesc->getFile(), TyDesc->getLine());
+
+  // Add to context owner.
+  Context->AddChild(Ty);
+  
+  return Slot;
 }
 
-/// NewGlobalEntity - Make the entity visible globally using the given name.
+/// NewCompileUnit - Create new compile unit and it's debug information entry.
 ///
-void DwarfWriter::NewGlobalEntity(const std::string &Name, DIE *Entity) {
-  assert(!GlobalEntities[Name] && "Duplicate global variable or function");
-  GlobalEntities[Name] = Entity;
+CompileUnit *DwarfWriter::NewCompileUnit(CompileUnitDesc *UnitDesc,
+                                         unsigned ID) {
+  // Construct debug information entry.
+  DIE *Die = new DIE(DW_TAG_compile_unit);
+  Die->AddDelta (DW_AT_stmt_list, DW_FORM_data4,  DWLabel("line", 0),
+                                                  DWLabel("section_line", 0));
+//  Die->AddLabel (DW_AT_high_pc,   DW_FORM_addr,   DWLabel("text_end", 0));
+//  Die->AddLabel (DW_AT_low_pc,    DW_FORM_addr,   DWLabel("text_begin", 0));
+  Die->AddString(DW_AT_producer,  DW_FORM_string, UnitDesc->getProducer());
+  Die->AddUInt  (DW_AT_language,  DW_FORM_data1,  UnitDesc->getLanguage());
+  Die->AddString(DW_AT_name,      DW_FORM_string, UnitDesc->getFileName());
+  Die->AddString(DW_AT_comp_dir,  DW_FORM_string, UnitDesc->getDirectory());
+  
+  // Add debug information entry to descriptor map.
+  DIE *&Slot = getDieMapSlotFor(UnitDesc);
+  Slot = Die;
+  
+  // Construct compile unit.
+  CompileUnit *Unit = new CompileUnit(UnitDesc, ID, Die);
+  
+  // Add Unit to compile unit map.
+  DescToUnitMap[UnitDesc] = Unit;
+  
+  return Unit;
 }
 
-/// NewGlobalVariable - Add a new global variable DIE to the context.
+/// FindCompileUnit - Get the compile unit for the given descriptor.
 ///
-void DwarfWriter::NewGlobalVariable(DWContext *Context,
-                                    const std::string &Name,
-                                    const std::string &MangledName,
-                                    const Type *Ty,
-                                    unsigned Size, unsigned Align) {
-  // Get the DIE type for the global.
-  DIE *Type = Context->NewBasicType(Ty, Size, Align);
-  DIE *Variable = Context->NewGlobalVariable(Name, MangledName, Type);
-  NewGlobalEntity(Name, Variable);
+CompileUnit *DwarfWriter::FindCompileUnit(CompileUnitDesc *UnitDesc) {
+  CompileUnit *Unit = DescToUnitMap[UnitDesc];
+  assert(Unit && "Missing compile unit.");
+  return Unit;
 }
 
-/// NewCompileUnit - Create new compile unit information.
+/// NewGlobalVariable - Add a new global variable DIE.
 ///
-DIE *DwarfWriter::NewCompileUnit(const CompileUnitWrapper &CompileUnit) {
-  DIE *Unit = new DIE(DW_TAG_compile_unit, DW_CHILDREN_yes);
-  // FIXME - use the correct line set.
-  Unit->AddLabel (DW_AT_stmt_list, DW_FORM_data4,  DWLabel("line", 0));
-  Unit->AddLabel (DW_AT_high_pc,   DW_FORM_addr,   DWLabel("text_end", 0));
-  Unit->AddLabel (DW_AT_low_pc,    DW_FORM_addr,   DWLabel("text_begin", 0));
-  Unit->AddString(DW_AT_producer,  DW_FORM_string, CompileUnit.getProducer());
-  Unit->AddUInt  (DW_AT_language,  DW_FORM_data1,  CompileUnit.getLanguage());
-  Unit->AddString(DW_AT_name,      DW_FORM_string, CompileUnit.getFileName());
-  Unit->AddString(DW_AT_comp_dir,  DW_FORM_string, CompileUnit.getDirectory());
-  Unit->Complete(*this);
+DIE *DwarfWriter::NewGlobalVariable(GlobalVariableDesc *GVD) {
+  // Get the compile unit context.
+  CompileUnitDesc *UnitDesc = static_cast<CompileUnitDesc *>(GVD->getContext());
+  CompileUnit *Unit = FindCompileUnit(UnitDesc);
+
+  // Check for pre-existence.
+  DIE *&Slot = Unit->getDieMapSlotFor(GVD);
+  if (Slot) return Slot;
   
-  return Unit;
+  // Get the global variable itself.
+  GlobalVariable *GV = GVD->getGlobalVariable();
+
+  const std::string &Name = GVD->hasMangledName() ? GVD->getDisplayName()
+                                                  : GVD->getName();
+  const std::string &MangledName = GVD->hasMangledName() ? GVD->getName()
+                                                         : "";
+  // Get the global's type.
+  DIE *Type = NewType(Unit->getDie(), GVD->getType(), Unit); 
+
+  // Create the globale variable DIE.
+  DIE *VariableDie = new DIE(DW_TAG_variable);
+  VariableDie->AddString(DW_AT_name, DW_FORM_string, Name);
+  if (!MangledName.empty()) {
+    VariableDie->AddString(DW_AT_MIPS_linkage_name, DW_FORM_string,
+                           MangledName);
+  }
+  VariableDie->AddDIEntry(DW_AT_type, DW_FORM_ref4, Type);
+  VariableDie->AddUInt(DW_AT_external, DW_FORM_flag, 1);
+  
+  // Add source line info if available.
+  AddSourceLine(VariableDie, UnitDesc, GVD->getLine());
+
+  // Add address.
+  DIEBlock *Block = new DIEBlock();
+  Block->AddUInt(DW_FORM_data1, DW_OP_addr);
+  Block->AddObjectLabel(DW_FORM_udata, MangledName);
+  Block->ComputeSize(*this);
+  VariableDie->AddBlock(DW_AT_location,  0, Block);
+  
+  // Add to map.
+  Slot = VariableDie;
+  // Add to context owner.
+  Unit->getDie()->AddChild(VariableDie);
+  
+  // Expose as global.
+  // FIXME - need to check external flag.
+  Unit->AddGlobal(Name, VariableDie);
+  
+  return VariableDie;
+}
+
+/// NewSubprogram - Add a new subprogram DIE.
+///
+DIE *DwarfWriter::NewSubprogram(SubprogramDesc *SPD) {
+  // Get the compile unit context.
+  CompileUnitDesc *UnitDesc = static_cast<CompileUnitDesc *>(SPD->getContext());
+  CompileUnit *Unit = FindCompileUnit(UnitDesc);
+
+  // Check for pre-existence.
+  DIE *&Slot = Unit->getDieMapSlotFor(SPD);
+  if (Slot) return Slot;
+  
+  // Gather the details (simplify add attribute code.)
+  const std::string &Name = SPD->hasMangledName() ? SPD->getDisplayName()
+                                                  : SPD->getName();
+  const std::string &MangledName = SPD->hasMangledName() ? SPD->getName()
+                                                         : "";
+  DIE *Type = NewType(Unit->getDie(), SPD->getType(), Unit); 
+  unsigned IsExternal = SPD->isStatic() ? 0 : 1;
+                                    
+  DIE *SubprogramDie = new DIE(DW_TAG_subprogram);
+  SubprogramDie->AddString(DW_AT_name, DW_FORM_string, Name);
+  if (!MangledName.empty()) {
+    SubprogramDie->AddString(DW_AT_MIPS_linkage_name, DW_FORM_string,
+                             MangledName);
+  }
+  if (Type) {
+    SubprogramDie->AddDIEntry(DW_AT_type, DW_FORM_ref4, Type);
+  }
+  SubprogramDie->AddUInt(DW_AT_external, DW_FORM_flag, IsExternal);
+  SubprogramDie->AddUInt(DW_AT_prototyped, DW_FORM_flag, 1);
+  
+  // Add source line info if available.
+  AddSourceLine(SubprogramDie, UnitDesc, SPD->getLine());
+
+  // Add to map.
+  Slot = SubprogramDie;
+  // Add to context owner.
+  Unit->getDie()->AddChild(SubprogramDie);
+  
+  // Expose as global.
+  Unit->AddGlobal(Name, SubprogramDie);
+  
+  return SubprogramDie;
+}
+
+/// NewScopeVariable - Create a new scope variable.
+///
+DIE *DwarfWriter::NewScopeVariable(DebugVariable *DV, CompileUnit *Unit) {
+  // Get the descriptor.
+  VariableDesc *VD = DV->getDesc();
+
+  // Translate tag to proper Dwarf tag.  The result variable is dropped for now.
+  unsigned Tag;
+  switch (VD->getTag()) {
+  case DW_TAG_return_variable:  return NULL;
+  case DW_TAG_arg_variable:     Tag = DW_TAG_formal_parameter; break;
+  case DW_TAG_auto_variable:    // fall thru
+  default:                      Tag = DW_TAG_variable; break;
+  }
+
+  // Define variable debug information entry.
+  DIE *VariableDie = new DIE(Tag);
+  VariableDie->AddString(DW_AT_name, DW_FORM_string, VD->getName());
+
+  // Add source line info if available.
+  AddSourceLine(VariableDie, VD->getFile(), VD->getLine());
+  
+  // Add variable type.
+  DIE *Type = NewType(Unit->getDie(), VD->getType(), Unit); 
+  VariableDie->AddDIEntry(DW_AT_type, DW_FORM_ref4, Type);
+  
+  // Add variable address.
+  MachineLocation Location;
+  RI->getLocation(*MF, DV->getFrameIndex(), Location);
+  AddAddress(VariableDie, DW_AT_location, Location);
+  
+  return VariableDie;
+}
+
+/// ConstructScope - Construct the components of a scope.
+///
+void DwarfWriter::ConstructScope(DebugScope *ParentScope,
+                                 DIE *ParentDie, CompileUnit *Unit) {
+  // Add variables to scope.
+  std::vector<DebugVariable *> &Variables = ParentScope->getVariables();
+  for (unsigned i = 0, N = Variables.size(); i < N; ++i) {
+    DIE *VariableDie = NewScopeVariable(Variables[i], Unit);
+    if (VariableDie) ParentDie->AddChild(VariableDie);
+  }
+  
+  // Add nested scopes.
+  std::vector<DebugScope *> &Scopes = ParentScope->getScopes();
+  for (unsigned j = 0, M = Scopes.size(); j < M; ++j) {
+    // Define the Scope debug information entry.
+    DebugScope *Scope = Scopes[j];
+    // FIXME - Ignore inlined functions for the time being.
+    if (!Scope->getParent()) continue;
+    
+    DIE *ScopeDie = new DIE(DW_TAG_lexical_block);
+    
+    // Add the scope bounds.
+    if (unsigned StartID = Scope->getStartLabelID()) {
+      ScopeDie->AddLabel(DW_AT_low_pc, DW_FORM_addr,
+                         DWLabel("loc", StartID));
+    } else {
+      ScopeDie->AddLabel(DW_AT_low_pc, DW_FORM_addr,
+                         DWLabel("func_begin", SubprogramCount));
+    }
+    if (unsigned EndID = Scope->getEndLabelID()) {
+      ScopeDie->AddLabel(DW_AT_high_pc, DW_FORM_addr,
+                         DWLabel("loc", EndID));
+    } else {
+      ScopeDie->AddLabel(DW_AT_high_pc, DW_FORM_addr,
+                         DWLabel("func_end", SubprogramCount));
+    }
+                       
+    // Add the scope contents.
+    ConstructScope(Scope, ScopeDie, Unit);
+    ParentDie->AddChild(ScopeDie);
+  }
+}
+
+/// ConstructRootScope - Construct the scope for the subprogram.
+///
+void DwarfWriter::ConstructRootScope(DebugScope *RootScope) {
+  // Exit if there is no root scope.
+  if (!RootScope) return;
+  
+  // Get the subprogram debug information entry. 
+  SubprogramDesc *SPD = cast<SubprogramDesc>(RootScope->getDesc());
+  
+  // Get the compile unit context.
+  CompileUnitDesc *UnitDesc = static_cast<CompileUnitDesc *>(SPD->getContext());
+  CompileUnit *Unit = FindCompileUnit(UnitDesc);
+  
+  // Get the subprogram die.
+  DIE *SPDie = Unit->getDieMapSlotFor(SPD);
+  assert(SPDie && "Missing subprogram descriptor");
+  
+  // Add the function bounds.
+  SPDie->AddLabel(DW_AT_low_pc, DW_FORM_addr,
+                  DWLabel("func_begin", SubprogramCount));
+  SPDie->AddLabel(DW_AT_high_pc, DW_FORM_addr,
+                  DWLabel("func_end", SubprogramCount));
+  MachineLocation Location(RI->getFrameRegister(*MF));
+  AddAddress(SPDie, DW_AT_frame_base, Location);
+                  
+  ConstructScope(RootScope, SPDie, Unit);
 }
 
 /// EmitInitial - Emit initial Dwarf declarations.  This is necessary for cc
 /// tools to recognize the object file contains Dwarf information.
 ///
-void DwarfWriter::EmitInitial() const {
+void DwarfWriter::EmitInitial() {
+  // Check to see if we already emitted intial headers.
+  if (didInitial) return;
+  didInitial = true;
+  
   // Dwarf sections base addresses.
-  Asm->SwitchSection(DwarfAbbrevSection, 0);
-  EmitLabel("abbrev", 0);
-  Asm->SwitchSection(DwarfInfoSection, 0);
+  Asm->SwitchToDataSection(TAI->getDwarfFrameSection(), 0);
+  EmitLabel("section_frame", 0);
+  Asm->SwitchToDataSection(TAI->getDwarfInfoSection(), 0);
+  EmitLabel("section_info", 0);
   EmitLabel("info", 0);
-  Asm->SwitchSection(DwarfLineSection, 0);
+  Asm->SwitchToDataSection(TAI->getDwarfAbbrevSection(), 0);
+  EmitLabel("section_abbrev", 0);
+  EmitLabel("abbrev", 0);
+  Asm->SwitchToDataSection(TAI->getDwarfARangesSection(), 0);
+  EmitLabel("section_aranges", 0);
+  Asm->SwitchToDataSection(TAI->getDwarfMacInfoSection(), 0);
+  EmitLabel("section_macinfo", 0);
+  Asm->SwitchToDataSection(TAI->getDwarfLineSection(), 0);
+  EmitLabel("section_line", 0);
   EmitLabel("line", 0);
-  
-  // Standard sections base addresses.
-  Asm->SwitchSection(TextSection, 0);
+  Asm->SwitchToDataSection(TAI->getDwarfLocSection(), 0);
+  EmitLabel("section_loc", 0);
+  Asm->SwitchToDataSection(TAI->getDwarfPubNamesSection(), 0);
+  EmitLabel("section_pubnames", 0);
+  Asm->SwitchToDataSection(TAI->getDwarfStrSection(), 0);
+  EmitLabel("section_str", 0);
+  Asm->SwitchToDataSection(TAI->getDwarfRangesSection(), 0);
+  EmitLabel("section_ranges", 0);
+
+  Asm->SwitchToTextSection(TAI->getTextSection(), 0);
   EmitLabel("text_begin", 0);
-  Asm->SwitchSection(DataSection, 0);
+  Asm->SwitchToDataSection(TAI->getDataSection(), 0);
   EmitLabel("data_begin", 0);
+
+  // Emit common frame information.
+  EmitInitialDebugFrame();
 }
 
 /// EmitDIE - Recusively Emits a debug information entry.
@@ -1309,14 +1832,16 @@ void DwarfWriter::EmitDIE(DIE *Die) const {
   // Get the abbreviation for this DIE.
   unsigned AbbrevID = Die->getAbbrevID();
   const DIEAbbrev &Abbrev = Abbreviations[AbbrevID];
+  
+  O << "\n";
 
   // Emit the code (index) for the abbreviation.
   EmitULEB128Bytes(AbbrevID);
   EOL(std::string("Abbrev [" +
       utostr(AbbrevID) +
-      "] " +
-      TagString(Abbrev.getTag())) +
-      " ");
+      "] 0x" + utohexstr(Die->getOffset()) +
+      ":0x" + utohexstr(Die->getSize()) + " " +
+      TagString(Abbrev.getTag())));
   
   const std::vector<DIEValue *> &Values = Die->getValues();
   const std::vector<DIEAbbrevData> &AbbrevData = Abbrev.getData();
@@ -1329,7 +1854,7 @@ void DwarfWriter::EmitDIE(DIE *Die) const {
     
     switch (Attr) {
     case DW_AT_sibling: {
-      EmitLong(Die->SiblingOffset());
+      EmitInt32(Die->SiblingOffset());
       break;
     }
     default: {
@@ -1347,18 +1872,25 @@ void DwarfWriter::EmitDIE(DIE *Die) const {
     const std::vector<DIE *> &Children = Die->getChildren();
     
     for (unsigned j = 0, M = Children.size(); j < M; ++j) {
-      // FIXME - handle sibling offsets.
-      // FIXME - handle all DIE types.
       EmitDIE(Children[j]);
     }
     
-    EmitByte(0); EOL("End Of Children Mark");
+    EmitInt8(0); EOL("End Of Children Mark");
   }
 }
 
 /// SizeAndOffsetDie - Compute the size and offset of a DIE.
 ///
-unsigned DwarfWriter::SizeAndOffsetDie(DIE *Die, unsigned Offset) const {
+unsigned DwarfWriter::SizeAndOffsetDie(DIE *Die, unsigned Offset, bool Last) {
+  // Get the children.
+  const std::vector<DIE *> &Children = Die->getChildren();
+  
+  // If not last sibling and has children then add sibling offset attribute.
+  if (!Last && !Children.empty()) Die->AddSiblingOffset();
+
+  // Record the abbreviation.
+  Die->Complete(*this);
+  
   // Get the abbreviation for this DIE.
   unsigned AbbrevID = Die->getAbbrevID();
   const DIEAbbrev &Abbrev = Abbreviations[AbbrevID];
@@ -1379,13 +1911,12 @@ unsigned DwarfWriter::SizeAndOffsetDie(DIE *Die, unsigned Offset) const {
   }
   
   // Emit the DIE children if any.
-  if (Abbrev.getChildrenFlag() == DW_CHILDREN_yes) {
-    const std::vector<DIE *> &Children = Die->getChildren();
+  if (!Children.empty()) {
+    assert(Abbrev.getChildrenFlag() == DW_CHILDREN_yes &&
+           "Children flag not set");
     
     for (unsigned j = 0, M = Children.size(); j < M; ++j) {
-      // FIXME - handle sibling offsets.
-      // FIXME - handle all DIE types.
-      Offset = SizeAndOffsetDie(Children[j], Offset);
+      Offset = SizeAndOffsetDie(Children[j], Offset, (j + 1) == M);
     }
     
     // End of children marker.
@@ -1399,15 +1930,93 @@ unsigned DwarfWriter::SizeAndOffsetDie(DIE *Die, unsigned Offset) const {
 /// SizeAndOffsets - Compute the size and offset of all the DIEs.
 ///
 void DwarfWriter::SizeAndOffsets() {
-  // Compute size of debug unit header
-  unsigned Offset = sizeof(int32_t) + // Length of Compilation Unit Info
-                    sizeof(int16_t) + // DWARF version number
-                    sizeof(int32_t) + // Offset Into Abbrev. Section
-                    sizeof(int8_t);   // Pointer Size (in bytes)
   
   // Process each compile unit.
   for (unsigned i = 0, N = CompileUnits.size(); i < N; ++i) {
-    Offset = SizeAndOffsetDie(CompileUnits[i], Offset);
+    CompileUnit *Unit = CompileUnits[i];
+    if (Unit->hasContent()) {
+      // Compute size of compile unit header
+      unsigned Offset = sizeof(int32_t) + // Length of Compilation Unit Info
+                        sizeof(int16_t) + // DWARF version number
+                        sizeof(int32_t) + // Offset Into Abbrev. Section
+                        sizeof(int8_t);   // Pointer Size (in bytes)
+      SizeAndOffsetDie(Unit->getDie(), Offset, (i + 1) == N);
+    }
+  }
+}
+
+/// EmitFrameMoves - Emit frame instructions to describe the layout of the
+/// frame.
+void DwarfWriter::EmitFrameMoves(const char *BaseLabel, unsigned BaseLabelID,
+                                 std::vector<MachineMove *> &Moves) {
+  for (unsigned i = 0, N = Moves.size(); i < N; ++i) {
+    MachineMove *Move = Moves[i];
+    unsigned LabelID = Move->getLabelID();
+    const MachineLocation &Dst = Move->getDestination();
+    const MachineLocation &Src = Move->getSource();
+    
+    // Advance row if new location.
+    if (BaseLabel && LabelID && BaseLabelID != LabelID) {
+      EmitInt8(DW_CFA_advance_loc4);
+      EOL("DW_CFA_advance_loc4");
+      EmitDifference("loc", LabelID, BaseLabel, BaseLabelID);
+      EOL("");
+      
+      BaseLabelID = LabelID;
+      BaseLabel = "loc";
+    }
+    
+    int stackGrowth =
+        Asm->TM.getFrameInfo()->getStackGrowthDirection() ==
+          TargetFrameInfo::StackGrowsUp ?
+            TAI->getAddressSize() : -TAI->getAddressSize();
+
+    // If advancing cfa.
+    if (Dst.isRegister() && Dst.getRegister() == MachineLocation::VirtualFP) {
+      if (!Src.isRegister()) {
+        if (Src.getRegister() == MachineLocation::VirtualFP) {
+          EmitInt8(DW_CFA_def_cfa_offset);
+          EOL("DW_CFA_def_cfa_offset");
+        } else {
+          EmitInt8(DW_CFA_def_cfa);
+          EOL("DW_CFA_def_cfa");
+          
+          EmitULEB128Bytes(RI->getDwarfRegNum(Src.getRegister()));
+          EOL("Register");
+        }
+        
+        int Offset = Src.getOffset() / stackGrowth;
+        
+        EmitULEB128Bytes(Offset);
+        EOL("Offset");
+      } else {
+        assert(0 && "Machine move no supported yet.");
+      }
+    } else {
+      unsigned Reg = RI->getDwarfRegNum(Src.getRegister());
+      int Offset = Dst.getOffset() / stackGrowth;
+      
+      if (Offset < 0) {
+        EmitInt8(DW_CFA_offset_extended_sf);
+        EOL("DW_CFA_offset_extended_sf");
+        EmitULEB128Bytes(Reg);
+        EOL("Reg");
+        EmitSLEB128Bytes(Offset);
+        EOL("Offset");
+      } else if (Reg < 64) {
+        EmitInt8(DW_CFA_offset + Reg);
+        EOL("DW_CFA_offset + Reg");
+        EmitULEB128Bytes(Offset);
+        EOL("Offset");
+      } else {
+        EmitInt8(DW_CFA_offset_extended);
+        EOL("DW_CFA_offset_extended");
+        EmitULEB128Bytes(Reg);
+        EOL("Reg");
+        EmitULEB128Bytes(Offset);
+        EOL("Offset");
+      }
+    }
   }
 }
 
@@ -1415,34 +2024,33 @@ void DwarfWriter::SizeAndOffsets() {
 ///
 void DwarfWriter::EmitDebugInfo() const {
   // Start debug info section.
-  Asm->SwitchSection(DwarfInfoSection, 0);
+  Asm->SwitchToDataSection(TAI->getDwarfInfoSection(), 0);
   
-  // Get the number of compile units.
-  unsigned N = CompileUnits.size();
-  
-  // If there are any compile units.
-  if (N) {
-    EmitLabel("info_begin", 0);
-    
-    // Emit the compile units header.
-
-    // Emit size of content not including length itself
-    unsigned ContentSize = CompileUnits[N - 1]->SiblingOffset();
-    EmitLong(ContentSize - sizeof(int32_t));
-    EOL("Length of Compilation Unit Info");
+  // Process each compile unit.
+  for (unsigned i = 0, N = CompileUnits.size(); i < N; ++i) {
+    CompileUnit *Unit = CompileUnits[i];
     
-    EmitShort(DWARF_VERSION); EOL("DWARF version number");
-
-    EmitReference("abbrev_begin", 0); EOL("Offset Into Abbrev. Section");
-
-    EmitByte(AddressSize); EOL("Address Size (in bytes)");
+    if (Unit->hasContent()) {
+      DIE *Die = Unit->getDie();
+      // Emit the compile units header.
+      EmitLabel("info_begin", Unit->getID());
+      // Emit size of content not including length itself
+      unsigned ContentSize = Die->getSize() +
+                             sizeof(int16_t) + // DWARF version number
+                             sizeof(int32_t) + // Offset Into Abbrev. Section
+                             sizeof(int8_t);   // Pointer Size (in bytes)
+                             
+      EmitInt32(ContentSize);  EOL("Length of Compilation Unit Info");
+      EmitInt16(DWARF_VERSION); EOL("DWARF version number");
+      EmitDifference("abbrev_begin", 0, "section_abbrev", 0);
+      EOL("Offset Into Abbrev. Section");
+      EmitInt8(TAI->getAddressSize()); EOL("Address Size (in bytes)");
     
-    // Process each compile unit.
-    for (unsigned i = 0; i < N; ++i) {
-      EmitDIE(CompileUnits[i]);
+      EmitDIE(Die);
+      EmitLabel("info_end", Unit->getID());
     }
     
-    EmitLabel("info_end", 0);
+    O << "\n";
   }
 }
 
@@ -1452,7 +2060,7 @@ void DwarfWriter::EmitAbbreviations() const {
   // Check to see if it is worth the effort.
   if (!Abbreviations.empty()) {
     // Start the debug abbrev section.
-    Asm->SwitchSection(DwarfAbbrevSection, 0);
+    Asm->SwitchToDataSection(TAI->getDwarfAbbrevSection(), 0);
     
     EmitLabel("abbrev_begin", 0);
     
@@ -1467,9 +2075,13 @@ void DwarfWriter::EmitAbbreviations() const {
       
       // Emit the abbreviations data.
       Abbrev.Emit(*this);
+  
+      O << "\n";
     }
     
     EmitLabel("abbrev_end", 0);
+  
+    O << "\n";
   }
 }
 
@@ -1482,7 +2094,7 @@ void DwarfWriter::EmitDebugLines() const {
   const int MaxLineDelta = 255 + MinLineDelta;
 
   // Start the dwarf line section.
-  Asm->SwitchSection(DwarfLineSection, 0);
+  Asm->SwitchToDataSection(TAI->getDwarfLineSection(), 0);
   
   // Construct the section header.
   
@@ -1490,32 +2102,32 @@ void DwarfWriter::EmitDebugLines() const {
   EOL("Length of Source Line Info");
   EmitLabel("line_begin", 0);
   
-  EmitShort(DWARF_VERSION); EOL("DWARF version number");
+  EmitInt16(DWARF_VERSION); EOL("DWARF version number");
   
   EmitDifference("line_prolog_end", 0, "line_prolog_begin", 0);
   EOL("Prolog Length");
   EmitLabel("line_prolog_begin", 0);
   
-  EmitByte(1); EOL("Minimum Instruction Length");
+  EmitInt8(1); EOL("Minimum Instruction Length");
 
-  EmitByte(1); EOL("Default is_stmt_start flag");
+  EmitInt8(1); EOL("Default is_stmt_start flag");
 
-  EmitByte(MinLineDelta);  EOL("Line Base Value (Special Opcodes)");
+  EmitInt8(MinLineDelta);  EOL("Line Base Value (Special Opcodes)");
   
-  EmitByte(MaxLineDelta); EOL("Line Range Value (Special Opcodes)");
+  EmitInt8(MaxLineDelta); EOL("Line Range Value (Special Opcodes)");
 
-  EmitByte(-MinLineDelta); EOL("Special Opcode Base");
+  EmitInt8(-MinLineDelta); EOL("Special Opcode Base");
   
   // Line number standard opcode encodings argument count
-  EmitByte(0); EOL("DW_LNS_copy arg count");
-  EmitByte(1); EOL("DW_LNS_advance_pc arg count");
-  EmitByte(1); EOL("DW_LNS_advance_line arg count");
-  EmitByte(1); EOL("DW_LNS_set_file arg count");
-  EmitByte(1); EOL("DW_LNS_set_column arg count");
-  EmitByte(0); EOL("DW_LNS_negate_stmt arg count");
-  EmitByte(0); EOL("DW_LNS_set_basic_block arg count");
-  EmitByte(0); EOL("DW_LNS_const_add_pc arg count");
-  EmitByte(1); EOL("DW_LNS_fixed_advance_pc arg count");
+  EmitInt8(0); EOL("DW_LNS_copy arg count");
+  EmitInt8(1); EOL("DW_LNS_advance_pc arg count");
+  EmitInt8(1); EOL("DW_LNS_advance_line arg count");
+  EmitInt8(1); EOL("DW_LNS_set_file arg count");
+  EmitInt8(1); EOL("DW_LNS_set_column arg count");
+  EmitInt8(0); EOL("DW_LNS_negate_stmt arg count");
+  EmitInt8(0); EOL("DW_LNS_set_basic_block arg count");
+  EmitInt8(0); EOL("DW_LNS_const_add_pc arg count");
+  EmitInt8(1); EOL("DW_LNS_fixed_advance_pc arg count");
 
   const UniqueVector<std::string> &Directories = DebugInfo->getDirectories();
   const UniqueVector<SourceFileInfo> &SourceFiles = DebugInfo->getSourceFiles();
@@ -1525,7 +2137,7 @@ void DwarfWriter::EmitDebugLines() const {
                 DirectoryID <= NDID; ++DirectoryID) {
     EmitString(Directories[DirectoryID]); EOL("Directory");
   }
-  EmitByte(0); EOL("End of directories");
+  EmitInt8(0); EOL("End of directories");
   
   // Emit files.
   for (unsigned SourceID = 1, NSID = SourceFiles.size();
@@ -1536,116 +2148,203 @@ void DwarfWriter::EmitDebugLines() const {
     EmitULEB128Bytes(0);  EOL("Mod date");
     EmitULEB128Bytes(0);  EOL("File size");
   }
-  EmitByte(0); EOL("End of files");
+  EmitInt8(0); EOL("End of files");
   
   EmitLabel("line_prolog_end", 0);
   
-  // Emit line information
-  const std::vector<SourceLineInfo *> &LineInfos = DebugInfo->getSourceLines();
-  
-  // Dwarf assumes we start with first line of first source file.
-  unsigned Source = 1;
-  unsigned Line = 1;
-  
-  // Construct rows of the address, source, line, column matrix.
-  for (unsigned i = 0, N = LineInfos.size(); i < N; ++i) {
-    SourceLineInfo *LineInfo = LineInfos[i];
-
-    // Define the line address.
-    EmitByte(0); EOL("Extended Op");
-    EmitByte(4 + 1); EOL("Op size");
-    EmitByte(DW_LNE_set_address); EOL("DW_LNE_set_address");
-    EmitReference("loc", i + 1); EOL("Location label");
+  // A sequence for each text section.
+  for (unsigned j = 0, M = SectionSourceLines.size(); j < M; ++j) {
+    // Isolate current sections line info.
+    const std::vector<SourceLineInfo *> &LineInfos = SectionSourceLines[j];
     
-    // If change of source, then switch to the new source.
-    if (Source != LineInfo->getSourceID()) {
-      Source = LineInfo->getSourceID();
-      EmitByte(DW_LNS_set_file); EOL("DW_LNS_set_file");
-      EmitULEB128Bytes(0); EOL("New Source");
+    if (DwarfVerbose) {
+      O << "\t"
+        << TAI->getCommentString() << " "
+        << "Section "
+        << SectionMap[j + 1].c_str() << "\n";
     }
+
+    // Dwarf assumes we start with first line of first source file.
+    unsigned Source = 1;
+    unsigned Line = 1;
     
-    // If change of line.
-    if (Line != LineInfo->getLine()) {
-      // Determine offset.
-      int Offset = LineInfo->getLine() - Line;
-      int Delta = Offset - MinLineDelta;
+    // Construct rows of the address, source, line, column matrix.
+    for (unsigned i = 0, N = LineInfos.size(); i < N; ++i) {
+      SourceLineInfo *LineInfo = LineInfos[i];
       
-      // Update line.
-      Line = LineInfo->getLine();
+      if (DwarfVerbose) {
+        unsigned SourceID = LineInfo->getSourceID();
+        const SourceFileInfo &SourceFile = SourceFiles[SourceID];
+        unsigned DirectoryID = SourceFile.getDirectoryID();
+        O << "\t"
+          << TAI->getCommentString() << " "
+          << Directories[DirectoryID]
+          << SourceFile.getName() << ":"
+          << LineInfo->getLine() << "\n"; 
+      }
+
+      // Define the line address.
+      EmitInt8(0); EOL("Extended Op");
+      EmitInt8(4 + 1); EOL("Op size");
+      EmitInt8(DW_LNE_set_address); EOL("DW_LNE_set_address");
+      EmitReference("loc",  LineInfo->getLabelID()); EOL("Location label");
+      
+      // If change of source, then switch to the new source.
+      if (Source != LineInfo->getSourceID()) {
+        Source = LineInfo->getSourceID();
+        EmitInt8(DW_LNS_set_file); EOL("DW_LNS_set_file");
+        EmitULEB128Bytes(Source); EOL("New Source");
+      }
       
-      // If delta is small enough and in range...
-      if (Delta >= 0 && Delta < (MaxLineDelta - 1)) {
-        // ... then use fast opcode.
-        EmitByte(Delta - MinLineDelta); EOL("Line Delta");
+      // If change of line.
+      if (Line != LineInfo->getLine()) {
+        // Determine offset.
+        int Offset = LineInfo->getLine() - Line;
+        int Delta = Offset - MinLineDelta;
+        
+        // Update line.
+        Line = LineInfo->getLine();
+        
+        // If delta is small enough and in range...
+        if (Delta >= 0 && Delta < (MaxLineDelta - 1)) {
+          // ... then use fast opcode.
+          EmitInt8(Delta - MinLineDelta); EOL("Line Delta");
+        } else {
+          // ... otherwise use long hand.
+          EmitInt8(DW_LNS_advance_line); EOL("DW_LNS_advance_line");
+          EmitSLEB128Bytes(Offset); EOL("Line Offset");
+          EmitInt8(DW_LNS_copy); EOL("DW_LNS_copy");
+        }
       } else {
-        // ... otherwise use long hand.
-        EmitByte(DW_LNS_advance_line); EOL("DW_LNS_advance_line");
-        EmitSLEB128Bytes(Offset); EOL("Line Offset");
-        EmitByte(DW_LNS_copy); EOL("DW_LNS_copy");
+        // Copy the previous row (different address or source)
+        EmitInt8(DW_LNS_copy); EOL("DW_LNS_copy");
       }
-    } else {
-      // Copy the previous row (different address or source)
-      EmitByte(DW_LNS_copy); EOL("DW_LNS_copy");
     }
-  }
 
-  // Mark end of matrix.
-  EmitByte(0); EOL("DW_LNE_end_sequence");
-  EmitULEB128Bytes(1);  O << "\n";
-  EmitByte(1); O << "\n";
+    // Define last address of section.
+    EmitInt8(0); EOL("Extended Op");
+    EmitInt8(4 + 1); EOL("Op size");
+    EmitInt8(DW_LNE_set_address); EOL("DW_LNE_set_address");
+    EmitReference("section_end", j + 1); EOL("Section end label");
+
+    // Mark end of matrix.
+    EmitInt8(0); EOL("DW_LNE_end_sequence");
+    EmitULEB128Bytes(1);  O << "\n";
+    EmitInt8(1); O << "\n";
+  }
   
   EmitLabel("line_end", 0);
+  
+  O << "\n";
 }
   
-/// EmitDebugFrame - Emit visible names into a debug frame section.
+/// EmitInitialDebugFrame - Emit common frame info into a debug frame section.
 ///
-void DwarfWriter::EmitDebugFrame() {
-  // FIXME - Should be per frame
+void DwarfWriter::EmitInitialDebugFrame() {
+  int stackGrowth =
+      Asm->TM.getFrameInfo()->getStackGrowthDirection() ==
+        TargetFrameInfo::StackGrowsUp ?
+      TAI->getAddressSize() : -TAI->getAddressSize();
+
+  // Start the dwarf frame section.
+  Asm->SwitchToDataSection(TAI->getDwarfFrameSection(), 0);
+
+  EmitLabel("frame_common", 0);
+  EmitDifference("frame_common_end", 0,
+                 "frame_common_begin", 0);
+  EOL("Length of Common Information Entry");
+
+  EmitLabel("frame_common_begin", 0);
+  EmitInt32(DW_CIE_ID); EOL("CIE Identifier Tag");
+  EmitInt8(DW_CIE_VERSION); EOL("CIE Version");
+  EmitString("");  EOL("CIE Augmentation");
+  EmitULEB128Bytes(1); EOL("CIE Code Alignment Factor");
+  EmitSLEB128Bytes(stackGrowth); EOL("CIE Data Alignment Factor");   
+  EmitInt8(RI->getDwarfRegNum(RI->getRARegister())); EOL("CIE RA Column");
+  
+  std::vector<MachineMove *> Moves;
+  RI->getInitialFrameState(Moves);
+  EmitFrameMoves(NULL, 0, Moves);
+  for (unsigned i = 0, N = Moves.size(); i < N; ++i) delete Moves[i];
+
+  EmitAlign(2);
+  EmitLabel("frame_common_end", 0);
+  
+  O << "\n";
+}
+
+/// EmitFunctionDebugFrame - Emit per function frame info into a debug frame
+/// section.
+void DwarfWriter::EmitFunctionDebugFrame() {
+  // Start the dwarf frame section.
+  Asm->SwitchToDataSection(TAI->getDwarfFrameSection(), 0);
+  
+  EmitDifference("frame_end", SubprogramCount,
+                 "frame_begin", SubprogramCount);
+  EOL("Length of Frame Information Entry");
+  
+  EmitLabel("frame_begin", SubprogramCount);
+  
+  EmitDifference("frame_common", 0, "section_frame", 0);
+  EOL("FDE CIE offset");
+
+  EmitReference("func_begin", SubprogramCount); EOL("FDE initial location");
+  EmitDifference("func_end", SubprogramCount,
+                 "func_begin", SubprogramCount);
+  EOL("FDE address range");
+  
+  std::vector<MachineMove *> &Moves = DebugInfo->getFrameMoves();
+  
+  EmitFrameMoves("func_begin", SubprogramCount, Moves);
+  
+  EmitAlign(2);
+  EmitLabel("frame_end", SubprogramCount);
+
+  O << "\n";
 }
 
 /// EmitDebugPubNames - Emit visible names into a debug pubnames section.
 ///
 void DwarfWriter::EmitDebugPubNames() {
-  // Check to see if it is worth the effort.
-  if (!GlobalEntities.empty()) {
-    // Start the dwarf pubnames section.
-    Asm->SwitchSection(DwarfPubNamesSection, 0);
-    
-    EmitDifference("pubnames_end", 0, "pubnames_begin", 0);
-    EOL("Length of Public Names Info");
+  // Start the dwarf pubnames section.
+  Asm->SwitchToDataSection(TAI->getDwarfPubNamesSection(), 0);
     
-    EmitLabel("pubnames_begin", 0);
-    
-    EmitShort(DWARF_VERSION); EOL("DWARF Version");
+  // Process each compile unit.
+  for (unsigned i = 0, N = CompileUnits.size(); i < N; ++i) {
+    CompileUnit *Unit = CompileUnits[i];
     
-    EmitReference("info_begin", 0); EOL("Offset of Compilation Unit Info");
+    if (Unit->hasContent()) {
+      EmitDifference("pubnames_end", Unit->getID(),
+                     "pubnames_begin", Unit->getID());
+      EOL("Length of Public Names Info");
+      
+      EmitLabel("pubnames_begin", Unit->getID());
+      
+      EmitInt16(DWARF_VERSION); EOL("DWARF Version");
+      
+      EmitDifference("info_begin", Unit->getID(), "section_info", 0);
+      EOL("Offset of Compilation Unit Info");
 
-    EmitDifference("info_end", 0, "info_begin", 0);
-    EOL("Compilation Unit Length");
-    
-    for (std::map<std::string, DIE *>::iterator GI = GlobalEntities.begin(),
-                                                GE = GlobalEntities.end();
-         GI != GE; ++GI) {
-      const std::string &Name = GI->first;
-      DIE * Entity = GI->second;
+      EmitDifference("info_end", Unit->getID(), "info_begin", Unit->getID());
+      EOL("Compilation Unit Length");
       
-      EmitLong(Entity->getOffset()); EOL("DIE offset");
-      EmitString(Name); EOL("External Name");
+      std::map<std::string, DIE *> &Globals = Unit->getGlobals();
       
+      for (std::map<std::string, DIE *>::iterator GI = Globals.begin(),
+                                                  GE = Globals.end();
+           GI != GE; ++GI) {
+        const std::string &Name = GI->first;
+        DIE * Entity = GI->second;
+        
+        EmitInt32(Entity->getOffset()); EOL("DIE offset");
+        EmitString(Name); EOL("External Name");
+      }
+    
+      EmitInt32(0); EOL("End Mark");
+      EmitLabel("pubnames_end", Unit->getID());
+    
+      O << "\n";
     }
-  
-    EmitLong(0); EOL("End Mark");
-    EmitLabel("pubnames_end", 0);
-  }
-}
-
-/// EmitDebugPubTypes - Emit visible names into a debug pubtypes section.
-///
-void DwarfWriter::EmitDebugPubTypes() {
-  // Check to see if it is worth the effort.
-  if (!GlobalTypes.empty()) {
-    // Start the dwarf pubtypes section.
-    Asm->SwitchSection(DwarfPubTypesSection, 0);
   }
 }
 
@@ -1655,9 +2354,9 @@ void DwarfWriter::EmitDebugStr() {
   // Check to see if it is worth the effort.
   if (!StringPool.empty()) {
     // Start the dwarf str section.
-    Asm->SwitchSection(DwarfStrSection, 0);
+    Asm->SwitchToDataSection(TAI->getDwarfStrSection(), 0);
     
-    // For each of strings in teh string pool.
+    // For each of strings in the string pool.
     for (unsigned StringID = 1, N = StringPool.size();
          StringID <= N; ++StringID) {
       // Emit a label for reference from debug information entries.
@@ -1666,6 +2365,8 @@ void DwarfWriter::EmitDebugStr() {
       const std::string &String = StringPool[StringID];
       EmitString(String); O << "\n";
     }
+  
+    O << "\n";
   }
 }
 
@@ -1673,150 +2374,129 @@ void DwarfWriter::EmitDebugStr() {
 ///
 void DwarfWriter::EmitDebugLoc() {
   // Start the dwarf loc section.
-  Asm->SwitchSection(DwarfLocSection, 0);
+  Asm->SwitchToDataSection(TAI->getDwarfLocSection(), 0);
+  
+  O << "\n";
 }
 
 /// EmitDebugARanges - Emit visible names into a debug aranges section.
 ///
 void DwarfWriter::EmitDebugARanges() {
   // Start the dwarf aranges section.
-  Asm->SwitchSection(DwarfARangesSection, 0);
+  Asm->SwitchToDataSection(TAI->getDwarfARangesSection(), 0);
   
   // FIXME - Mock up
+#if 0
+  // Process each compile unit.
+  for (unsigned i = 0, N = CompileUnits.size(); i < N; ++i) {
+    CompileUnit *Unit = CompileUnits[i];
+    
+    if (Unit->hasContent()) {
+      // Don't include size of length
+      EmitInt32(0x1c); EOL("Length of Address Ranges Info");
+      
+      EmitInt16(DWARF_VERSION); EOL("Dwarf Version");
+      
+      EmitReference("info_begin", Unit->getID());
+      EOL("Offset of Compilation Unit Info");
 
-  // Don't include size of length
-  EmitLong(0x1c); EOL("Length of Address Ranges Info");
-  
-  EmitShort(DWARF_VERSION); EOL("Dwarf Version");
-  
-  EmitReference("info_begin", 0); EOL("Offset of Compilation Unit Info");
-
-  EmitByte(AddressSize); EOL("Size of Address");
+      EmitInt8(TAI->getAddressSize()); EOL("Size of Address");
 
-  EmitByte(0); EOL("Size of Segment Descriptor");
+      EmitInt8(0); EOL("Size of Segment Descriptor");
 
-  EmitShort(0);  EOL("Pad (1)");
-  EmitShort(0);  EOL("Pad (2)");
+      EmitInt16(0);  EOL("Pad (1)");
+      EmitInt16(0);  EOL("Pad (2)");
 
-  // Range 1
-  EmitReference("text_begin", 0); EOL("Address");
-  EmitDifference("text_end", 0, "text_begin", 0); EOL("Length");
+      // Range 1
+      EmitReference("text_begin", 0); EOL("Address");
+      EmitDifference("text_end", 0, "text_begin", 0); EOL("Length");
 
-  EmitLong(0); EOL("EOM (1)");
-  EmitLong(0); EOL("EOM (2)");
+      EmitInt32(0); EOL("EOM (1)");
+      EmitInt32(0); EOL("EOM (2)");
+      
+      O << "\n";
+    }
+  }
+#endif
 }
 
 /// EmitDebugRanges - Emit visible names into a debug ranges section.
 ///
 void DwarfWriter::EmitDebugRanges() {
   // Start the dwarf ranges section.
-  Asm->SwitchSection(DwarfRangesSection, 0);
+  Asm->SwitchToDataSection(TAI->getDwarfRangesSection(), 0);
+  
+  O << "\n";
 }
 
 /// EmitDebugMacInfo - Emit visible names into a debug macinfo section.
 ///
 void DwarfWriter::EmitDebugMacInfo() {
   // Start the dwarf macinfo section.
-  Asm->SwitchSection(DwarfMacInfoSection, 0);
+  Asm->SwitchToDataSection(TAI->getDwarfMacInfoSection(), 0);
+  
+  O << "\n";
 }
 
 /// ConstructCompileUnitDIEs - Create a compile unit DIE for each source and
 /// header file.
 void DwarfWriter::ConstructCompileUnitDIEs() {
-  const UniqueVector<CompileUnitWrapper> CUW = DebugInfo->getCompileUnits();
+  const UniqueVector<CompileUnitDesc *> CUW = DebugInfo->getCompileUnits();
   
   for (unsigned i = 1, N = CUW.size(); i <= N; ++i) {
-    const CompileUnitWrapper &CompileUnit = CUW[i];
-    DIE *Unit = NewCompileUnit(CompileUnit);
-    DWContext *Context = new DWContext(*this, NULL, Unit);
+    CompileUnit *Unit = NewCompileUnit(CUW[i], i);
     CompileUnits.push_back(Unit);
   }
 }
 
 /// ConstructGlobalDIEs - Create DIEs for each of the externally visible global
 /// variables.
-void DwarfWriter::ConstructGlobalDIEs(Module &M) {
-  const TargetData &TD = Asm->TM.getTargetData();
-  
-  std::vector<GlobalWrapper> GlobalVariables = DebugInfo->getGlobalVariables(M);
+void DwarfWriter::ConstructGlobalDIEs() {
+  std::vector<GlobalVariableDesc *> GlobalVariables =
+      DebugInfo->getAnchoredDescriptors<GlobalVariableDesc>(*M);
   
   for (unsigned i = 0, N = GlobalVariables.size(); i < N; ++i) {
-    GlobalWrapper &GW = GlobalVariables[i];
-    GlobalVariable *GV = GW.getGlobalVariable();
-    
-    if (!GV->hasInitializer()) continue;   // External global require no code
-    
-    // FIXME - Use global info type information when available.
-    std::string Name = Asm->Mang->getValueName(GV);
-    Constant *C = GV->getInitializer();
-    const Type *Ty = C->getType();
-    unsigned Size = TD.getTypeSize(Ty);
-    unsigned Align = TD.getTypeAlignmentShift(Ty);
-
-    if (C->isNullValue() && /* FIXME: Verify correct */
-        (GV->hasInternalLinkage() || GV->hasWeakLinkage() ||
-         GV->hasLinkOnceLinkage())) {
-      if (Size == 0) Size = 1;   // .comm Foo, 0 is undefined, avoid it.
-    }
-
-    /// FIXME - Get correct compile unit context.
-    assert(CompileUnits.size() && "No compile units");
-    DWContext *Context = CompileUnits[0]->getContext();
-    
-    /// Create new global.
-    NewGlobalVariable(Context, GV->getName(), Name, Ty, Size, Align);
+    GlobalVariableDesc *GVD = GlobalVariables[i];
+    NewGlobalVariable(GVD);
   }
 }
 
-
-/// ShouldEmitDwarf - Determine if Dwarf declarations should be made.
-///
-bool DwarfWriter::ShouldEmitDwarf() {
-  // Check if debug info is present.
-  if (!DebugInfo || !DebugInfo->hasInfo()) return false;
+/// ConstructSubprogramDIEs - Create DIEs for each of the externally visible
+/// subprograms.
+void DwarfWriter::ConstructSubprogramDIEs() {
+  std::vector<SubprogramDesc *> Subprograms =
+      DebugInfo->getAnchoredDescriptors<SubprogramDesc>(*M);
   
-  // Make sure initial declarations are made.
-  if (!didInitial) {
-    EmitInitial();
-    didInitial = true;
+  for (unsigned i = 0, N = Subprograms.size(); i < N; ++i) {
+    SubprogramDesc *SPD = Subprograms[i];
+    NewSubprogram(SPD);
   }
-  
-  // Okay to emit.
-  return true;
 }
 
 //===----------------------------------------------------------------------===//
 // Main entry points.
 //
   
-DwarfWriter::DwarfWriter(std::ostream &OS, AsmPrinter *A)
+DwarfWriter::DwarfWriter(std::ostream &OS, AsmPrinter *A,
+  const TargetAsmInfo *T)
 : O(OS)
 , Asm(A)
+, TAI(T)
+, TD(Asm->TM.getTargetData())
+, RI(Asm->TM.getRegisterInfo())
+, M(NULL)
+, MF(NULL)
 , DebugInfo(NULL)
 , didInitial(false)
+, shouldEmit(false)
+, SubprogramCount(0)
 , CompileUnits()
 , Abbreviations()
-, GlobalTypes()
-, GlobalEntities()
 , StringPool()
-, AddressSize(sizeof(int32_t))
-, hasLEB128(false)
-, hasDotLoc(false)
-, hasDotFile(false)
-, needsSet(false)
-, DwarfAbbrevSection(".debug_abbrev")
-, DwarfInfoSection(".debug_info")
-, DwarfLineSection(".debug_line")
-, DwarfFrameSection(".debug_frame")
-, DwarfPubNamesSection(".debug_pubnames")
-, DwarfPubTypesSection(".debug_pubtypes")
-, DwarfStrSection(".debug_str")
-, DwarfLocSection(".debug_loc")
-, DwarfARangesSection(".debug_aranges")
-, DwarfRangesSection(".debug_ranges")
-, DwarfMacInfoSection(".debug_macinfo")
-, TextSection(".text")
-, DataSection(".data")
+, DescToUnitMap()
+, DescToDieMap()
+, SectionMap()
+, SectionSourceLines()
 {}
 DwarfWriter::~DwarfWriter() {
   for (unsigned i = 0, N = CompileUnits.size(); i < N; ++i) {
@@ -1824,31 +2504,58 @@ DwarfWriter::~DwarfWriter() {
   }
 }
 
+/// SetDebugInfo - Set DebugInfo when it's known that pass manager has
+/// created it.  Set by the target AsmPrinter.
+void DwarfWriter::SetDebugInfo(MachineDebugInfo *DI) {
+  // Make sure initial declarations are made.
+  if (!DebugInfo && DI->hasInfo()) {
+    DebugInfo = DI;
+    shouldEmit = true;
+    
+    // Emit initial sections
+    EmitInitial();
+  
+    // Create all the compile unit DIEs.
+    ConstructCompileUnitDIEs();
+    
+    // Create DIEs for each of the externally visible global variables.
+    ConstructGlobalDIEs();
+
+    // Create DIEs for each of the externally visible subprograms.
+    ConstructSubprogramDIEs();
+    
+    // Prime section data.
+    SectionMap.insert(std::string("\t") + TAI->getTextSection());
+  }
+}
+
 /// BeginModule - Emit all Dwarf sections that should come prior to the content.
 ///
-void DwarfWriter::BeginModule(Module &M) {
+void DwarfWriter::BeginModule(Module *M) {
+  this->M = M;
+  
   if (!ShouldEmitDwarf()) return;
   EOL("Dwarf Begin Module");
 }
 
 /// EndModule - Emit all Dwarf sections that should come after the content.
 ///
-void DwarfWriter::EndModule(Module &M) {
+void DwarfWriter::EndModule() {
   if (!ShouldEmitDwarf()) return;
   EOL("Dwarf End Module");
   
   // Standard sections final addresses.
-  Asm->SwitchSection(TextSection, 0);
+  Asm->SwitchToTextSection(TAI->getTextSection(), 0);
   EmitLabel("text_end", 0);
-  Asm->SwitchSection(DataSection, 0);
+  Asm->SwitchToDataSection(TAI->getDataSection(), 0);
   EmitLabel("data_end", 0);
   
-  // Create all the compile unit DIEs.
-  ConstructCompileUnitDIEs();
+  // End text sections.
+  for (unsigned i = 1, N = SectionMap.size(); i <= N; ++i) {
+    Asm->SwitchToTextSection(SectionMap[i].c_str(), 0);
+    EmitLabel("section_end", i);
+  }
   
-  // Create DIEs for each of the externally visible global variables.
-  ConstructGlobalDIEs(M);
-
   // Compute DIE offsets and sizes.
   SizeAndOffsets();
   
@@ -1861,15 +2568,9 @@ void DwarfWriter::EndModule(Module &M) {
   // Emit source line correspondence into a debug line section.
   EmitDebugLines();
   
-  // Emit info into a debug frame section.
-  EmitDebugFrame();
-  
   // Emit info into a debug pubnames section.
   EmitDebugPubNames();
   
-  // Emit info into a debug pubtypes section.
-  EmitDebugPubTypes();
-  
   // Emit info into a debug str section.
   EmitDebugStr();
   
@@ -1886,16 +2587,52 @@ void DwarfWriter::EndModule(Module &M) {
   EmitDebugMacInfo();
 }
 
-/// BeginFunction - Gather pre-function debug information.
-///
-void DwarfWriter::BeginFunction(MachineFunction &MF) {
+/// BeginFunction - Gather pre-function debug information.  Assumes being 
+/// emitted immediately after the function entry point.
+void DwarfWriter::BeginFunction(MachineFunction *MF) {
+  this->MF = MF;
+  
   if (!ShouldEmitDwarf()) return;
   EOL("Dwarf Begin Function");
+
+  // Begin accumulating function debug information.
+  DebugInfo->BeginFunction(MF);
+  
+  // Assumes in correct section after the entry point.
+  EmitLabel("func_begin", ++SubprogramCount);
 }
 
 /// EndFunction - Gather and emit post-function debug information.
 ///
-void DwarfWriter::EndFunction(MachineFunction &MF) {
+void DwarfWriter::EndFunction() {
   if (!ShouldEmitDwarf()) return;
   EOL("Dwarf End Function");
+  
+  // Define end label for subprogram.
+  EmitLabel("func_end", SubprogramCount);
+    
+  // Get function line info.
+  std::vector<SourceLineInfo *> &LineInfos = DebugInfo->getSourceLines();
+
+  if (!LineInfos.empty()) {
+    // Get section line info.
+    unsigned ID = SectionMap.insert(Asm->CurrentSection);
+    if (SectionSourceLines.size() < ID) SectionSourceLines.resize(ID);
+    std::vector<SourceLineInfo *> &SectionLineInfos =SectionSourceLines[ID-1];
+    // Append the function info to section info.
+    SectionLineInfos.insert(SectionLineInfos.end(),
+                            LineInfos.begin(), LineInfos.end());
+  }
+  
+  // Construct scopes for subprogram.
+  ConstructRootScope(DebugInfo->getRootScope());
+  
+  // Emit function frame information.
+  EmitFunctionDebugFrame();
+  
+  // Reset the line numbers for the next function.
+  LineInfos.clear();
+
+  // Clear function debug information.
+  DebugInfo->EndFunction();
 }