[MCJIT] Respect target endianness in RuntimeDyldMachO and RuntimeDyldChecker.
This patch may address some of the issues described in http://llvm.org/PR20640.
llvm-svn: 215938
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
index d244f45..02504a9 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldChecker.cpp
@@ -705,7 +705,16 @@
assert(PtrSizedAddr == SrcAddr && "Linker memory pointer out-of-range.");
uint8_t *Src = reinterpret_cast<uint8_t *>(PtrSizedAddr);
uint64_t Result = 0;
- memcpy(&Result, Src, Size);
+
+ // If host and target endianness match use memcpy, otherwise copy in reverse
+ // order.
+ if (getRTDyld().IsTargetLittleEndian == sys::IsLittleEndianHost)
+ memcpy(&Result, Src, Size);
+ else {
+ uint8_t *Dst = reinterpret_cast<uint8_t*>(&Result) + Size - 1;
+ for (unsigned i = 0; i < Size; ++i)
+ *Dst-- = *Src++;
+ }
return Result;
}
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
index 986daef..3e27a8b 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.cpp
@@ -110,11 +110,18 @@
<< " Size: " << (1 << RE.Size) << "\n";
}
-bool RuntimeDyldMachO::writeBytesUnaligned(uint8_t *Addr, uint64_t Value,
+bool RuntimeDyldMachO::writeBytesUnaligned(uint8_t *Dst, uint64_t Value,
unsigned Size) {
- for (unsigned i = 0; i < Size; ++i) {
- *Addr++ = (uint8_t)Value;
- Value >>= 8;
+
+
+ // If host and target endianness match use memcpy, otherwise copy in reverse
+ // order.
+ if (IsTargetLittleEndian == sys::IsLittleEndianHost)
+ memcpy(Dst, &Value, Size);
+ else {
+ uint8_t *Src = reinterpret_cast<uint8_t*>(&Value) + Size - 1;
+ for (unsigned i = 0; i < Size; ++i)
+ *Dst++ = *Src--;
}
return false;
diff --git a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h
index d8cc7bf..45954a4 100644
--- a/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h
+++ b/llvm/lib/ExecutionEngine/RuntimeDyld/RuntimeDyldMachO.h
@@ -119,7 +119,7 @@
/// Write the least significant 'Size' bytes in 'Value' out at the address
/// pointed to by Addr. Check for overflow.
- bool writeBytesUnaligned(uint8_t *Addr, uint64_t Value, unsigned Size);
+ bool writeBytesUnaligned(uint8_t *Dst, uint64_t Value, unsigned Size);
SectionEntry &getSection(unsigned SectionID) { return Sections[SectionID]; }