maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

llvm-dwp: Handle dwo files produced by GCC 

To start with, handle DW_FORM_string names. Follow up commit will handle
the interesting quirk with type units I was originally aiming for here.

llvm-svn: 265452
This commit is contained in:
David Blaikie 2016-04-05 20:16:38 +00:00
parent ee5417da8f
commit 60fbd3bdb7
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
llvm/test/tools/llvm-dwp/Inputs/gcc_type/a.dwo Normal file
View File

Binary file not shown.

12
llvm/tools/llvm-dwp/llvm-dwp.cpp
View File

@ -126,8 +126,13 @@ struct CompileUnitIdentifiers {
const char *DWOName = ""; const char *DWOName = "";
}; };
static const char *getIndexedString(uint32_t StrIndex, StringRef StrOffsets, static const char *getIndexedString(uint32_t Form, DataExtractor InfoData,
uint32_t &InfoOffset, StringRef StrOffsets,
StringRef Str) { StringRef Str) {
if (Form == dwarf::DW_FORM_string)
return InfoData.getCStr(&InfoOffset);
assert(Form == dwarf::DW_FORM_GNU_str_index);
auto StrIndex = InfoData.getULEB128(&InfoOffset);
DataExtractor StrOffsetsData(StrOffsets, true, 0); DataExtractor StrOffsetsData(StrOffsets, true, 0);
uint32_t StrOffsetsOffset = 4 * StrIndex; uint32_t StrOffsetsOffset = 4 * StrIndex;
uint32_t StrOffset = StrOffsetsData.getU32(&StrOffsetsOffset); uint32_t StrOffset = StrOffsetsData.getU32(&StrOffsetsOffset);
@ -163,12 +168,11 @@ static CompileUnitIdentifiers getCUIdentifiers(StringRef Abbrev, StringRef Info,
(Name != 0 || Form != 0)) { (Name != 0 || Form != 0)) {
switch (Name) { switch (Name) {
case dwarf::DW_AT_name: { case dwarf::DW_AT_name: {
ID.Name = getIndexedString(InfoData.getULEB128(&Offset), StrOffsets, Str); ID.Name = getIndexedString(Form, InfoData, Offset, StrOffsets, Str);
break; break;
} }
case dwarf::DW_AT_GNU_dwo_name: { case dwarf::DW_AT_GNU_dwo_name: {
ID.DWOName = ID.DWOName = getIndexedString(Form, InfoData, Offset, StrOffsets, Str);
getIndexedString(InfoData.getULEB128(&Offset), StrOffsets, Str);
break; break;
} }
case dwarf::DW_AT_GNU_dwo_id: case dwarf::DW_AT_GNU_dwo_id: