RPCSX/archived-llvm
1
0
Fork 0
mirror of https://github.com/RPCSX/llvm.git synced 2026-01-31 01:05:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

[llvm-objdump] Correctly distinguish between the MachO upper/lower16 relocations

Browse Source 
All other code in MachODump.cpp uses the same comparison,
((r_length & 0x1) == 1), for distinguishing between the two,
while the code in llvm-objdump.cpp seemed to be incorrect.

Differential Revision: https://reviews.llvm.org/D35240

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@307882 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Martin Storsjo
2017-07-13 05:54:08 +00:00
parent 54df34c168
commit 8ca723ae60
3 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
test/tools/llvm-objdump/ARM/Inputs/reloc-half.obj.macho-arm Normal file
View File

Binary file not shown.

4
test/tools/llvm-objdump/ARM/macho-reloc-half.test Normal file
View File

@@ -0,0 +1,4 @@
RUN: llvm-objdump -r %p/Inputs/reloc-half.obj.macho-arm | FileCheck %s
CHECK-DAG: 00000004 ARM_RELOC_HALF :upper16:(_stringbuf)
CHECK-DAG: 00000000 ARM_RELOC_HALF :lower16:(_stringbuf)

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

@@ -1032,7 +1032,7 @@ static std::error_code getRelocationValueString(const MachOObjectFile *Obj,
case MachO::ARM_RELOC_HALF_SECTDIFF: {
// Half relocations steal a bit from the length field to encode
// whether this is an upper16 or a lower16 relocation.
bool isUpper = Obj->getAnyRelocationLength(RE) >> 1;
bool isUpper = (Obj->getAnyRelocationLength(RE) & 0x1) == 1;
if (isUpper)
fmt << ":upper16:(";