diff options
| author | Jason W Kim <jason.w.kim.2009@gmail.com> | 2011-08-04 00:38:45 +0000 |
|---|---|---|
| committer | Jason W Kim <jason.w.kim.2009@gmail.com> | 2011-08-04 00:38:45 +0000 |
| commit | e4df09f7ba660cf04d73a06aeb11abd8d0e26e6e (patch) | |
| tree | 538e79537072fe7a6a761ce02cae5742c9c209ab | |
| parent | e234f6ae0c985a4b7dbf211ee8edd833171856e0 (diff) | |
| download | bcm5719-llvm-e4df09f7ba660cf04d73a06aeb11abd8d0e26e6e.tar.gz bcm5719-llvm-e4df09f7ba660cf04d73a06aeb11abd8d0e26e6e.zip | |
Fix http://llvm.org/bugs/show_bug.cgi?id=10568
Move the reloc size assert into AsmBackend - where it is more apropos.
llvm-svn: 136855
| -rw-r--r-- | llvm/lib/MC/ELFObjectWriter.cpp | 1 | ||||
| -rw-r--r-- | llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp | 17 | ||||
| -rw-r--r-- | llvm/test/MC/ELF/x86_64-reloc-sizetest.s | 13 |
3 files changed, 30 insertions, 1 deletions
diff --git a/llvm/lib/MC/ELFObjectWriter.cpp b/llvm/lib/MC/ELFObjectWriter.cpp index d7ec3d815c2..78588ae9aca 100644 --- a/llvm/lib/MC/ELFObjectWriter.cpp +++ b/llvm/lib/MC/ELFObjectWriter.cpp @@ -1698,7 +1698,6 @@ unsigned X86ELFObjectWriter::GetRelocType(const MCValue &Target, default: llvm_unreachable("invalid fixup kind!"); case FK_Data_8: Type = ELF::R_X86_64_64; break; case X86::reloc_signed_4byte: - assert(isInt<32>(Target.getConstant())); switch (Modifier) { default: llvm_unreachable("Unimplemented"); diff --git a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp index c90e41ca724..e7713f34321 100644 --- a/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp +++ b/llvm/lib/Target/X86/MCTargetDesc/X86AsmBackend.cpp @@ -93,6 +93,23 @@ public: assert(Fixup.getOffset() + Size <= DataSize && "Invalid fixup offset!"); + + // Check that the upper bits are either all 0 or all 1's + switch (Size) { + case 1: + assert((isInt<8>(Value) || isUInt<8>(Value)) && + "Value does not fit in a 1Byte Reloc"); + break; + case 2: + assert((isInt<16>(Value) || isUInt<16>(Value)) && + "Value does not fit in a 2Byte Reloc"); + break; + case 4: + assert((isInt<32>(Value) || isUInt<32>(Value)) && + "Value does not fit in a 4Byte Reloc"); + break; + } + for (unsigned i = 0; i != Size; ++i) Data[Fixup.getOffset() + i] = uint8_t(Value >> (i * 8)); } diff --git a/llvm/test/MC/ELF/x86_64-reloc-sizetest.s b/llvm/test/MC/ELF/x86_64-reloc-sizetest.s new file mode 100644 index 00000000000..c899a94aa78 --- /dev/null +++ b/llvm/test/MC/ELF/x86_64-reloc-sizetest.s @@ -0,0 +1,13 @@ +// RUN: llvm-mc -triple x86_64-linux-gnu -filetype=obj %s | elf-dump | FileCheck %s + +// Tests that relocation value fits in the provided size +// Original bug http://llvm.org/bugs/show_bug.cgi?id=10568 + +L: movq $(L + 2147483648),%rax + + +// CHECK: Relocation 0x00000000 +// CHECK-NEXT: 'r_offset', 0x00000003 +// CHECK-NEXT: 'r_sym' +// CHECK-NEXT: 'r_type', 0x0000000b +// CHECK-NEXT: 'r_addend', 0x80000000 |
