6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-12 18:33:22 +00:00
Code Issues Projects Releases Wiki Activity

Use context and not compile unit.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@26453 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jim Laskey 2006-03-01 18:20:30 +00:00
parent 288fe0f74d
commit 92ae740396
2 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/llvm/CodeGen/DwarfWriter.h
View File

@ -296,13 +296,13 @@ public:
/// NewBasicType - Creates a new basic type if necessary, then adds to the /// NewBasicType - Creates a new basic type if necessary, then adds to the
/// owner. /// owner.
/// FIXME - Should never be needed. /// FIXME - Should never be needed.
DIE *NewBasicType(CompileUnit *Unit, Type *Ty); DIE *NewBasicType(DIE *Context, Type *Ty);
private: private:
/// NewType - Create a new type DIE. /// NewType - Create a new type DIE.
/// ///
DIE *DwarfWriter::NewType(CompileUnit *Unit, TypeDesc *TyDesc); DIE *DwarfWriter::NewType(DIE *Context, TypeDesc *TyDesc);
/// NewCompileUnit - Create new compile unit and it's die. /// NewCompileUnit - Create new compile unit and it's die.
/// ///

24
lib/CodeGen/DwarfWriter.cpp
View File

@ -967,7 +967,7 @@ DWLabel DwarfWriter::NewString(const std::string &String) {
/// NewBasicType - Creates a new basic type if necessary, then adds to the /// NewBasicType - Creates a new basic type if necessary, then adds to the
/// owner. /// owner.
/// FIXME - Should never be needed. /// FIXME - Should never be needed.
DIE *DwarfWriter::NewBasicType(CompileUnit *Unit, Type *Ty) { DIE *DwarfWriter::NewBasicType(DIE *Context, Type *Ty) {
DIE *&Slot = TypeToDieMap[Ty]; DIE *&Slot = TypeToDieMap[Ty];
if (Slot) return Slot; if (Slot) return Slot;
@ -1040,17 +1040,19 @@ DIE *DwarfWriter::NewBasicType(CompileUnit *Unit, Type *Ty) {
Slot->AddUInt (DW_AT_byte_size, 0, Size); Slot->AddUInt (DW_AT_byte_size, 0, Size);
Slot->AddUInt (DW_AT_encoding, DW_FORM_data1, Encoding); Slot->AddUInt (DW_AT_encoding, DW_FORM_data1, Encoding);
// Add to context owner. // Add to context.
Unit->getDie()->AddChild(Slot); Context->AddChild(Slot);
return Slot; return Slot;
} }
/// NewType - Create a new type DIE. /// NewType - Create a new type DIE.
/// ///
DIE *DwarfWriter::NewType(CompileUnit *Unit, TypeDesc *TyDesc) { DIE *DwarfWriter::NewType(DIE *Context, TypeDesc *TyDesc) {
// FIXME - hack to get around NULL types short term. // FIXME - hack to get around NULL types short term.
if (!TyDesc) return NewBasicType(Unit, Type::IntTy); if (!TyDesc) return NewBasicType(Context, Type::IntTy);
// FIXME - Should handle other contexts that compile units.
// Check for pre-existence. // Check for pre-existence.
DIE *&Slot = DescToDieMap[TyDesc]; DIE *&Slot = DescToDieMap[TyDesc];
@ -1085,7 +1087,7 @@ DIE *DwarfWriter::NewType(CompileUnit *Unit, TypeDesc *TyDesc) {
// Map to main type, void will not have a type. // Map to main type, void will not have a type.
if (TypeDesc *FromTy = DerivedTy->getFromType()) { if (TypeDesc *FromTy = DerivedTy->getFromType()) {
Ty->AddDIEntry(DW_AT_type, DW_FORM_ref4, NewType(Unit, FromTy)); Ty->AddDIEntry(DW_AT_type, DW_FORM_ref4, NewType(Context, FromTy));
} }
} else if (CompositeTypeDesc *CompTy = dyn_cast<CompositeTypeDesc>(TyDesc)) { } else if (CompositeTypeDesc *CompTy = dyn_cast<CompositeTypeDesc>(TyDesc)) {
// Determine which composite type. // Determine which composite type.
@ -1106,7 +1108,7 @@ DIE *DwarfWriter::NewType(CompileUnit *Unit, TypeDesc *TyDesc) {
case DI_TAG_array: { case DI_TAG_array: {
// Add element type. // Add element type.
if (TypeDesc *FromTy = CompTy->getFromType()) { if (TypeDesc *FromTy = CompTy->getFromType()) {
Ty->AddDIEntry(DW_AT_type, DW_FORM_ref4, NewType(Unit, FromTy)); Ty->AddDIEntry(DW_AT_type, DW_FORM_ref4, NewType(Context, FromTy));
} }
// Don't emit size attribute. // Don't emit size attribute.
Size = 0; Size = 0;
@ -1116,7 +1118,7 @@ DIE *DwarfWriter::NewType(CompileUnit *Unit, TypeDesc *TyDesc) {
IndexTy->AddUInt(DW_AT_byte_size, 0, 4); IndexTy->AddUInt(DW_AT_byte_size, 0, 4);
IndexTy->AddUInt(DW_AT_encoding, DW_FORM_data1, DW_ATE_signed); IndexTy->AddUInt(DW_AT_encoding, DW_FORM_data1, DW_ATE_signed);
// Add to context. // Add to context.
Unit->getDie()->AddChild(IndexTy); Context->AddChild(IndexTy);
// Add subranges to array type. // Add subranges to array type.
for(unsigned i = 0, N = Elements.size(); i < N; ++i) { for(unsigned i = 0, N = Elements.size(); i < N; ++i) {
@ -1166,7 +1168,7 @@ DIE *DwarfWriter::NewType(CompileUnit *Unit, TypeDesc *TyDesc) {
} }
// Add to context owner. // Add to context owner.
Unit->getDie()->AddChild(Ty); Context->AddChild(Ty);
return Slot; return Slot;
} }
@ -1226,7 +1228,7 @@ DIE *DwarfWriter::NewGlobalVariable(GlobalVariableDesc *GVD) {
unsigned Line = GVD->getLine(); unsigned Line = GVD->getLine();
// Get the global's type. // Get the global's type.
DIE *Type = NewType(Unit, GVD->getTypeDesc()); DIE *Type = NewType(Unit->getDie(), GVD->getTypeDesc());
// Create the globale variable DIE. // Create the globale variable DIE.
DIE *VariableDie = new DIE(DW_TAG_variable); DIE *VariableDie = new DIE(DW_TAG_variable);
@ -1269,7 +1271,7 @@ DIE *DwarfWriter::NewSubprogram(SubprogramDesc *SPD) {
unsigned Line = 1; unsigned Line = 1;
// FIXME - faking the type for the time being. // FIXME - faking the type for the time being.
DIE *Type = NewBasicType(Unit, Type::IntTy); DIE *Type = NewBasicType(Unit->getDie(), Type::IntTy);
DIE *SubprogramDie = new DIE(DW_TAG_subprogram); DIE *SubprogramDie = new DIE(DW_TAG_subprogram);
SubprogramDie->AddString (DW_AT_name, DW_FORM_string, Name); SubprogramDie->AddString (DW_AT_name, DW_FORM_string, Name);