mirror of
https://github.com/RPCS3/llvm-mirror.git
synced 2024-11-23 19:23:23 +01:00
Re-commit r238838, r238844 with fix for host/target endian mismatch and windows buildbot.
The windows buildbot originally failed because the check expressions are evaluated as 64-bit values, even for 32-bit symbols. Fixed this by comparing bottom 32-bits of the expressions. The host/target endian mismatch issue is that it's invalid to read/write target values using a host pointer without taking care of endian differences between the target and host. Most (if not all) instances of reinterpret_cast<uint32_t*>() in the RuntimeDyld are examples of this bug. This has been fixed for Mips using the endian aware read/write functions. The original commits were: r238838: [mips] Add RuntimeDyld tests for currently supported O32 relocations. Reviewers: petarj, vkalintiris Reviewed By: vkalintiris Subscribers: vkalintiris, llvm-commits Differential Revision: http://reviews.llvm.org/D10126 r238844: [mips][mcjit] Add support for R_MIPS_PC32. Summary: This allows us to resolve relocations for DW_EH_PE_pcrel TType encodings in the exception handling LSDA. Also fixed a nearby typo. Reviewers: petarj, vkalintiris Reviewed By: vkalintiris Subscribers: vkalintiris, llvm-commits Differential Revision: http://reviews.llvm.org/D10127 llvm-svn: 238915
This commit is contained in:
Daniel Sanders
parent
6941ad45d1
commit
981274986f
@ -477,32 +477,43 @@ void RuntimeDyldELF::resolveARMRelocation(const SectionEntry &Section,
|
||||
void RuntimeDyldELF::resolveMIPSRelocation(const SectionEntry &Section,
|
||||
uint64_t Offset, uint32_t Value,
|
||||
uint32_t Type, int32_t Addend) {
|
||||
uint32_t *TargetPtr = (uint32_t *)(Section.Address + Offset);
|
||||
uint8_t *TargetPtr = Section.Address + Offset;
|
||||
Value += Addend;
|
||||
|
||||
DEBUG(dbgs() << "resolveMipselocation, LocalAddress: "
|
||||
DEBUG(dbgs() << "resolveMIPSRelocation, LocalAddress: "
|
||||
<< Section.Address + Offset << " FinalAddress: "
|
||||
<< format("%p", Section.LoadAddress + Offset) << " Value: "
|
||||
<< format("%x", Value) << " Type: " << format("%x", Type)
|
||||
<< " Addend: " << format("%x", Addend) << "\n");
|
||||
|
||||
uint32_t Insn = readBytesUnaligned(TargetPtr, 4);
|
||||
|
||||
switch (Type) {
|
||||
default:
|
||||
llvm_unreachable("Not implemented relocation type!");
|
||||
break;
|
||||
case ELF::R_MIPS_32:
|
||||
*TargetPtr = Value;
|
||||
writeBytesUnaligned(Value, TargetPtr, 4);
|
||||
break;
|
||||
case ELF::R_MIPS_26:
|
||||
*TargetPtr = ((*TargetPtr) & 0xfc000000) | ((Value & 0x0fffffff) >> 2);
|
||||
Insn &= 0xfc000000;
|
||||
Insn |= (Value & 0x0fffffff) >> 2;
|
||||
writeBytesUnaligned(Insn, TargetPtr, 4);
|
||||
break;
|
||||
case ELF::R_MIPS_HI16:
|
||||
// Get the higher 16-bits. Also add 1 if bit 15 is 1.
|
||||
*TargetPtr =
|
||||
((*TargetPtr) & 0xffff0000) | (((Value + 0x8000) >> 16) & 0xffff);
|
||||
Insn &= 0xffff0000;
|
||||
Insn |= ((Value + 0x8000) >> 16) & 0xffff;
|
||||
writeBytesUnaligned(Insn, TargetPtr, 4);
|
||||
break;
|
||||
case ELF::R_MIPS_LO16:
|
||||
*TargetPtr = ((*TargetPtr) & 0xffff0000) | (Value & 0xffff);
|
||||
Insn &= 0xffff0000;
|
||||
Insn |= Value & 0xffff;
|
||||
writeBytesUnaligned(Insn, TargetPtr, 4);
|
||||
break;
|
||||
case ELF::R_MIPS_PC32:
|
||||
uint32_t FinalAddress = (Section.LoadAddress + Offset);
|
||||
writeBytesUnaligned(Value + Addend - FinalAddress, (uint8_t *)TargetPtr, 4);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -1199,7 +1210,9 @@ relocation_iterator RuntimeDyldELF::processRelocationRef(
|
||||
processSimpleRelocation(SectionID, Offset, RelType, Value);
|
||||
}
|
||||
} else if (IsMipsO32ABI) {
|
||||
uint32_t *Placeholder = reinterpret_cast<uint32_t*>(computePlaceholderAddress(SectionID, Offset));
|
||||
uint8_t *Placeholder = reinterpret_cast<uint8_t *>(
|
||||
computePlaceholderAddress(SectionID, Offset));
|
||||
uint32_t Opcode = readBytesUnaligned(Placeholder, 4);
|
||||
if (RelType == ELF::R_MIPS_26) {
|
||||
// This is an Mips branch relocation, need to use a stub function.
|
||||
DEBUG(dbgs() << "\t\tThis is a Mips branch relocation.");
|
||||
@ -1208,7 +1221,7 @@ relocation_iterator RuntimeDyldELF::processRelocationRef(
|
||||
// Extract the addend from the instruction.
|
||||
// We shift up by two since the Value will be down shifted again
|
||||
// when applying the relocation.
|
||||
uint32_t Addend = ((*Placeholder) & 0x03ffffff) << 2;
|
||||
uint32_t Addend = (Opcode & 0x03ffffff) << 2;
|
||||
|
||||
Value.Addend += Addend;
|
||||
|
||||
@ -1246,11 +1259,11 @@ relocation_iterator RuntimeDyldELF::processRelocationRef(
|
||||
}
|
||||
} else {
|
||||
if (RelType == ELF::R_MIPS_HI16)
|
||||
Value.Addend += ((*Placeholder) & 0x0000ffff) << 16;
|
||||
Value.Addend += (Opcode & 0x0000ffff) << 16;
|
||||
else if (RelType == ELF::R_MIPS_LO16)
|
||||
Value.Addend += ((*Placeholder) & 0x0000ffff);
|
||||
Value.Addend += (Opcode & 0x0000ffff);
|
||||
else if (RelType == ELF::R_MIPS_32)
|
||||
Value.Addend += *Placeholder;
|
||||
Value.Addend += Opcode;
|
||||
processSimpleRelocation(SectionID, Offset, RelType, Value);
|
||||
}
|
||||
} else if (IsMipsN64ABI) {
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
# RUN: llvm-mc -triple=mipsel-unknown-linux -relocation-model=pic -code-model=small -filetype=obj -o %T/test_ELF_O32.o %s
|
||||
# RUN: llc -mtriple=mipsel-unknown-linux -relocation-model=pic -filetype=obj -o %T/test_ELF_ExternalFunction_O32.o %S/Inputs/ExternalFunction.ll
|
||||
# RUN: llvm-rtdyld -triple=mipsel-unknown-linux -verify -map-section test_ELF_O32.o,.text=0x1000 -map-section test_ELF_ExternalFunction_O32.o,.text=0x10000 -check=%s %T/test_ELF_O32.o %T/test_ELF_ExternalFunction_O32.o
|
||||
|
||||
# RUN: llvm-mc -triple=mips-unknown-linux -relocation-model=pic -code-model=small -filetype=obj -o %T/test_ELF_O32.o %s
|
||||
# RUN: llc -mtriple=mips-unknown-linux -relocation-model=pic -filetype=obj -o %/T/test_ELF_ExternalFunction_O32.o %S/Inputs/ExternalFunction.ll
|
||||
# RUN: llvm-rtdyld -triple=mips-unknown-linux -verify -map-section test_ELF_O32.o,.text=0x1000 -map-section test_ELF_ExternalFunction_O32.o,.text=0x10000 -check=%s %T/test_ELF_O32.o %T/test_ELF_ExternalFunction_O32.o
|
||||
|
||||
.data
|
||||
# rtdyld-check: *{4}R_MIPS_32 = foo[31:0]
|
||||
R_MIPS_32:
|
||||
.word foo
|
||||
# rtdyld-check: *{4}(R_MIPS_32+4) = foo[31:0]
|
||||
.4byte foo
|
||||
# rtdyld-check: *{4}(R_MIPS_PC32) = (foo - R_MIPS_PC32)[31:0]
|
||||
R_MIPS_PC32:
|
||||
.word foo-.
|
||||
# rtdyld-check: *{4}(R_MIPS_PC32 + 4) = (foo - tmp1)[31:0]
|
||||
tmp1:
|
||||
.4byte foo-tmp1
|
||||
|
||||
.text
|
||||
.abicalls
|
||||
.nan legacy
|
||||
.text
|
||||
.set nomicromips
|
||||
.set nomips16
|
||||
.set noreorder
|
||||
.set nomacro
|
||||
.set noat
|
||||
|
||||
.align 3
|
||||
.globl bar
|
||||
.type bar,@function
|
||||
bar:
|
||||
# rtdyld-check: decode_operand(R_MIPS_26, 0)[27:0] = stub_addr(test_ELF_O32.o, .text, foo)[27:0]
|
||||
# rtdyld-check: decode_operand(R_MIPS_26, 0)[1:0] = 0
|
||||
R_MIPS_26:
|
||||
j foo
|
||||
nop
|
||||
|
||||
# rtdyld-check: decode_operand(R_MIPS_HI16, 1)[15:0] = foo[31:16]
|
||||
R_MIPS_HI16:
|
||||
lui $1, %hi(foo)
|
||||
|
||||
# rtdyld-check: decode_operand(R_MIPS_LO16, 1)[15:0] = foo[15:0]
|
||||
R_MIPS_LO16:
|
||||
lui $1, %lo(foo)
|
||||
|
||||
.size bar, .-bar
|
||||
Loading…
Reference in New Issue
Block a user