6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-04-05 01:31:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix a bug in ARMMachObjectWriter::RecordRelocation() in ARMMachObjectWriter.cpp

Browse Source 
where the other_half of the movt and movw relocation entries needs to get set
and only with the 16 bits of the other half.

rdar://10038370


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@160978 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Kevin Enderby 2012-07-30 18:46:15 +00:00
parent 3f63a58978
commit 5af4de18ef
2 changed files with 53 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Target/ARM/MCTargetDesc/ARMMachObjectWriter.cpp
View File

@ -408,15 +408,22 @@ void ARMMachObjectWriter::RecordRelocation(MachObjectWriter *Writer,
// Even when it's not a scattered relocation, movw/movt always uses
// a PAIR relocation.
if (Type == macho::RIT_ARM_Half) {
// The other-half value only gets populated for the movt relocation.
// The other-half value only gets populated for the movt and movw
// relocation entries.
uint32_t Value = 0;;
switch ((unsigned)Fixup.getKind()) {
default: break;
case ARM::fixup_arm_movw_lo16:
case ARM::fixup_arm_movw_lo16_pcrel:
case ARM::fixup_t2_movw_lo16:
case ARM::fixup_t2_movw_lo16_pcrel:
Value = (FixedValue >> 16) & 0xffff;
break;
case ARM::fixup_arm_movt_hi16:
case ARM::fixup_arm_movt_hi16_pcrel:
case ARM::fixup_t2_movt_hi16:
case ARM::fixup_t2_movt_hi16_pcrel:
Value = FixedValue;
Value = FixedValue & 0xffff;
break;
}
macho::RelocationEntry MREPair;

44
test/MC/MachO/ARM/thumb2-movw-fixup.s Normal file
View File

@ -0,0 +1,44 @@
@ RUN: llvm-mc -mcpu=cortex-a8 -triple thumbv7-apple-darwin10 -filetype=obj -o - < %s | macho-dump | FileCheck %s
@ rdar://10038370
.syntax unified
.text
.align 2
.code 16
.thumb_func _foo
movw r2, :lower16:L1
movt r2, :upper16:L1
movw r12, :lower16:L2
movt r12, :upper16:L2
.space 70000
.data
L1: .long 0
L2: .long 0
@ CHECK: ('_relocations', [
@ CHECK: # Relocation 0
@ CHECK: (('word-0', 0xc),
@ CHECK: ('word-1', 0x86000002)),
@ CHECK: # Relocation 1
@ CHECK: (('word-0', 0x1184),
@ CHECK: ('word-1', 0x16ffffff)),
@ CHECK: # Relocation 2
@ CHECK: (('word-0', 0x8),
@ CHECK: ('word-1', 0x84000002)),
@ CHECK: # Relocation 3
@ CHECK: (('word-0', 0x1),
@ CHECK: ('word-1', 0x14ffffff)),
@ CHECK: # Relocation 4
@ CHECK: (('word-0', 0x4),
@ CHECK: ('word-1', 0x86000002)),
@ CHECK: # Relocation 5
@ CHECK: (('word-0', 0x1180),
@ CHECK: ('word-1', 0x16ffffff)),
@ CHECK: # Relocation 6
@ CHECK: (('word-0', 0x0),
@ CHECK: ('word-1', 0x84000002)),
@ CHECK: # Relocation 7
@ CHECK: (('word-0', 0x1),
@ CHECK: ('word-1', 0x14ffffff)),