replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ELF][Hexagon] fix few relocations and add test 

llvm-svn: 178495
This commit is contained in:
Shankar Easwaran 2013-04-01 20:20:11 +00:00
parent f78debd7d2
commit 34353270a0
5 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
lld/lib/ReaderWriter/ELF/Hexagon/HexagonRelocationHandler.cpp
View File

@ -121,67 +121,75 @@ int relocHexGPRELN(uint8_t *location, uint64_t P, uint64_t S, uint64_t A,
}
/// \brief Word32_LO: 0x00c03fff : (G) : Truncate
int relocHexGOTLO16(uint8_t *location, uint64_t G) {
uint32_t result = (uint32_t)(G);
int relocHexGOTLO16(uint8_t *location, uint64_t A, uint64_t GOT) {
int32_t result = (int32_t)(A-GOT);
result = lld::scatterBits<int32_t>(result, 0x00c03fff);
APPLY_RELOC(result);
return 0;
}
/// \brief Word32_LO: 0x00c03fff : (G) >> 16 : Truncate
int relocHexGOTHI16(uint8_t *location, uint64_t G) {
uint32_t result = (uint32_t)(G >> 16);
int relocHexGOTHI16(uint8_t *location, uint64_t A, uint64_t GOT) {
int32_t result = (int32_t)((A-GOT) >> 16);
result = lld::scatterBits<int32_t>(result, 0x00c03fff);
APPLY_RELOC(result);
return 0;
}
/// \brief Word32: 0xffffffff : (G) : Truncate
int relocHexGOT32(uint8_t *location, uint64_t G) {
uint32_t result = (uint32_t)(G);
int relocHexGOT32(uint8_t *location, uint64_t A, uint64_t GOT) {
int32_t result = (int32_t)(GOT - A);
APPLY_RELOC(result);
return 0;
}
/// \brief Word32_U16 : (G) : Truncate
int relocHexGOT16(uint8_t *location, uint64_t G) {
uint32_t result = (uint32_t)(G);
uint32_t range = 1L << 16;
int relocHexGOT16(uint8_t *location, uint64_t A, uint64_t GOT) {
int32_t result = (int32_t)(GOT-A);
int32_t range = 1L << 16;
if (result <= range) {
result = lld::scatterBits<uint32_t>(result, FINDV4BITMASK(location));
result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
APPLY_RELOC(result);
return 0;
}
return 1;
}
int relocHexGOT32_6_X(uint8_t *location, uint64_t G) {
uint32_t result = (uint32_t)(G >> 6);
result = lld::scatterBits<uint32_t>(result, FINDV4BITMASK(location));
int relocHexGOT32_6_X(uint8_t *location, uint64_t A, uint64_t GOT) {
int32_t result = (int32_t)((A-GOT) >> 6);
result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
APPLY_RELOC(result);
return 0;
}
int relocHexGOT16_X(uint8_t *location, uint64_t G) {
uint32_t result = (uint32_t)(G);
uint32_t range = 1L << 6;
int relocHexGOT16_X(uint8_t *location, uint64_t A, uint64_t GOT) {
int32_t result = (int32_t)(A-GOT);
int32_t range = 1L << 6;
if (result <= range) {
result = lld::scatterBits<uint32_t>(result, FINDV4BITMASK(location));
result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
APPLY_RELOC(result);
return 0;
}
return 1;
}
int relocHexGOT11_X(uint8_t *location, uint64_t G) {
uint32_t result = (uint32_t)(G);
int relocHexGOT11_X(uint8_t *location, uint64_t A, uint64_t GOT) {
uint32_t result = (uint32_t)(A-GOT);
result = lld::scatterBits<uint32_t>(result, FINDV4BITMASK(location));
APPLY_RELOC(result);
return 0;
}
int relocHexGOTREL(uint8_t *location, uint64_t P, uint64_t S, uint64_t A,
uint64_t GOT, int shiftBits = 0) {
int relocHexGOTRELSigned(uint8_t *location, uint64_t P, uint64_t S, uint64_t A,
uint64_t GOT, int shiftBits = 0) {
int32_t result = (int32_t)((S + A - GOT) >> shiftBits);
result = lld::scatterBits<int32_t>(result, FINDV4BITMASK(location));
APPLY_RELOC(result);
return 0;
}
int relocHexGOTRELUnsigned(uint8_t *location, uint64_t P, uint64_t S,
uint64_t A, uint64_t GOT, int shiftBits = 0) {
uint32_t result = (uint32_t)((S + A - GOT) >> shiftBits);
result = lld::scatterBits<uint32_t>(result, FINDV4BITMASK(location));
APPLY_RELOC(result);
@ -190,15 +198,15 @@ int relocHexGOTREL(uint8_t *location, uint64_t P, uint64_t S, uint64_t A,
int relocHexGOTREL_HILO16(uint8_t *location, uint64_t P, uint64_t S, uint64_t A,
uint64_t GOT, int shiftBits = 0) {
uint32_t result = (uint32_t)((S + A - GOT) >> shiftBits);
result = lld::scatterBits<uint32_t>(result, 0x00c03fff);
int32_t result = (int32_t)((S + A - GOT) >> shiftBits);
result = lld::scatterBits<int32_t>(result, 0x00c03fff);
APPLY_RELOC(result);
return 0;
}
int relocHexGOTREL_32(uint8_t *location, uint64_t P, uint64_t S, uint64_t A,
uint64_t GOT) {
uint32_t result = (uint32_t)(S + A - GOT);
int32_t result = (int32_t)(S + A - GOT);
APPLY_RELOC(result);
return 0;
}
@ -298,33 +306,33 @@ ErrorOr<void> HexagonTargetRelocationHandler::applyRelocation(
_targetHandler.getGOTSymAddr(), 16);
break;
case R_HEX_GOT_LO16:
relocHexGOTLO16(location, targetVAddress);
relocHexGOTLO16(location, targetVAddress, _targetHandler.getGOTSymAddr());
break;
case R_HEX_GOT_HI16:
relocHexGOTHI16(location, targetVAddress);
relocHexGOTHI16(location, targetVAddress, _targetHandler.getGOTSymAddr());
break;
case R_HEX_GOT_32:
relocHexGOT32(location, targetVAddress);
relocHexGOT32(location, targetVAddress, _targetHandler.getGOTSymAddr());
break;
case R_HEX_GOT_16:
relocHexGOT16(location, targetVAddress);
relocHexGOT16(location, targetVAddress, _targetHandler.getGOTSymAddr());
break;
case R_HEX_GOT_32_6_X:
relocHexGOT32_6_X(location, targetVAddress);
relocHexGOT32_6_X(location, targetVAddress, _targetHandler.getGOTSymAddr());
break;
case R_HEX_GOT_16_X:
relocHexGOT16_X(location, targetVAddress);
relocHexGOT16_X(location, targetVAddress, _targetHandler.getGOTSymAddr());
break;
case R_HEX_GOT_11_X:
relocHexGOT11_X(location, targetVAddress);
relocHexGOT11_X(location, targetVAddress, _targetHandler.getGOTSymAddr());
break;
case R_HEX_GOTREL_32_6_X:
relocHexGOTREL(location, relocVAddress, targetVAddress, ref.addend(),
relocHexGOTRELSigned(location, relocVAddress, targetVAddress, ref.addend(),
_targetHandler.getGOTSymAddr(), 6);
break;
case R_HEX_GOTREL_16_X:
case R_HEX_GOTREL_11_X:
relocHexGOTREL(location, relocVAddress, targetVAddress, ref.addend(),
relocHexGOTRELUnsigned(location, relocVAddress, targetVAddress, ref.addend(),
_targetHandler.getGOTSymAddr());
break;

5
lld/lib/ReaderWriter/ELF/Hexagon/HexagonTargetHandler.h
View File

@ -203,7 +203,10 @@ public:
}
}
uint64_t getGOTSymAddr() const { return _gotSymAtom->_virtualAddr; }
uint64_t getGOTSymAddr() const {
if (!_gotSymAtom) return 0;
return _gotSymAtom->_virtualAddr;
}
private:
HexagonTargetLayout<HexagonELFType> _targetLayout;

3
lld/test/elf/Hexagon/Inputs/dynobj-data.c Normal file
View File

@ -0,0 +1,3 @@
int d = 10;
int fn() { return d; }

BIN
lld/test/elf/Hexagon/Inputs/dynobj-data.o Normal file
View File

Binary file not shown.

9
lld/test/elf/Hexagon/dynlib-data.test Normal file
View File

@ -0,0 +1,9 @@
RUN: lld -core -target hexagon %p/Inputs/dynobj-data.o \
RUN: -output=%t -output=%t -noinhibit-exec -output-type=shared
RUN: llvm-objdump -s %t > %t1
RUN: FileCheck -check-prefix=CHECKRELOCS %s < %t1
CHECKRELOCS: Contents of section .text:
CHECKRELOCS: 0118 01c09da0 01d89da1 3b400000 18d4496a ........;@....Ij
CHECKRELOCS: 0128 ff7fff0f 00ff9897 00c08091 38c09d91 ............8...
CHECKRELOCS: 0138 1ec01e96 ....