Changes in directory llvm/lib/CodeGen:
DwarfWriter.cpp updated: 1.40 -> 1.41
MachineDebugInfo.cpp updated: 1.22 -> 1.23
---
Log message:
Adding basic structure support.
---
Diffs of the changes: (+46 -4)
DwarfWriter.cpp | 43 ++++++++++++++++++++++++++++++++++++++++---
MachineDebugInfo.cpp | 7 ++++++-
2 files changed, 46 insertions(+), 4 deletions(-)
Index: llvm/lib/CodeGen/DwarfWriter.cpp
diff -u llvm/lib/CodeGen/DwarfWriter.cpp:1.40
llvm/lib/CodeGen/DwarfWriter.cpp:1.41
--- llvm/lib/CodeGen/DwarfWriter.cpp:1.40 Wed Mar 1 17:52:37 2006
+++ llvm/lib/CodeGen/DwarfWriter.cpp Fri Mar 3 09:06:57 2006
@@ -41,6 +41,8 @@
class DIE;
//===----------------------------------------------------------------------===//
+// CompileUnit - This dwarf writer support class manages information associate
+// with a source file.
class CompileUnit {
private:
CompileUnitDesc *Desc; // Compile unit debug descriptor.
@@ -505,6 +507,13 @@
case DW_FORM_data8: DW.EmitInt64(Integer); break;
case DW_FORM_udata: DW.EmitULEB128Bytes(Integer); break;
case DW_FORM_sdata: DW.EmitSLEB128Bytes(Integer); break;
+ // FIXME - Punting on field offsets.
+ case DW_FORM_block1: {
+ DW.EmitInt8(1 + DW.SizeULEB128(Integer)); DW.EOL("Form1 Size");
+ DW.EmitInt8(DW_OP_plus_uconst); DW.EOL("DW_OP_plus_uconst");
+ DW.EmitULEB128Bytes(Integer);
+ break;
+ }
default: assert(0 && "DIE Value form not supported yet"); break;
}
}
@@ -520,6 +529,8 @@
case DW_FORM_data8: return sizeof(int64_t);
case DW_FORM_udata: return DW.SizeULEB128(Integer);
case DW_FORM_sdata: return DW.SizeSLEB128(Integer);
+ // FIXME - Punting on field offsets.
+ case DW_FORM_block1: return 2 + DW.SizeULEB128(Integer);
default: assert(0 && "DIE Value form not supported yet"); break;
}
return 0;
@@ -1117,10 +1128,36 @@
break;
}
- case DW_TAG_structure_type: {
- break;
- }
+ case DW_TAG_structure_type:
case DW_TAG_union_type: {
+ // FIXME - this is just the basics.
+ // Add elements to structure type.
+ for(unsigned i = 0, N = Elements.size(); i < N; ++i) {
+ DerivedTypeDesc *MemberDesc = cast<DerivedTypeDesc>(Elements[i]);
+ const std::string &Name = MemberDesc->getName();
+ unsigned Line = MemberDesc->getLine();
+ TypeDesc *MemTy = MemberDesc->getFromType();
+ uint64_t Size = MemberDesc->getSize();
+ uint64_t Offset = MemberDesc->getOffset();
+
+ DIE *Member = new DIE(DW_TAG_member);
+ if (!Name.empty()) Member->AddString(DW_AT_name, DW_FORM_string, Name);
+ if (CompileUnitDesc *File = MemberDesc->getFile()) {
+ CompileUnit *FileUnit = FindCompileUnit(File);
+ unsigned FileID = FileUnit->getID();
+ int Line = TyDesc->getLine();
+ Member->AddUInt(DW_AT_decl_file, 0, FileID);
+ Member->AddUInt(DW_AT_decl_line, 0, Line);
+ }
+ if (TypeDesc *FromTy = MemberDesc->getFromType()) {
+ Member->AddDIEntry(DW_AT_type, DW_FORM_ref4,
+ NewType(Context, FromTy));
+ }
+ // FIXME - Punt on the Address.
+ Member->AddUInt(DW_AT_data_member_location, DW_FORM_block1,
+ Offset >> 3);
+ Ty->AddChild(Member);
+ }
break;
}
case DW_TAG_enumeration_type: {
Index: llvm/lib/CodeGen/MachineDebugInfo.cpp
diff -u llvm/lib/CodeGen/MachineDebugInfo.cpp:1.22
llvm/lib/CodeGen/MachineDebugInfo.cpp:1.23
--- llvm/lib/CodeGen/MachineDebugInfo.cpp:1.22 Wed Mar 1 17:52:37 2006
+++ llvm/lib/CodeGen/MachineDebugInfo.cpp Fri Mar 3 09:06:57 2006
@@ -516,6 +516,7 @@
case DW_TAG_union_type:
case DW_TAG_enumeration_type: return new CompositeTypeDesc(Tag);
case DW_TAG_subrange_type: return new SubrangeDesc();
+ case DW_TAG_member: return new DerivedTypeDesc(DW_TAG_member);
case DW_TAG_enumerator: return new EnumeratorDesc();
default: break;
}
@@ -673,6 +674,7 @@
, Name("")
, File(NULL)
, Size(0)
+, Offset(0)
{}
/// ApplyToFields - Target the visitor to the fields of the TypeDesc.
@@ -685,6 +687,7 @@
Visitor->Apply((DebugInfoDesc *&)File);
Visitor->Apply(Line);
Visitor->Apply(Size);
+ Visitor->Apply(Offset);
}
/// getDescString - Return a string used to compose global names and labels.
@@ -707,7 +710,8 @@
<< "Name(\"" << Name << "\"), "
<< "File(" << File << "), "
<< "Line(" << Line << "), "
- << "Size(" << Size << ")\n";
+ << "Size(" << Size << "), "
+ << "Offset(" << Offset << ")\n";
}
#endif
@@ -771,6 +775,7 @@
case DW_TAG_const_type:
case DW_TAG_volatile_type:
case DW_TAG_restrict_type:
+ case DW_TAG_member:
return true;
default: break;
}
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
