[llvm] r250733 - [RuntimeDyld][COFF] Fix some endianness issues, re-enable the regression test.
Lang Hames via llvm-commits
llvm-commits at lists.llvm.org
Mon Oct 19 13:37:52 PDT 2015
Author: lhames
Date: Mon Oct 19 15:37:52 2015
New Revision: 250733
URL: http://llvm.org/viewvc/llvm-project?rev=250733&view=rev
Log:
[RuntimeDyld][COFF] Fix some endianness issues, re-enable the regression test.
Added:
llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/COFF_x86_64.s
- copied unchanged from r250726, llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/COFF_x86_64
Removed:
llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/COFF_x86_64
Modified:
llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.h
Modified: llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.h?rev=250733&r1=250732&r2=250733&view=diff
==============================================================================
--- llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.h (original)
+++ llvm/trunk/lib/ExecutionEngine/RuntimeDyld/Targets/RuntimeDyldCOFFX86_64.h Mon Oct 19 15:37:52 2015
@@ -72,7 +72,6 @@ public:
case COFF::IMAGE_REL_AMD64_REL32_3:
case COFF::IMAGE_REL_AMD64_REL32_4:
case COFF::IMAGE_REL_AMD64_REL32_5: {
- uint32_t *TargetAddress = (uint32_t *)Target;
uint64_t FinalAddress = Section.LoadAddress + RE.Offset;
// Delta is the distance from the start of the reloc to the end of the
// instruction with the reloc.
@@ -81,7 +80,7 @@ public:
uint64_t Result = Value + RE.Addend;
assert(((int64_t)Result <= INT32_MAX) && "Relocation overflow");
assert(((int64_t)Result >= INT32_MIN) && "Relocation underflow");
- *TargetAddress = Result;
+ writeBytesUnaligned(Result, Target, 4);
break;
}
@@ -92,14 +91,12 @@ public:
// within a 32 bit offset from the base.
//
// For now we just set these to zero.
- uint32_t *TargetAddress = (uint32_t *)Target;
- *TargetAddress = 0;
+ writeBytesUnaligned(0, Target, 4);
break;
}
case COFF::IMAGE_REL_AMD64_ADDR64: {
- uint64_t *TargetAddress = (uint64_t *)Target;
- *TargetAddress = Value + RE.Addend;
+ writeBytesUnaligned(0, Target, Value + RE.Addend);
break;
}
@@ -139,14 +136,14 @@ public:
case COFF::IMAGE_REL_AMD64_REL32_4:
case COFF::IMAGE_REL_AMD64_REL32_5:
case COFF::IMAGE_REL_AMD64_ADDR32NB: {
- uint32_t *Displacement = (uint32_t *)ObjTarget;
- Addend = *Displacement;
+ uint8_t *Displacement = (uint8_t *)ObjTarget;
+ Addend = readBytesUnaligned(Displacement, 4);
break;
}
case COFF::IMAGE_REL_AMD64_ADDR64: {
- uint64_t *Displacement = (uint64_t *)ObjTarget;
- Addend = *Displacement;
+ uint8_t *Displacement = (uint8_t *)ObjTarget;
+ Addend = readBytesUnaligned(Displacement, 8);
break;
}
Removed: llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/COFF_x86_64
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/COFF_x86_64?rev=250732&view=auto
==============================================================================
--- llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/COFF_x86_64 (original)
+++ llvm/trunk/test/ExecutionEngine/RuntimeDyld/X86/COFF_x86_64 (removed)
@@ -1,34 +0,0 @@
-# RUN: llvm-mc -triple=x86_64-pc-win32 -filetype=obj -o %T/COFF_x86_64.o %s
-# RUN: llvm-rtdyld -triple=x86_64-pc-win32 -verify -check=%s %/T/COFF_x86_64.o
- .text
- .def F;
- .scl 2;
- .type 32;
- .endef
- .globl __real400921f9f01b866e
- .section .rdata,"dr",discard,__real400921f9f01b866e
- .align 8
-__real400921f9f01b866e:
- .quad 4614256650576692846 # double 3.1415899999999999
- .text
- .globl F
- .global inst1
- .align 16, 0x90
-F: # @F
-.Ltmp0:
-.seh_proc F
-# BB#0: # %entry
-.Ltmp1:
- .seh_endprologue
-# rtdyld-check: decode_operand(inst1, 4) = __real400921f9f01b866e - next_pc(inst1)
-inst1:
- movsd __real400921f9f01b866e(%rip), %xmm0 # xmm0 = mem[0],zero
- retq
-.Leh_func_end0:
-.Ltmp2:
- .seh_endproc
-
-# Make sure the JIT doesn't bail out on BSS sections.
- .bss
-bss_check:
- .fill 8, 1, 0
More information about the llvm-commits
mailing list