This is an archive of the discontinued LLVM Phabricator instance.

Differential D48235

Add R_HEX_B32_PCREL_X and R_HEX_B22_PCREL_X relocations
ClosedPublic

Authored by sidneym on Jun 15 2018, 1:25 PM.

Details

Reviewers
ruiu
kparzysz
• espindola
Summary

Add R_HEX_B32_PCREL_X, R_HEX_B22_PCREL_X relocations and a testcase.

Diff Detail

Repository
rLLD LLVM Linker

Event Timeline

sidneym created this revision.Jun 15 2018, 1:25 PM
Herald added a reviewer: • espindola. · View Herald TranscriptJun 15 2018, 1:25 PM
Herald added subscribers: MaskRay, arichardson, emaste. · View Herald Transcript
ruiu accepted this revision.Jul 18 2018, 10:51 AM

LGTM with these fixes.

ELF/Arch/Hexagon.cpp
56–58

Sort.

71

Sort cases alphabetically.

test/ELF/hexagon.s
10

Please insert a blank line after "CHECK" so that each testcase is visually separated.

This revision is now accepted and ready to land.Jul 18 2018, 10:51 AM
sidneym updated this revision to Diff 156278.Jul 19 2018, 8:32 AM

Sorted relocation names

sidneym closed this revision.Jul 19 2018, 1:01 PM

Revision Contents

PathSize
ELF/
Arch/
8 lines
test/
ELF/
6 lines

Diff 156278

ELF/Arch/Hexagon.cpp

Context not available.
const uint8_t *Loc) const { const uint8_t *Loc) const {
switch (Type) { switch (Type) {
case R_HEX_B22_PCREL: case R_HEX_B22_PCREL:
case R_HEX_B22_PCREL_X:
case R_HEX_B32_PCREL_X:
ruiuUnsubmitted
Not Done
ReplyInline Actions

Sort.

ruiu: Sort.
return R_PC; return R_PC;
default: default:
return R_ABS; return R_ABS;
Context not available.
case R_HEX_B22_PCREL: case R_HEX_B22_PCREL:
ruiuUnsubmitted
Not Done
ReplyInline Actions

Sort cases alphabetically.

ruiu: Sort `case`s alphabetically.
or32le(Loc, applyMask(0x1ff3ffe, Val >> 2)); or32le(Loc, applyMask(0x1ff3ffe, Val >> 2));
break; break;
case R_HEX_B22_PCREL_X:
or32le(Loc, applyMask(0x1ff3ffe, Val & 0x3f));
break;
case R_HEX_B32_PCREL_X:
or32le(Loc, applyMask(0x0fff3fff, Val >> 6));
break;
default: default:
error(getErrorLocation(Loc) + "unrecognized reloc " + toString(Type)); error(getErrorLocation(Loc) + "unrecognized reloc " + toString(Type));
break; break;
Context not available.

test/ELF/hexagon.s

Context not available.
# R_HEX_B22_PCREL # R_HEX_B22_PCREL
call #_start call #_start
# CHECK: call 0x11000 # CHECK: call 0x11000
ruiuUnsubmitted
Not Done
ReplyInline Actions

Please insert a blank line after "CHECK" so that each testcase is visually separated.

ruiu: Please insert a blank line after "CHECK" so that each testcase is visually separated.
# R_HEX_B32_PCREL_X
# R_HEX_B22_PCREL_X
call ##_start
# CHECK: immext(#4294967232)
# CHECK: call 0x11000
Context not available.