diff options
| author | Akira Hatanaka <ahatanaka@mips.com> | 2012-04-16 18:00:19 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@mips.com> | 2012-04-16 18:00:19 +0000 |
| commit | 3ef7edc77ace78ba6382adb63c1ac03326d4a615 (patch) | |
| tree | 28f06fe640f5c2375551a76f93ccaf2913ce2727 | |
| parent | 99a0b28b41960b18ef0875cb467715acc4f3ce02 (diff) | |
| download | external_llvm-3ef7edc77ace78ba6382adb63c1ac03326d4a615.zip external_llvm-3ef7edc77ace78ba6382adb63c1ac03326d4a615.tar.gz external_llvm-3ef7edc77ace78ba6382adb63c1ac03326d4a615.tar.bz2 | |
Do not add offset in applyFixup. This has already been accounted for in Value.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@154838 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp | 6 | ||||
| -rw-r--r-- | test/MC/Mips/sym-offset.ll | 22 |
2 files changed, 24 insertions, 4 deletions
diff --git a/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp b/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp index e79be33..9b4caf6 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp @@ -12,7 +12,6 @@ //===----------------------------------------------------------------------===// // -#include "MipsBaseInfo.h" #include "MipsFixupKinds.h" #include "MCTargetDesc/MipsMCTargetDesc.h" #include "llvm/MC/MCAsmBackend.h" @@ -85,9 +84,8 @@ public: uint64_t Value) const { MCFixupKind Kind = Fixup.getKind(); Value = adjustFixupValue((unsigned)Kind, Value); - int64_t SymOffset = MipsGetSymAndOffset(Fixup).second; - if (!Value && !SymOffset) + if (!Value) return; // Doesn't change encoding. // Where do we start in the object @@ -118,7 +116,7 @@ public: } uint64_t Mask = ((uint64_t)(-1) >> (64 - getFixupKindInfo(Kind).TargetSize)); - CurVal |= (Value + SymOffset) & Mask; + CurVal |= Value & Mask; // Write out the fixed up bytes back to the code/data bits. for (unsigned i = 0; i != NumBytes; ++i) { diff --git a/test/MC/Mips/sym-offset.ll b/test/MC/Mips/sym-offset.ll new file mode 100644 index 0000000..5939935 --- /dev/null +++ b/test/MC/Mips/sym-offset.ll @@ -0,0 +1,22 @@ +; RUN: llc -filetype=obj -mtriple mipsel-unknown-linux %s -o - | elf-dump --dump-section-data | FileCheck %s + +; FIXME: use assembler instead of llc when it becomes available. + +@string1 = internal global [11 x i8] c"aaaaaaaaaa\00", align 1 +@string2 = internal global [10 x i8] c"aaaa\00bbbb\00", align 1 + +define i32 @foo1(i32 %n) nounwind readonly { +entry: +; check that the immediate fields of lwl and lwr are three apart. +; 8841000e lwl at,14(v0) +; 9841000b lwr at,11(v0) + +; CHECK: ('_section_data', '00001c3c 00009c27 21e09903 0000828f 0e004188 0b004198 + + %call = tail call i32 @memcmp(i8* getelementptr inbounds ([11 x i8]* @string1, i32 0, i32 0), i8* getelementptr inbounds ([10 x i8]* @string2, i32 0, i32 0), i32 4) nounwind readonly + %cmp = icmp eq i32 %call, 0 + %conv = zext i1 %cmp to i32 + ret i32 %conv +} + +declare i32 @memcmp(i8* nocapture, i8* nocapture, i32) nounwind readonly |