This is an archive of the discontinued LLVM Phabricator instance.

Differential D52734

Add R_HEX_PLT_B22_PCREL and R_HEX_32_PCREL relocation support
ClosedPublic

Authored by sidneym on Oct 1 2018, 10:11 AM.

Details

Reviewers
ruiu
bcain
kparzysz
shankare
• espindola
Commits
rG490429d0695b: [ELF] [HEXAGON] Add support for PLT_B22_PCREL and HEX_32_PCREL
rL343515: [ELF] [HEXAGON] Add support for PLT_B22_PCREL and HEX_32_PCREL
rLLD343515: [ELF] [HEXAGON] Add support for PLT_B22_PCREL and HEX_32_PCREL
Summary

Adding a couple of new relocs needed for dynamic linking.

Some older code still produces R_HEX_PLT_B22_PCREL relocations. This relocation is still part of the ABI and is equivalent to the standard R_HEX_B22_PCREL(_X) relocation, but isn't extendable.

Diff Detail

Repository
rLLD LLVM Linker

Event Timeline

sidneym created this revision.Oct 1 2018, 10:11 AM
Herald added a reviewer: • espindola. · View Herald TranscriptOct 1 2018, 10:11 AM
Herald added subscribers: arichardson, emaste. · View Herald Transcript
ruiu accepted this revision.Oct 1 2018, 10:13 AM

LGTM

This revision is now accepted and ready to land.Oct 1 2018, 10:13 AM
Closed by commit rLLD343515: [ELF] [HEXAGON] Add support for PLT_B22_PCREL and HEX_32_PCREL (authored by sidneym). · Explain WhyOct 1 2018, 11:29 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
ELF/
Arch/
4 lines
test/
ELF/
34 lines

Diff 167787

ELF/Arch/Hexagon.cpp

Show First 20 Lines • Show All 69 Lines • ▼ Show 20 LinesRelExpr Hexagon::getRelExpr(RelType Type, const Symbol &S,
const uint8_t *Loc) const { const uint8_t *Loc) const {
switch (Type) { switch (Type) {
case R_HEX_B9_PCREL: case R_HEX_B9_PCREL:
case R_HEX_B9_PCREL_X: case R_HEX_B9_PCREL_X:
case R_HEX_B13_PCREL: case R_HEX_B13_PCREL:
case R_HEX_B15_PCREL: case R_HEX_B15_PCREL:
case R_HEX_B15_PCREL_X: case R_HEX_B15_PCREL_X:
case R_HEX_6_PCREL_X: case R_HEX_6_PCREL_X:
case R_HEX_32_PCREL:
return R_PC; return R_PC;
case R_HEX_B22_PCREL: case R_HEX_B22_PCREL:
case R_HEX_PLT_B22_PCREL:
case R_HEX_B22_PCREL_X: case R_HEX_B22_PCREL_X:
case R_HEX_B32_PCREL_X: case R_HEX_B32_PCREL_X:
return R_PLT_PC; return R_PLT_PC;
default: default:
return R_ABS; return R_ABS;
} }
} }
▲ Show 20 Lines • Show All 89 Lines • ▼ Show 20 Lines case R_HEX_11_X:
break; break;
case R_HEX_12_X: case R_HEX_12_X:
or32le(Loc, applyMask(0x000007e0, Val)); or32le(Loc, applyMask(0x000007e0, Val));
break; break;
case R_HEX_16_X: // This reloc only has 6 effective bits. case R_HEX_16_X: // This reloc only has 6 effective bits.
or32le(Loc, applyMask(findMaskR16(read32le(Loc)), Val & 0x3f)); or32le(Loc, applyMask(findMaskR16(read32le(Loc)), Val & 0x3f));
break; break;
case R_HEX_32: case R_HEX_32:
case R_HEX_32_PCREL:
or32le(Loc, Val); or32le(Loc, Val);
break; break;
case R_HEX_32_6_X: case R_HEX_32_6_X:
or32le(Loc, applyMask(0x0fff3fff, Val >> 6)); or32le(Loc, applyMask(0x0fff3fff, Val >> 6));
break; break;
case R_HEX_B9_PCREL: case R_HEX_B9_PCREL:
or32le(Loc, applyMask(0x003000fe, Val >> 2)); or32le(Loc, applyMask(0x003000fe, Val >> 2));
break; break;
case R_HEX_B9_PCREL_X: case R_HEX_B9_PCREL_X:
or32le(Loc, applyMask(0x003000fe, Val & 0x3f)); or32le(Loc, applyMask(0x003000fe, Val & 0x3f));
break; break;
case R_HEX_B13_PCREL: case R_HEX_B13_PCREL:
or32le(Loc, applyMask(0x00202ffe, Val >> 2)); or32le(Loc, applyMask(0x00202ffe, Val >> 2));
break; break;
case R_HEX_B15_PCREL: case R_HEX_B15_PCREL:
or32le(Loc, applyMask(0x00df20fe, Val >> 2)); or32le(Loc, applyMask(0x00df20fe, Val >> 2));
break; break;
case R_HEX_B15_PCREL_X: case R_HEX_B15_PCREL_X:
or32le(Loc, applyMask(0x00df20fe, Val & 0x3f)); or32le(Loc, applyMask(0x00df20fe, Val & 0x3f));
break; break;
case R_HEX_B22_PCREL: case R_HEX_B22_PCREL:
case R_HEX_PLT_B22_PCREL:
or32le(Loc, applyMask(0x1ff3ffe, Val >> 2)); or32le(Loc, applyMask(0x1ff3ffe, Val >> 2));
break; break;
case R_HEX_B22_PCREL_X: case R_HEX_B22_PCREL_X:
or32le(Loc, applyMask(0x1ff3ffe, Val & 0x3f)); or32le(Loc, applyMask(0x1ff3ffe, Val & 0x3f));
break; break;
case R_HEX_B32_PCREL_X: case R_HEX_B32_PCREL_X:
or32le(Loc, applyMask(0x0fff3fff, Val >> 6)); or32le(Loc, applyMask(0x0fff3fff, Val >> 6));
break; break;
▲ Show 20 Lines • Show All 49 Lines • Show Last 20 Lines

test/ELF/hexagon-shared.s

# REQUIRES: hexagon # REQUIRES: hexagon
# RUN: llvm-mc -filetype=obj -triple=hexagon-unknown-elf %s -o %t # RUN: llvm-mc -filetype=obj -triple=hexagon-unknown-elf %s -o %t
# RUN: llvm-mc -filetype=obj -triple=hexagon-unknown-elf %S/Inputs/hexagon-shared.s -o %t2.o # RUN: llvm-mc -filetype=obj -triple=hexagon-unknown-elf %S/Inputs/hexagon-shared.s -o %t2.o
# RUN: ld.lld -shared %t2.o -soname %t3.so -o %t3.so # RUN: ld.lld -shared %t2.o -soname %t3.so -o %t3.so
# RUN: ld.lld -shared %t %t3.so -soname %t4.so -o %t4.so # RUN: ld.lld -shared %t %t3.so -soname %t4.so -o %t4.so
# RUN: llvm-objdump -d -j .plt %t4.so | FileCheck %s # RUN: llvm-objdump -d -j=.plt %t4.so | FileCheck --check-prefix=PLT %s
# RUN: llvm-objdump -d -j=.text %t4.so | FileCheck --check-prefix=TEXT %s
.global foo .global foo
foo: foo:
# _HEX_32_PCREL
.word _DYNAMIC - .
call ##bar call ##bar
# R_HEX_PLT_B22_PCREL
call bar@PLT
# CHECK: { immext(#65472 # PLT: { immext(#65472
# CHECK: r28 = add(pc,##65520) } # PLT: r28 = add(pc,##65520) }
# CHECK: { r14 -= add(r28,#16) # PLT: { r14 -= add(r28,#16)
# CHECK: r15 = memw(r28+#8) # PLT: r15 = memw(r28+#8)
# CHECK: r28 = memw(r28+#4) } # PLT: r28 = memw(r28+#4) }
# CHECK: { r14 = asr(r14,#2) # PLT: { r14 = asr(r14,#2)
# CHECK: jumpr r28 } # PLT: jumpr r28 }
# CHECK: { trap0(#219) } # PLT: { trap0(#219) }
# CHECK: immext(#65472) # PLT: immext(#65472)
# CHECK: r14 = add(pc,##65488) } # PLT: r14 = add(pc,##65488) }
# CHECK: r28 = memw(r14+#0) } # PLT: r28 = memw(r14+#0) }
# CHECK: jumpr r28 } # PLT: jumpr r28 }
# TEXT: 10000: 00 00 01 00 00010000
# TEXT: { call 0x10030 }