maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[ELF][HEXAGON] Add R_HEX_16_X relocation 

This relocation has only 6-bits the remaining are in the extender.

Differential Revision: https://reviews.llvm.org/D50603

llvm-svn: 340413
This commit is contained in:
Sid Manning 2018-08-22 15:25:15 +00:00
parent 3425cdc69b
commit 564e65a4c0
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lld/ELF/Arch/Hexagon.cpp
View File

@ -112,6 +112,21 @@ static uint32_t findMaskR8(uint32_t Insn) {
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); }
void Hexagon::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
@ -128,6 +143,9 @@ void Hexagon::relocateOne(uint8_t *Loc, RelType Type, uint64_t Val) const {
case R_HEX_12_X:
or32le(Loc, applyMask(0x000007e0, Val));
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:
or32le(Loc, Val);
break;

17
lld/test/ELF/hexagon.s
View File

@ -177,3 +177,20 @@ r1:0=combine(r2,##_start);
r_hex_32:
.word _start
# 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) }