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

llvm-objdump/COFF: Print DLL name in the export table header. 

llvm-svn: 199422
This commit is contained in:
Rui Ueyama 2014-01-16 20:50:34 +00:00
parent 1792ebc1ab
commit da49d0d44c
4 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -406,9 +406,11 @@ public:
bool operator==(const ExportDirectoryEntryRef &Other) const;
error_code getNext(ExportDirectoryEntryRef &Result) const;
error_code getDllName(StringRef &Result) const;
error_code getOrdinal(uint32_t &Result) const;
error_code getExportRVA(uint32_t &Result) const;
error_code getName(StringRef &Result) const;
error_code getSymbolName(StringRef &Result) const;
private:
const export_directory_table_entry *ExportTable;

12
llvm/lib/Object/COFFObjectFile.cpp
View File

@ -949,6 +949,16 @@ ExportDirectoryEntryRef::getNext(ExportDirectoryEntryRef &Result) const {
return object_error::success;
}
// Returns the name of the current export symbol. If the symbol is exported only
// by ordinal, the empty string is set as a result.
error_code ExportDirectoryEntryRef::getDllName(StringRef &Result) const {
uintptr_t IntPtr = 0;
if (error_code EC = OwningObject->getRvaPtr(ExportTable->NameRVA, IntPtr))
return EC;
Result = StringRef(reinterpret_cast<const char *>(IntPtr));
return object_error::success;
}
// Returns the export ordinal of the current export symbol.
error_code ExportDirectoryEntryRef::getOrdinal(uint32_t &Result) const {
Result = ExportTable->OrdinalBase + Index;
@ -968,7 +978,7 @@ error_code ExportDirectoryEntryRef::getExportRVA(uint32_t &Result) const {
// Returns the name of the current export symbol. If the symbol is exported only
// by ordinal, the empty string is set as a result.
error_code ExportDirectoryEntryRef::getName(StringRef &Result) const {
error_code ExportDirectoryEntryRef::getSymbolName(StringRef &Result) const {
uintptr_t IntPtr = 0;
if (error_code EC = OwningObject->getRvaPtr(
ExportTable->OrdinalTableRVA, IntPtr))

1
llvm/test/tools/llvm-objdump/coff-private-headers.test
View File

@ -11,6 +11,7 @@ IMPORT-NEXT: 365 ExitProcess
// RUN: FileCheck -check-prefix=EXPORT %s
EXPORT: Export Table:
EXPORT-NEXT: DLL name: export.test.tmp3.dll
EXPORT-NEXT: Ordinal RVA Name
EXPORT-NEXT: 5 0x2008
EXPORT-NEXT: 6 0x2010 exportfn2

6
llvm/tools/llvm-objdump/COFFDump.cpp
View File

@ -279,6 +279,10 @@ static void printExportTable(const COFFObjectFile *Obj) {
export_directory_iterator E = Obj->export_directory_end();
if (I == E)
return;
StringRef DllName;
if (I->getDllName(DllName))
return;
outs() << " DLL name: " << DllName << "\n";
outs() << " Ordinal RVA Name\n";
error_code EC;
for (; I != E; I = I.increment(EC)) {
@ -293,7 +297,7 @@ static void printExportTable(const COFFObjectFile *Obj) {
outs() << format(" % 4d %# 8x", Ordinal, RVA);
StringRef Name;
if (I->getName(Name))
if (I->getSymbolName(Name))
continue;
if (!Name.empty())
outs() << " " << Name;