This is an archive of the discontinued LLVM Phabricator instance.

Differential D50603

Add R_HEX_16_X relocation
ClosedPublic

Authored by sidneym on Aug 11 2018, 3:32 PM.

Details

Reviewers
ruiu
kparzysz
bcain
shankare
• espindola
adasgupt
Commits
rG564e65a4c07a: [ELF][HEXAGON] Add R_HEX_16_X relocation
rLLD340413: [ELF][HEXAGON] Add R_HEX_16_X relocation
rL340413: [ELF][HEXAGON] Add R_HEX_16_X relocation
Summary

This relocation has only 6 effective bits the rest are in the extender.

Diff Detail

Repository
rL LLVM

Event Timeline

sidneym created this revision.Aug 11 2018, 3:32 PM
Herald added a reviewer: • espindola. · View Herald TranscriptAug 11 2018, 3:32 PM
Herald added subscribers: arichardson, emaste. · View Herald Transcript
sidneym updated this revision to Diff 160415.Aug 13 2018, 11:39 AM

Updated the testcase to reflect the fact this relocation only has 6 effective bits.

sidneym updated this revision to Diff 161022.Aug 16 2018, 6:51 AM

This is just a rebase.

sidneym added a comment.Aug 17 2018, 3:49 PM

If this patch looks ok I'd like to commit it.

Thanks,

sidneym added a reviewer: adasgupt.Aug 19 2018, 6:26 AM
sidneym updated this revision to Diff 161470.Aug 20 2018, 6:15 AM

Drop mask for R_HEX_32.

sidneym updated this revision to Diff 161703.Aug 21 2018, 5:58 AM
shankare accepted this revision.Aug 21 2018, 8:49 AM
This revision is now accepted and ready to land.Aug 21 2018, 8:49 AM
Closed by commit rL340413: [ELF][HEXAGON] Add R_HEX_16_X relocation (authored by sidneym). · Explain WhyAug 22 2018, 8:26 AM
This revision was automatically updated to reflect the committed changes.
ruiu added a comment.Aug 22 2018, 4:44 PM

LGTM

Revision Contents

PathSize
lld/
trunk/
ELF/
Arch/
18 lines
test/
ELF/
17 lines

Diff 161968

lld/trunk/ELF/Arch/Hexagon.cpp

Show First 20 Lines • Show All 106 Lines • ▼ Show 20 Lines
static uint32_t findMaskR8(uint32_t Insn) { static uint32_t findMaskR8(uint32_t Insn) {
if ((0xff000000 & Insn) == 0xde000000) if ((0xff000000 & Insn) == 0xde000000)
return 0x00e020e8; return 0x00e020e8;
if ((0xff000000 & Insn) == 0x3c000000) if ((0xff000000 & Insn) == 0x3c000000)
return 0x0000207f; return 0x0000207f;
return 0x00001fe0; return 0x00001fe0;
} }
static uint32_t findMaskR16(uint32_t Insn) {
if ((0xff000000 & Insn) == 0x48000000)
return 0x061f20ff;
if ((0xff000000 & Insn) == 0x49000000)
return 0x061f3fe0;
if ((0xff000000 & Insn) == 0x78000000)
return 0x00df3fe0;
if ((0xff000000 & Insn) == 0xb0000000)
return 0x0fe03fe0;
error("unrecognized instruction for R_HEX_16_X relocation: 0x" +
utohexstr(Insn));
return 0;
}
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_6_PCREL_X: case R_HEX_6_PCREL_X:
case R_HEX_6_X: case R_HEX_6_X:
or32le(Loc, applyMask(findMaskR6(read32le(Loc)), Val)); or32le(Loc, applyMask(findMaskR6(read32le(Loc)), Val));
break; break;
case R_HEX_8_X: case R_HEX_8_X:
or32le(Loc, applyMask(findMaskR8(read32le(Loc)), Val)); or32le(Loc, applyMask(findMaskR8(read32le(Loc)), Val));
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.
or32le(Loc, applyMask(findMaskR16(read32le(Loc)), Val & 0x3f));
break;
case R_HEX_32: case R_HEX_32:
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_B15_PCREL: case R_HEX_B15_PCREL:
or32le(Loc, applyMask(0x00df20fe, Val >> 2)); or32le(Loc, applyMask(0x00df20fe, Val >> 2));
Show All 29 Lines

lld/trunk/test/ELF/hexagon.s

Show First 20 Lines • Show All 171 Lines • ▼ Show 20 Lines
# The rest: # The rest:
r1:0=combine(r2,##_start); r1:0=combine(r2,##_start);
# CHECK: 7302e000 r1:0 = combine(r2,##69632) } # CHECK: 7302e000 r1:0 = combine(r2,##69632) }
# R_HEX_32: # R_HEX_32:
r_hex_32: r_hex_32:
.word _start .word _start
# CHECK: 00011000 # CHECK: 00011000
# R_HEX_16_X has 4 relocation mask variations
# 0x48000000
memw(##_start) = r0
# CHECK: 4880c000 memw(##69632) = r0 }
# 0x49000000
r0 = memw(##_start)
# CHECK: 4980c000 r0 = memw(##69632)
# 0x78000000
r0 = ##_start
# CHECK: 7800c000 r0 = ##69632 }
# 0xb0000000
r0 = add(r1, ##_start)
# CHECK: b001c000 r0 = add(r1,##69632) }