mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-09-12 05:56:25 +00:00
Multiple DW_TAG_compile_unit is not used, afaict, on any target.
Update dwarf writer to only emit one DW_TAG_compile_unit per .o file. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74449 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
475839e9a9
commit
70f4426750
@ -1093,13 +1093,8 @@ void DwarfDebug::ConstructFunctionDbgScope(DbgScope *RootScope,
|
|||||||
// Get the subprogram debug information entry.
|
// Get the subprogram debug information entry.
|
||||||
DISubprogram SPD(Desc.getGV());
|
DISubprogram SPD(Desc.getGV());
|
||||||
|
|
||||||
// Get the compile unit context.
|
|
||||||
CompileUnit *Unit = MainCU;
|
|
||||||
if (!Unit)
|
|
||||||
Unit = &FindCompileUnit(SPD.getCompileUnit());
|
|
||||||
|
|
||||||
// Get the subprogram die.
|
// Get the subprogram die.
|
||||||
DIE *SPDie = Unit->getDieMapSlotFor(SPD.getGV());
|
DIE *SPDie = MainCU->getDieMapSlotFor(SPD.getGV());
|
||||||
assert(SPDie && "Missing subprogram descriptor");
|
assert(SPDie && "Missing subprogram descriptor");
|
||||||
|
|
||||||
if (!AbstractScope) {
|
if (!AbstractScope) {
|
||||||
@ -1112,14 +1107,13 @@ void DwarfDebug::ConstructFunctionDbgScope(DbgScope *RootScope,
|
|||||||
AddAddress(SPDie, dwarf::DW_AT_frame_base, Location);
|
AddAddress(SPDie, dwarf::DW_AT_frame_base, Location);
|
||||||
}
|
}
|
||||||
|
|
||||||
ConstructDbgScope(RootScope, 0, 0, SPDie, Unit);
|
ConstructDbgScope(RootScope, 0, 0, SPDie, MainCU);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// ConstructDefaultDbgScope - Construct a default scope for the subprogram.
|
/// ConstructDefaultDbgScope - Construct a default scope for the subprogram.
|
||||||
///
|
///
|
||||||
void DwarfDebug::ConstructDefaultDbgScope(MachineFunction *MF) {
|
void DwarfDebug::ConstructDefaultDbgScope(MachineFunction *MF) {
|
||||||
const char *FnName = MF->getFunction()->getNameStart();
|
const char *FnName = MF->getFunction()->getNameStart();
|
||||||
if (MainCU) {
|
|
||||||
StringMap<DIE*> &Globals = MainCU->getGlobals();
|
StringMap<DIE*> &Globals = MainCU->getGlobals();
|
||||||
StringMap<DIE*>::iterator GI = Globals.find(FnName);
|
StringMap<DIE*>::iterator GI = Globals.find(FnName);
|
||||||
if (GI != Globals.end()) {
|
if (GI != Globals.end()) {
|
||||||
@ -1133,34 +1127,7 @@ void DwarfDebug::ConstructDefaultDbgScope(MachineFunction *MF) {
|
|||||||
|
|
||||||
MachineLocation Location(RI->getFrameRegister(*MF));
|
MachineLocation Location(RI->getFrameRegister(*MF));
|
||||||
AddAddress(SPDie, dwarf::DW_AT_frame_base, Location);
|
AddAddress(SPDie, dwarf::DW_AT_frame_base, Location);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
for (unsigned i = 0, e = CompileUnits.size(); i != e; ++i) {
|
|
||||||
CompileUnit *Unit = CompileUnits[i];
|
|
||||||
StringMap<DIE*> &Globals = Unit->getGlobals();
|
|
||||||
StringMap<DIE*>::iterator GI = Globals.find(FnName);
|
|
||||||
if (GI != Globals.end()) {
|
|
||||||
DIE *SPDie = GI->second;
|
|
||||||
|
|
||||||
// Add the function bounds.
|
|
||||||
AddLabel(SPDie, dwarf::DW_AT_low_pc, dwarf::DW_FORM_addr,
|
|
||||||
DWLabel("func_begin", SubprogramCount));
|
|
||||||
AddLabel(SPDie, dwarf::DW_AT_high_pc, dwarf::DW_FORM_addr,
|
|
||||||
DWLabel("func_end", SubprogramCount));
|
|
||||||
|
|
||||||
MachineLocation Location(RI->getFrameRegister(*MF));
|
|
||||||
AddAddress(SPDie, dwarf::DW_AT_frame_base, Location);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#if 0
|
|
||||||
// FIXME: This is causing an abort because C++ mangled names are compared with
|
|
||||||
// their unmangled counterparts. See PR2885. Don't do this assert.
|
|
||||||
assert(0 && "Couldn't find DIE for machine function!");
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// GetOrCreateSourceID - Look up the source id with the given directory and
|
/// GetOrCreateSourceID - Look up the source id with the given directory and
|
||||||
@ -1233,8 +1200,9 @@ void DwarfDebug::ConstructCompileUnit(GlobalVariable *GV) {
|
|||||||
dwarf::DW_FORM_data1, RVer);
|
dwarf::DW_FORM_data1, RVer);
|
||||||
|
|
||||||
CompileUnit *Unit = new CompileUnit(ID, Die);
|
CompileUnit *Unit = new CompileUnit(ID, Die);
|
||||||
if (DIUnit.isMain()) {
|
if (!MainCU && DIUnit.isMain()) {
|
||||||
assert(!MainCU && "Multiple main compile units are found!");
|
// Use first compile unit marked as isMain as the compile unit
|
||||||
|
// for this module.
|
||||||
MainCU = Unit;
|
MainCU = Unit;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1244,16 +1212,13 @@ void DwarfDebug::ConstructCompileUnit(GlobalVariable *GV) {
|
|||||||
|
|
||||||
void DwarfDebug::ConstructGlobalVariableDIE(GlobalVariable *GV) {
|
void DwarfDebug::ConstructGlobalVariableDIE(GlobalVariable *GV) {
|
||||||
DIGlobalVariable DI_GV(GV);
|
DIGlobalVariable DI_GV(GV);
|
||||||
CompileUnit *DW_Unit = MainCU;
|
|
||||||
if (!DW_Unit)
|
|
||||||
DW_Unit = &FindCompileUnit(DI_GV.getCompileUnit());
|
|
||||||
|
|
||||||
// Check for pre-existence.
|
// Check for pre-existence.
|
||||||
DIE *&Slot = DW_Unit->getDieMapSlotFor(DI_GV.getGV());
|
DIE *&Slot = MainCU->getDieMapSlotFor(DI_GV.getGV());
|
||||||
if (Slot)
|
if (Slot)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
DIE *VariableDie = CreateGlobalVariableDIE(DW_Unit, DI_GV);
|
DIE *VariableDie = CreateGlobalVariableDIE(MainCU, DI_GV);
|
||||||
|
|
||||||
// Add address.
|
// Add address.
|
||||||
DIEBlock *Block = new DIEBlock();
|
DIEBlock *Block = new DIEBlock();
|
||||||
@ -1267,22 +1232,19 @@ void DwarfDebug::ConstructGlobalVariableDIE(GlobalVariable *GV) {
|
|||||||
Slot = VariableDie;
|
Slot = VariableDie;
|
||||||
|
|
||||||
// Add to context owner.
|
// Add to context owner.
|
||||||
DW_Unit->getDie()->AddChild(VariableDie);
|
MainCU->getDie()->AddChild(VariableDie);
|
||||||
|
|
||||||
// Expose as global. FIXME - need to check external flag.
|
// Expose as global. FIXME - need to check external flag.
|
||||||
std::string Name;
|
std::string Name;
|
||||||
DW_Unit->AddGlobal(DI_GV.getName(Name), VariableDie);
|
MainCU->AddGlobal(DI_GV.getName(Name), VariableDie);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
void DwarfDebug::ConstructSubprogram(GlobalVariable *GV) {
|
void DwarfDebug::ConstructSubprogram(GlobalVariable *GV) {
|
||||||
DISubprogram SP(GV);
|
DISubprogram SP(GV);
|
||||||
CompileUnit *Unit = MainCU;
|
|
||||||
if (!Unit)
|
|
||||||
Unit = &FindCompileUnit(SP.getCompileUnit());
|
|
||||||
|
|
||||||
// Check for pre-existence.
|
// Check for pre-existence.
|
||||||
DIE *&Slot = Unit->getDieMapSlotFor(GV);
|
DIE *&Slot = MainCU->getDieMapSlotFor(GV);
|
||||||
if (Slot)
|
if (Slot)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@ -1291,17 +1253,17 @@ void DwarfDebug::ConstructSubprogram(GlobalVariable *GV) {
|
|||||||
// class type.
|
// class type.
|
||||||
return;
|
return;
|
||||||
|
|
||||||
DIE *SubprogramDie = CreateSubprogramDIE(Unit, SP);
|
DIE *SubprogramDie = CreateSubprogramDIE(MainCU, SP);
|
||||||
|
|
||||||
// Add to map.
|
// Add to map.
|
||||||
Slot = SubprogramDie;
|
Slot = SubprogramDie;
|
||||||
|
|
||||||
// Add to context owner.
|
// Add to context owner.
|
||||||
Unit->getDie()->AddChild(SubprogramDie);
|
MainCU->getDie()->AddChild(SubprogramDie);
|
||||||
|
|
||||||
// Expose as global.
|
// Expose as global.
|
||||||
std::string Name;
|
std::string Name;
|
||||||
Unit->AddGlobal(SP.getName(Name), SubprogramDie);
|
MainCU->AddGlobal(SP.getName(Name), SubprogramDie);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1331,6 +1293,11 @@ void DwarfDebug::BeginModule(Module *M, MachineModuleInfo *mmi) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If main compile unit for this module is not seen than randomly
|
||||||
|
// select first compile unit.
|
||||||
|
if (!MainCU)
|
||||||
|
MainCU = CompileUnits[0];
|
||||||
|
|
||||||
// If there is not any debug info available for any global variables and any
|
// If there is not any debug info available for any global variables and any
|
||||||
// subprograms then there is not any debug info to emit.
|
// subprograms then there is not any debug info to emit.
|
||||||
if (GVs.empty() && SPs.empty()) {
|
if (GVs.empty() && SPs.empty()) {
|
||||||
@ -1707,9 +1674,6 @@ unsigned DwarfDebug::RecordInlinedFnStart(DISubprogram &SP, DICompileUnit CU,
|
|||||||
if (TimePassesIsEnabled)
|
if (TimePassesIsEnabled)
|
||||||
DebugTimer->startTimer();
|
DebugTimer->startTimer();
|
||||||
|
|
||||||
CompileUnit *Unit = MainCU;
|
|
||||||
if (!Unit)
|
|
||||||
Unit = &FindCompileUnit(SP.getCompileUnit());
|
|
||||||
GlobalVariable *GV = SP.getGV();
|
GlobalVariable *GV = SP.getGV();
|
||||||
DenseMap<const GlobalVariable *, DbgScope *>::iterator
|
DenseMap<const GlobalVariable *, DbgScope *>::iterator
|
||||||
II = AbstractInstanceRootMap.find(GV);
|
II = AbstractInstanceRootMap.find(GV);
|
||||||
@ -1720,9 +1684,9 @@ unsigned DwarfDebug::RecordInlinedFnStart(DISubprogram &SP, DICompileUnit CU,
|
|||||||
DbgScope *Scope = new DbgScope(NULL, DIDescriptor(GV));
|
DbgScope *Scope = new DbgScope(NULL, DIDescriptor(GV));
|
||||||
|
|
||||||
// Get the compile unit context.
|
// Get the compile unit context.
|
||||||
DIE *SPDie = Unit->getDieMapSlotFor(GV);
|
DIE *SPDie = MainCU->getDieMapSlotFor(GV);
|
||||||
if (!SPDie)
|
if (!SPDie)
|
||||||
SPDie = CreateSubprogramDIE(Unit, SP, false, true);
|
SPDie = CreateSubprogramDIE(MainCU, SP, false, true);
|
||||||
|
|
||||||
// Mark as being inlined. This makes this subprogram entry an abstract
|
// Mark as being inlined. This makes this subprogram entry an abstract
|
||||||
// instance root.
|
// instance root.
|
||||||
@ -1741,12 +1705,12 @@ unsigned DwarfDebug::RecordInlinedFnStart(DISubprogram &SP, DICompileUnit CU,
|
|||||||
// Create a concrete inlined instance for this inlined function.
|
// Create a concrete inlined instance for this inlined function.
|
||||||
DbgConcreteScope *ConcreteScope = new DbgConcreteScope(DIDescriptor(GV));
|
DbgConcreteScope *ConcreteScope = new DbgConcreteScope(DIDescriptor(GV));
|
||||||
DIE *ScopeDie = new DIE(dwarf::DW_TAG_inlined_subroutine);
|
DIE *ScopeDie = new DIE(dwarf::DW_TAG_inlined_subroutine);
|
||||||
ScopeDie->setAbstractCompileUnit(Unit);
|
ScopeDie->setAbstractCompileUnit(MainCU);
|
||||||
|
|
||||||
DIE *Origin = Unit->getDieMapSlotFor(GV);
|
DIE *Origin = MainCU->getDieMapSlotFor(GV);
|
||||||
AddDIEEntry(ScopeDie, dwarf::DW_AT_abstract_origin,
|
AddDIEEntry(ScopeDie, dwarf::DW_AT_abstract_origin,
|
||||||
dwarf::DW_FORM_ref4, Origin);
|
dwarf::DW_FORM_ref4, Origin);
|
||||||
AddUInt(ScopeDie, dwarf::DW_AT_call_file, 0, Unit->getID());
|
AddUInt(ScopeDie, dwarf::DW_AT_call_file, 0, MainCU->getID());
|
||||||
AddUInt(ScopeDie, dwarf::DW_AT_call_line, 0, Line);
|
AddUInt(ScopeDie, dwarf::DW_AT_call_line, 0, Line);
|
||||||
AddUInt(ScopeDie, dwarf::DW_AT_call_column, 0, Col);
|
AddUInt(ScopeDie, dwarf::DW_AT_call_column, 0, Col);
|
||||||
|
|
||||||
@ -1907,22 +1871,8 @@ void DwarfDebug::SizeAndOffsets() {
|
|||||||
sizeof(int32_t) + // Offset Into Abbrev. Section
|
sizeof(int32_t) + // Offset Into Abbrev. Section
|
||||||
sizeof(int8_t); // Pointer Size (in bytes)
|
sizeof(int8_t); // Pointer Size (in bytes)
|
||||||
|
|
||||||
// Process base compile unit.
|
|
||||||
if (MainCU) {
|
|
||||||
SizeAndOffsetDie(MainCU->getDie(), Offset, true);
|
SizeAndOffsetDie(MainCU->getDie(), Offset, true);
|
||||||
CompileUnitOffsets[MainCU] = 0;
|
CompileUnitOffsets[MainCU] = 0;
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Process all compile units.
|
|
||||||
unsigned PrevOffset = 0;
|
|
||||||
|
|
||||||
for (unsigned i = 0, e = CompileUnits.size(); i != e; ++i) {
|
|
||||||
CompileUnit *Unit = CompileUnits[i];
|
|
||||||
CompileUnitOffsets[Unit] = PrevOffset;
|
|
||||||
PrevOffset += SizeAndOffsetDie(Unit->getDie(), Offset, true)
|
|
||||||
+ sizeof(int32_t); // FIXME - extra pad for gdb bug.
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// EmitInitial - Emit initial Dwarf declarations. This is necessary for cc
|
/// EmitInitial - Emit initial Dwarf declarations. This is necessary for cc
|
||||||
@ -2067,13 +2017,7 @@ void DwarfDebug::EmitDebugInfo() {
|
|||||||
// Start debug info section.
|
// Start debug info section.
|
||||||
Asm->SwitchToDataSection(TAI->getDwarfInfoSection());
|
Asm->SwitchToDataSection(TAI->getDwarfInfoSection());
|
||||||
|
|
||||||
if (MainCU) {
|
|
||||||
EmitDebugInfoPerCU(MainCU);
|
EmitDebugInfoPerCU(MainCU);
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (unsigned i = 0, e = CompileUnits.size(); i != e; ++i)
|
|
||||||
EmitDebugInfoPerCU(CompileUnits[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// EmitAbbreviations - Emit the abbreviation section.
|
/// EmitAbbreviations - Emit the abbreviation section.
|
||||||
@ -2405,13 +2349,7 @@ void DwarfDebug::EmitDebugPubNames() {
|
|||||||
// Start the dwarf pubnames section.
|
// Start the dwarf pubnames section.
|
||||||
Asm->SwitchToDataSection(TAI->getDwarfPubNamesSection());
|
Asm->SwitchToDataSection(TAI->getDwarfPubNamesSection());
|
||||||
|
|
||||||
if (MainCU) {
|
|
||||||
EmitDebugPubNamesPerCU(MainCU);
|
EmitDebugPubNamesPerCU(MainCU);
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (unsigned i = 0, e = CompileUnits.size(); i != e; ++i)
|
|
||||||
EmitDebugPubNamesPerCU(CompileUnits[i]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/// EmitDebugStr - Emit visible names into a debug str section.
|
/// EmitDebugStr - Emit visible names into a debug str section.
|
||||||
|
Loading…
Reference in New Issue
Block a user