This is an archive of the discontinued LLVM Phabricator instance.

Differential D49567

Add R_HEX_B15_PCREL_X relocation
ClosedPublic

Authored by sidneym on Jul 19 2018, 2:43 PM.

Details

Reviewers
ruiu
kparzysz
shankare
bcain
• espindola
Commits
rG3241724536b2: [ELF][HEXAGON] Add R_HEX_B15_PCREL_X relocation
rLLD337829: [ELF][HEXAGON] Add R_HEX_B15_PCREL_X relocation
rL337829: [ELF][HEXAGON] Add R_HEX_B15_PCREL_X relocation
Summary

Add R_HEX_B15_PCREL_X relocation and update the testcase.

Diff Detail

Repository
rL LLVM

Event Timeline

sidneym created this revision.Jul 19 2018, 2:43 PM
Herald added a reviewer: • espindola. · View Herald TranscriptJul 19 2018, 2:43 PM
Herald added subscribers: MaskRay, arichardson, emaste. · View Herald Transcript
bcain accepted this revision.Jul 20 2018, 10:40 AM
This revision is now accepted and ready to land.Jul 20 2018, 10:40 AM
ruiu accepted this revision.Jul 20 2018, 11:26 AM

LGTM

Closed by commit rL337829: [ELF][HEXAGON] Add R_HEX_B15_PCREL_X relocation (authored by sidneym). · Explain WhyJul 24 2018, 8:08 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
ELF/
Arch/
4 lines
test/
ELF/
5 lines

Diff 157040

lld/trunk/ELF/Arch/Hexagon.cpp

Show First 20 Lines • Show All 48 Lines • ▼ Show 20 Linesstatic uint32_t applyMask(uint32_t Mask, uint32_t Data) {
} }
return Result; return Result;
} }
RelExpr Hexagon::getRelExpr(RelType Type, const Symbol &S, RelExpr Hexagon::getRelExpr(RelType Type, const Symbol &S,
const uint8_t *Loc) const { const uint8_t *Loc) const {
switch (Type) { switch (Type) {
case R_HEX_B15_PCREL: case R_HEX_B15_PCREL:
case R_HEX_B15_PCREL_X:
case R_HEX_B22_PCREL: case R_HEX_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_PC; return R_PC;
default: default:
return R_ABS; return R_ABS;
} }
} }
static void or32le(uint8_t *P, int32_t V) { write32le(P, read32le(P) | V); } static void or32le(uint8_t *P, int32_t V) { write32le(P, read32le(P) | V); }
void Hexagon::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const { void Hexagon::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
switch (Type) { switch (Type) {
case R_HEX_NONE: case R_HEX_NONE:
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:
or32le(Loc, applyMask(0x00df20fe, Val & 0x3f));
break;
case R_HEX_B22_PCREL: case R_HEX_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));
Show All 11 Lines

lld/trunk/test/ELF/hexagon.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.s -o %t2 # RUN: llvm-mc -filetype=obj -triple=hexagon-unknown-elf %S/Inputs/hexagon.s -o %t2
# RUN: ld.lld %t2 %t -o %t3 # RUN: ld.lld %t2 %t -o %t3
# RUN: llvm-objdump -d %t3 | FileCheck %s # RUN: llvm-objdump -d %t3 | FileCheck %s
# R_HEX_B15_PCREL # R_HEX_B15_PCREL
if (p0) jump:nt #_start if (p0) jump:nt #_start
# CHECK: if (p0) jump:nt 0x11000 # CHECK: if (p0) jump:nt 0x11000
# R_HEX_B32_PCREL_X
# R_HEX_B15_PCREL_X
if (p0) jump:nt ##_start
# CHECK: if (p0) jump:nt 0x11000
# R_HEX_B22_PCREL # R_HEX_B22_PCREL
call #_start call #_start
# CHECK: call 0x11000 # CHECK: call 0x11000
# R_HEX_B32_PCREL_X # R_HEX_B32_PCREL_X
# R_HEX_B22_PCREL_X # R_HEX_B22_PCREL_X
call ##_start call ##_start
# CHECK: immext(#4294967232) # CHECK: immext(#4294967232)
# CHECK: call 0x11000 # CHECK: call 0x11000