This is an archive of the discontinued LLVM Phabricator instance.

Differential D51225

Add R_HEX_11/10/9 support
ClosedPublic

Authored by sidneym on Aug 24 2018, 10:29 AM.

Details

Reviewers
ruiu
kparzysz
shankare
bcain
• espindola
Commits
rG569a56d6a06f: [ELF][HEXAGON] Add R_HEX_11/10/9_X support
rLLD340739: [ELF][HEXAGON] Add R_HEX_11/10/9_X support
rL340739: [ELF][HEXAGON] Add R_HEX_11/10/9_X support
Summary

Since they are always extended they have just 6 effective bits.

Diff Detail

Repository
rL LLVM

Event Timeline

sidneym created this revision.Aug 24 2018, 10:29 AM
Herald added a reviewer: • espindola. · View Herald TranscriptAug 24 2018, 10:29 AM
Herald added subscribers: MaskRay, arichardson, emaste. · View Herald Transcript
sidneym updated this revision to Diff 162567.Aug 25 2018, 3:19 PM
sidneym retitled this revision from Add R_HEX_11 support to Add R_HEX_11/10/9 support .
sidneym edited the summary of this revision. (Show Details)

Added 9X and 10X as well, along with updated testing.

ruiu accepted this revision.Aug 26 2018, 11:06 PM

LGTM

This revision is now accepted and ready to land.Aug 26 2018, 11:06 PM
Closed by commit rL340739: [ELF][HEXAGON] Add R_HEX_11/10/9_X support (authored by sidneym). · Explain WhyAug 27 2018, 5:56 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
lld/
trunk/
ELF/
Arch/
15 lines
test/
ELF/
15 lines

Diff 162666

lld/trunk/ELF/Arch/Hexagon.cpp

Show First 20 Lines • Show All 109 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 findMaskR11(uint32_t Insn) {
if ((0xff000000 & Insn) == 0xa1000000)
return 0x060020ff;
return 0x06003fe0;
}
static uint32_t findMaskR16(uint32_t Insn) { static uint32_t findMaskR16(uint32_t Insn) {
if ((0xff000000 & Insn) == 0x48000000) if ((0xff000000 & Insn) == 0x48000000)
return 0x061f20ff; return 0x061f20ff;
if ((0xff000000 & Insn) == 0x49000000) if ((0xff000000 & Insn) == 0x49000000)
return 0x061f3fe0; return 0x061f3fe0;
if ((0xff000000 & Insn) == 0x78000000) if ((0xff000000 & Insn) == 0x78000000)
return 0x00df3fe0; return 0x00df3fe0;
if ((0xff000000 & Insn) == 0xb0000000) if ((0xff000000 & Insn) == 0xb0000000)
Show All 12 Lines 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_9_X:
or32le(Loc, applyMask(0x00003fe0, Val & 0x3f));
break;
case R_HEX_10_X:
or32le(Loc, applyMask(0x00203fe0, Val & 0x3f));
break;
case R_HEX_11_X:
or32le(Loc, applyMask(findMaskR11(read32le(Loc)), Val & 0x3f));
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:
or32le(Loc, Val); or32le(Loc, Val);
▲ Show 20 Lines • Show All 44 Lines • Show Last 20 Lines

lld/trunk/test/ELF/hexagon.s

Show First 20 Lines • Show All 200 Lines • ▼ Show 20 Lines
# R_HEX_B9_PCREL_X: # R_HEX_B9_PCREL_X:
{r0=#1 ; jump ##_start} {r0=#1 ; jump ##_start}
# CHECK: jump 0x11000 # CHECK: jump 0x11000
# R_HEX_B13_PCREL # R_HEX_B13_PCREL
if (r0 == #0) jump:t #_start if (r0 == #0) jump:t #_start
# CHECK: if (r0==#0) jump:t 0x11000 # CHECK: if (r0==#0) jump:t 0x11000
# R_HEX_9_X
p0 = !cmp.gtu(r0, ##_start)
# CHECK: p0 = !cmp.gtu(r0,##69632)
# R_HEX_10_X
p0 = !cmp.gt(r0, ##_start)
# CHECK: p0 = !cmp.gt(r0,##69632)
# R_HEX_11_X
r0 = memw(r1+##_start)
# CHECK: r0 = memw(r1+##69632)
memw(r0+##_start) = r1
# CHECK: memw(r0+##69632) = r1