diff options
| author | Akira Hatanaka <ahatanaka@mips.com> | 2012-03-27 02:33:05 +0000 |
|---|---|---|
| committer | Akira Hatanaka <ahatanaka@mips.com> | 2012-03-27 02:33:05 +0000 |
| commit | 59182f9425dba2d5e0035155bd2b0a04c6ababb3 (patch) | |
| tree | ac328d72ffbad4827d7e0de5c93e09c4994aa227 /lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp | |
| parent | d7edf7edd4bdd372a6fc2582632ffe6fa935f980 (diff) | |
| download | external_llvm-59182f9425dba2d5e0035155bd2b0a04c6ababb3.zip external_llvm-59182f9425dba2d5e0035155bd2b0a04c6ababb3.tar.gz external_llvm-59182f9425dba2d5e0035155bd2b0a04c6ababb3.tar.bz2 | |
Retrieve and add the offset of a symbol in applyFixup rather than retrieve and
set it in MipsMCCodeEmitter::getMachineOpValue. Assert in getMachineOpValue if
MachineOperand MO is of an unexpected type.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@153494 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp')
| -rw-r--r-- | lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp b/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp index 6e8dace..ea86f48 100644 --- a/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp +++ b/lib/Target/Mips/MCTargetDesc/MipsAsmBackend.cpp @@ -12,6 +12,7 @@ //===----------------------------------------------------------------------===// // +#include "MipsBaseInfo.h" #include "MipsFixupKinds.h" #include "MCTargetDesc/MipsMCTargetDesc.h" #include "llvm/MC/MCAsmBackend.h" @@ -82,8 +83,9 @@ public: uint64_t Value) const { MCFixupKind Kind = Fixup.getKind(); Value = adjustFixupValue((unsigned)Kind, Value); + int64_t SymOffset = MipsGetSymAndOffset(Fixup).second; - if (!Value) + if (!Value && !SymOffset) return; // Doesn't change encoding. // Where do we start in the object @@ -114,7 +116,7 @@ public: } uint64_t Mask = ((uint64_t)(-1) >> (64 - getFixupKindInfo(Kind).TargetSize)); - CurVal = (CurVal & ~Mask) | ((CurVal + Value) & Mask); + CurVal |= (Value + SymOffset) & Mask; // Write out the fixed up bytes back to the code/data bits. for (unsigned i = 0; i != NumBytes; ++i) { |