RPCSX/llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2024-11-23 11:49:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

objdump: Don't print a (always 0) size for MachO symbols.

Browse Source 
Only common symbol on MachO and COFF have a size.

For COFF we already had a custom format.

For MachO, there is no native objdump and we were printing it as ELF. Now
we only print the sizes for symbols that actually have them.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@240422 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2015-06-23 15:45:38 +00:00
parent 3800e768a2
commit bd1e605b5c
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/Object/objdump-symbol-table.test
View File

@ -30,9 +30,9 @@ ELF-i386: 00000000 *UND* 00000000 puts
macho-i386: trivial-object-test.macho-i386: file format Mach-O 32-bit i386
macho-i386: SYMBOL TABLE:
macho-i386: 00000000 g F __TEXT,__text 00000000 _main
macho-i386: 00000000 *UND* 00000000 _SomeOtherFunction
macho-i386: 00000000 *UND* 00000000 _puts
macho-i386: 00000000 g F __TEXT,__text _main
macho-i386: 00000000 *UND* _SomeOtherFunction
macho-i386: 00000000 *UND* _puts
ELF-shared: shared-object-test.elf-i386: file format
ELF-shared: SYMBOL TABLE:

10
test/tools/llvm-objdump/X86/macho-symbol-table.test
View File

@ -1,8 +1,8 @@
RUN: llvm-objdump -macho -t %p/Inputs/hello.obj.macho-x86_64 | FileCheck %s
CHECK: SYMBOL TABLE:
CHECK: 000000000000003b l F __TEXT,__cstring 00000000 L_.str
CHECK: 0000000000000068 l F __TEXT,__eh_frame 00000000 EH_frame0
CHECK: 0000000000000000 g F __TEXT,__text 00000000 _main
CHECK: 0000000000000080 g F __TEXT,__eh_frame 00000000 _main.eh
CHECK: 0000000000000000 *UND* 00000000 _printf
CHECK: 000000000000003b l F __TEXT,__cstring L_.str
CHECK: 0000000000000068 l F __TEXT,__eh_frame EH_frame0
CHECK: 0000000000000000 g F __TEXT,__text _main
CHECK: 0000000000000080 g F __TEXT,__eh_frame _main.eh
CHECK: 0000000000000000 *UND* _printf

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

@ -1085,7 +1085,6 @@ void llvm::PrintSymbolTable(const ObjectFile *o) {
continue;
if (error(Symbol.getType(Type)))
continue;
uint64_t Size = Symbol.getSize();
if (error(Symbol.getSection(Section)))
continue;
StringRef Name;
@ -1101,15 +1100,11 @@ void llvm::PrintSymbolTable(const ObjectFile *o) {
bool Common = Flags & SymbolRef::SF_Common;
bool Hidden = Flags & SymbolRef::SF_Hidden;
if (Common) {
uint32_t Alignment = Symbol.getAlignment();
Address = Size;
Size = Alignment;
}
if (Common)
Address = Symbol.getSize();
if (Address == UnknownAddressOrSize)
Address = 0;
if (Size == UnknownAddressOrSize)
Size = 0;
char GlobLoc = ' ';
if (Type != SymbolRef::ST_Unknown)
GlobLoc = Global ? 'g' : 'l';
@ -1151,8 +1146,13 @@ void llvm::PrintSymbolTable(const ObjectFile *o) {
SectionName = "";
outs() << SectionName;
}
outs() << '\t'
<< format("%08" PRIx64 " ", Size);
outs() << '\t';
if (Common)
outs() << format("%08" PRIx64 " ", Symbol.getAlignment());
else if (isa<ELFObjectFileBase>(o))
outs() << format("%08" PRIx64 " ", Symbol.getSize());
if (Hidden) {
outs() << ".hidden ";
}