6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-08-25 16:29:20 +00:00
Code Issues Projects Releases Wiki Activity

Remove intermediate accelerator table for names.

Browse Source 
(similar changes coming for the other accelerator tables)

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@207049 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
David Blaikie 2014-04-23 23:37:35 +00:00
parent 306d5ba092
commit c8bd54be97
4 changed files with 27 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/CodeGen/AsmPrinter/DwarfDebug.cpp
View File

@ -15,7 +15,6 @@
#include "DwarfDebug.h"
#include "DIE.h"
#include "DIEHash.h"
#include "DwarfAccelTable.h"
#include "DwarfUnit.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/Statistic.h"
@ -169,7 +168,9 @@ DwarfDebug::DwarfDebug(AsmPrinter *A, Module *M)
: Asm(A), MMI(Asm->MMI), FirstCU(0), PrevLabel(NULL), GlobalRangeCount(0),
InfoHolder(A, "info_string", DIEValueAllocator),
UsedNonDefaultText(false),
SkeletonHolder(A, "skel_string", DIEValueAllocator) {
SkeletonHolder(A, "skel_string", DIEValueAllocator),
AccelNames(DwarfAccelTable::Atom(dwarf::DW_ATOM_die_offset,
dwarf::DW_FORM_data4)) {
DwarfInfoSectionSym = DwarfAbbrevSectionSym = DwarfStrSectionSym = 0;
DwarfDebugRangeSectionSym = DwarfDebugLocSectionSym = DwarfLineSectionSym = 0;
@ -260,15 +261,15 @@ static bool SectionSort(const MCSection *A, const MCSection *B) {
// TODO: Determine whether or not we should add names for programs
// that do not have a DW_AT_name or DW_AT_linkage_name field - this
// is only slightly different than the lookup of non-standard ObjC names.
static void addSubprogramNames(DwarfUnit &TheU, DISubprogram SP, DIE *Die) {
void DwarfDebug::addSubprogramNames(DwarfUnit &TheU, DISubprogram SP, DIE *Die) {
if (!SP.isDefinition())
return;
TheU.addAccelName(SP.getName(), Die);
addAccelName(SP.getName(), Die);
// If the linkage name is different than the name, go ahead and output
// that as well into the name table.
if (SP.getLinkageName() != "" && SP.getName() != SP.getLinkageName())
TheU.addAccelName(SP.getLinkageName(), Die);
addAccelName(SP.getLinkageName(), Die);
// If this is an Objective-C selector name add it to the ObjC accelerator
// too.
@ -279,7 +280,7 @@ static void addSubprogramNames(DwarfUnit &TheU, DISubprogram SP, DIE *Die) {
if (Category != "")
TheU.addAccelObjC(Category, Die);
// Also add the base method name to the name table.
TheU.addAccelName(getObjCMethodName(SP.getName()), Die);
addAccelName(getObjCMethodName(SP.getName()), Die);
}
}
@ -2566,3 +2567,14 @@ void DwarfDebug::attachLowHighPC(DwarfCompileUnit &Unit, DIE *D,
else
Unit.addLabelDelta(D, dwarf::DW_AT_high_pc, End, Begin);
}
// Accelerator table mutators - add each name along with its companion
// DIE to the proper table while ensuring that the name that we're going
// to reference is in the string table. We do this since the names we
// add may not only be identical to the names in the DIE.
void DwarfDebug::addAccelName(StringRef Name, const DIE *Die) {
if (!useDwarfAccelTables())
return;
InfoHolder.getStringPoolEntry(Name);
AccelNames.AddName(Name, Die);
}

7
lib/CodeGen/AsmPrinter/DwarfDebug.h
View File

@ -19,6 +19,7 @@
#include "DIE.h"
#include "DebugLocEntry.h"
#include "DebugLocList.h"
#include "DwarfAccelTable.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/MapVector.h"
#include "llvm/ADT/SmallPtrSet.h"
@ -323,6 +324,8 @@ class DwarfDebug : public AsmPrinterHandler {
AddressPool AddrPool;
DwarfAccelTable AccelNames;
MCDwarfDwoLineTable *getDwoLineTable(const DwarfCompileUnit &);
void addScopeVariable(LexicalScope *LS, DbgVariable *Var);
@ -634,7 +637,11 @@ public:
/// or another context nested inside a subprogram.
bool isSubprogramContext(const MDNode *Context);
void addSubprogramNames(DwarfUnit &TheU, DISubprogram SP, DIE *Die);
AddressPool &getAddressPool() { return AddrPool; }
void addAccelName(StringRef Name, const DIE *Die);
};
} // End of namespace llvm

16
lib/CodeGen/AsmPrinter/DwarfUnit.cpp
View File

@ -1065,18 +1065,6 @@ void DwarfUnit::addType(DIE *Entity, DIType Ty, dwarf::Attribute Attribute) {
addDIEEntry(Entity, Attribute, Entry);
}
// Accelerator table mutators - add each name along with its companion
// DIE to the proper table while ensuring that the name that we're going
// to reference is in the string table. We do this since the names we
// add may not only be identical to the names in the DIE.
void DwarfUnit::addAccelName(StringRef Name, const DIE *Die) {
if (!DD->useDwarfAccelTables())
return;
DU->getStringPoolEntry(Name);
std::vector<const DIE *> &DIEs = AccelNames[Name];
DIEs.push_back(Die);
}
void DwarfUnit::addAccelObjC(StringRef Name, const DIE *Die) {
if (!DD->useDwarfAccelTables())
return;
@ -1727,12 +1715,12 @@ void DwarfCompileUnit::createGlobalVariableDIE(DIGlobalVariable GV) {
if (addToAccelTable) {
DIE *AddrDIE = VariableSpecDIE ? VariableSpecDIE : VariableDIE;
addAccelName(GV.getName(), AddrDIE);
DD->addAccelName(GV.getName(), AddrDIE);
// If the linkage name is different than the name, go ahead and output
// that as well into the name table.
if (GV.getLinkageName() != "" && GV.getName() != GV.getLinkageName())
addAccelName(GV.getLinkageName(), AddrDIE);
DD->addAccelName(GV.getLinkageName(), AddrDIE);
}
if (!GV.isLocalToUnit())

3
lib/CodeGen/AsmPrinter/DwarfUnit.h
View File

@ -275,9 +275,6 @@ public:
///
void addGlobalName(StringRef Name, DIE *Die, DIScope Context);
/// addAccelName - Add a new name to the name accelerator table.
void addAccelName(StringRef Name, const DIE *Die);
/// addAccelObjC - Add a new name to the ObjC accelerator table.
void addAccelObjC(StringRef Name, const DIE *Die);