This is an archive of the discontinued LLVM Phabricator instance.

Differential D5987

Fix getRelocationValueString to return the symbol name for EM_386.
ClosedPublic

Authored by jvoung on Oct 24 2014, 6:18 PM.

Details

Reviewers
dschuff
Commits
rGce2164f45c5f: Fix getRelocationValueString to return the symbol name for EM_386.
rL220866: Fix getRelocationValueString to return the symbol name for EM_386.
Summary

Fix getRelocationValueString to return the symbol name for EM_386.

This helps llvm-objdump -r to print out the symbol name along with the relocation type.
Adjust existing tests from checking for "Unknown" to check for the symbol now.

Diff Detail

Event Timeline

jvoung updated this revision to Diff 15447.Oct 24 2014, 6:18 PM
jvoung retitled this revision from to Fix getRelocationValueString to return the symbol name for EM_386..
jvoung updated this object.
jvoung edited the test plan for this revision. (Show Details)
jvoung added a subscriber: Unknown Object (MLST).
dschuff accepted this revision.Oct 29 2014, 10:59 AM
dschuff added a reviewer: dschuff.
dschuff added a subscriber: dschuff.

Maybe a little bit more detail in the commit message but otherwise LGTM

This revision is now accepted and ready to land.Oct 29 2014, 10:59 AM
jvoung updated this object.Oct 29 2014, 11:14 AM
jvoung edited edge metadata.
jvoung closed this revision.Oct 29 2014, 11:47 AM
jvoung updated this revision to Diff 15552.

Closed by commit rL220866 (authored by @jvoung).

Revision Contents

PathSize
include/
llvm/
Object/
1 line
test/
Object/
X86/
6 lines
6 lines

Diff 15447

include/llvm/Object/ELFObjectFile.h

Show First 20 Lines • Show All 732 Lines • ▼ Show 20 Lines case ELF::EM_AARCH64: {
raw_string_ostream fmt(fmtbuf); raw_string_ostream fmt(fmtbuf);
fmt << *SymName; fmt << *SymName;
if (addend != 0) if (addend != 0)
fmt << (addend < 0 ? "" : "+") << addend; fmt << (addend < 0 ? "" : "+") << addend;
fmt.flush(); fmt.flush();
Result.append(fmtbuf.begin(), fmtbuf.end()); Result.append(fmtbuf.begin(), fmtbuf.end());
break; break;
} }
case ELF::EM_386:
case ELF::EM_ARM: case ELF::EM_ARM:
case ELF::EM_HEXAGON: case ELF::EM_HEXAGON:
case ELF::EM_MIPS: case ELF::EM_MIPS:
res = *SymName; res = *SymName;
break; break;
default: default:
res = "Unknown"; res = "Unknown";
} }
▲ Show 20 Lines • Show All 203 Lines • Show Last 20 Lines

test/Object/X86/objdump-disassembly-inline-relocations.test

Show First 20 Lines • Show All 70 Lines • ▼ Show 20 Lines
MACHO-x86-64: 27: c3 ret MACHO-x86-64: 27: c3 ret
ELF-i386: file format ELF32-i386 ELF-i386: file format ELF32-i386
ELF-i386: Disassembly of section .text: ELF-i386: Disassembly of section .text:
ELF-i386: main: ELF-i386: main:
ELF-i386: 0: 83 ec 0c subl $12, %esp ELF-i386: 0: 83 ec 0c subl $12, %esp
ELF-i386: 3: c7 44 24 08 00 00 00 00 movl $0, 8(%esp) ELF-i386: 3: c7 44 24 08 00 00 00 00 movl $0, 8(%esp)
ELF-i386: b: c7 04 24 00 00 00 00 movl $0, (%esp) ELF-i386: b: c7 04 24 00 00 00 00 movl $0, (%esp)
ELF-i386: e: R_386_32 Unknown ELF-i386: e: R_386_32 .rodata.str1.1
ELF-i386: 12: e8 fc ff ff ff calll -4 ELF-i386: 12: e8 fc ff ff ff calll -4
ELF-i386: 13: R_386_PC32 Unknown ELF-i386: 13: R_386_PC32 puts
ELF-i386: 17: e8 fc ff ff ff calll -4 ELF-i386: 17: e8 fc ff ff ff calll -4
ELF-i386: 18: R_386_PC32 Unknown ELF-i386: 18: R_386_PC32 SomeOtherFunction
ELF-i386: 1c: 8b 44 24 08 movl 8(%esp), %eax ELF-i386: 1c: 8b 44 24 08 movl 8(%esp), %eax
ELF-i386: 20: 83 c4 0c addl $12, %esp ELF-i386: 20: 83 c4 0c addl $12, %esp
ELF-i386: 23: c3 ret ELF-i386: 23: c3 ret
ELF-x86-64: file format ELF64-x86-64 ELF-x86-64: file format ELF64-x86-64
ELF-x86-64: Disassembly of section .text: ELF-x86-64: Disassembly of section .text:
ELF-x86-64: main: ELF-x86-64: main:
ELF-x86-64: 0: 48 83 ec 08 subq $8, %rsp ELF-x86-64: 0: 48 83 ec 08 subq $8, %rsp
Show All 11 Lines

test/Object/objdump-relocations.test

Show All 21 Lines
COFF-i386: IMAGE_REL_I386_REL32 _SomeOtherFunction COFF-i386: IMAGE_REL_I386_REL32 _SomeOtherFunction
COFF-x86-64: .text COFF-x86-64: .text
COFF-x86-64: IMAGE_REL_AMD64_REL32 L.str COFF-x86-64: IMAGE_REL_AMD64_REL32 L.str
COFF-x86-64: IMAGE_REL_AMD64_REL32 puts COFF-x86-64: IMAGE_REL_AMD64_REL32 puts
COFF-x86-64: IMAGE_REL_AMD64_REL32 SomeOtherFunction COFF-x86-64: IMAGE_REL_AMD64_REL32 SomeOtherFunction
ELF-i386: .text ELF-i386: .text
ELF-i386: R_386_32 ELF-i386: R_386_32 .rodata.str1.1
ELF-i386: R_386_PC32 ELF-i386: R_386_PC32 puts
ELF-i386: R_386_PC32 ELF-i386: R_386_PC32 SomeOtherFunction
ELF-x86-64: .text ELF-x86-64: .text
ELF-x86-64: R_X86_64_32S .rodata.str1.1 ELF-x86-64: R_X86_64_32S .rodata.str1.1
ELF-x86-64: R_X86_64_PC32 puts ELF-x86-64: R_X86_64_PC32 puts
ELF-x86-64: R_X86_64_PC32 SomeOtherFunction ELF-x86-64: R_X86_64_PC32 SomeOtherFunction
ELF-hexagon: .text ELF-hexagon: .text
ELF-hexagon: R_HEX_GOTREL_HI16 .main ELF-hexagon: R_HEX_GOTREL_HI16 .main
Show All 28 Lines