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

tools: teach objdump about FILE aux records 

Add support for file auxiliary symbol entries in COFF symbol tables.  A COFF
symbol table with a FILE entry is followed by sizeof(__FILE__) / 18 auxiliary
symbol records which contain the filename.  Read them and form the original
filename that the record contains.  Then display the name in the output.

llvm-svn: 206126
This commit is contained in:
Saleem Abdulrasool 2014-04-13 03:11:08 +00:00
parent 81c55b6255
commit 9ede5c7dd0
4 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/include/llvm/Object/COFF.h
View File

@ -287,6 +287,10 @@ struct coff_aux_weak_external {
char Unused[10];
};
struct coff_aux_file {
char FileName[18];
};
struct coff_aux_section_definition {
support::ulittle32_t Length;
support::ulittle16_t NumberOfRelocations;

BIN
llvm/test/tools/llvm-objdump/Inputs/file.obj.coff-arm Executable file
View File

Binary file not shown.

5
llvm/test/tools/llvm-objdump/coff-file.test Normal file
View File

@ -0,0 +1,5 @@
RUN: llvm-objdump -t %p/Inputs/file.obj.coff-arm | FileCheck %s
CHECK: .file
CHECK-NEXT: AUX /Users/compnerd/work/llvm/test/tools/llvm-readobj/Inputs/file.asm

30
llvm/tools/llvm-objdump/llvm-objdump.cpp
View File

@ -669,11 +669,21 @@ static void PrintCOFFSymbolTable(const COFFObjectFile *coff) {
const coff_symbol *symbol = 0;
for (int i = 0, e = header->NumberOfSymbols; i != e; ++i) {
if (aux_count--) {
// Figure out which type of aux this is.
if (symbol->isSectionDefinition()) { // Section definition.
switch (symbol->StorageClass) {
default: outs() << "AUX Unknown\n";
case COFF::IMAGE_SYM_CLASS_STATIC:
// Section definition. Follows a symbol-table record that defines a
// section. Such a record has a symbol name that is the name of a
// section and has storage class STATIC (3).
if (symbol->Value) {
errs() << "invalid entry in Symbol Table";
break;
}
const coff_aux_section_definition *asd;
if (error(coff->getAuxSymbol<coff_aux_section_definition>(i, asd)))
return;
outs() << "AUX "
<< format("scnlen 0x%x nreloc %d nlnno %d checksum 0x%x "
, unsigned(asd->Length)
@ -683,8 +693,20 @@ static void PrintCOFFSymbolTable(const COFFObjectFile *coff) {
<< format("assoc %d comdat %d\n"
, unsigned(asd->Number)
, unsigned(asd->Selection));
} else
outs() << "AUX Unknown\n";
break;
case COFF::IMAGE_SYM_CLASS_FILE:
SmallString<261> FileName;
for (unsigned AI = i, AE = i + aux_count + 1; AI < AE; ++AI) {
const coff_aux_file *AF;
if (error(coff->getAuxSymbol<coff_aux_file>(AI, AF)))
return;
FileName.append(&AF->FileName[0], &AF->FileName[18]);
}
outs() << "AUX " << FileName << '\n';
i = i + aux_count;
aux_count = 0;
break;
}
} else {
StringRef name;
if (error(coff->getSymbol(i, symbol))) return;