diff options
| author | Jim Grosbach <grosbach@apple.com> | 2011-12-06 01:08:19 +0000 |
|---|---|---|
| committer | Jim Grosbach <grosbach@apple.com> | 2011-12-06 01:08:19 +0000 |
| commit | d9a6e8978dd65c85d68bf1141d992da576878cd8 (patch) | |
| tree | 29f126639a446519f5718e5ba7c251ce01729663 /lib/Target/ARM | |
| parent | e80fba0e6c976039c132c3d5d4fcad569d2259a8 (diff) | |
| download | external_llvm-d9a6e8978dd65c85d68bf1141d992da576878cd8.zip external_llvm-d9a6e8978dd65c85d68bf1141d992da576878cd8.tar.gz external_llvm-d9a6e8978dd65c85d68bf1141d992da576878cd8.tar.bz2 | |
Fix ARM handling of tBcc branch relaxation.
rdar://10069056
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@145885 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM')
| -rw-r--r-- | lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp b/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp index 59fae27..502a48b 100644 --- a/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp +++ b/lib/Target/ARM/MCTargetDesc/ARMAsmBackend.cpp @@ -146,11 +146,13 @@ bool ARMAsmBackend::fixupNeedsRelaxation(const MCFixup &Fixup, uint64_t Value, const MCInstFragment *DF, const MCAsmLayout &Layout) const { - // FIXME: This isn't correct for ARM. Just moving the "generic" logic - // into the targets for now. + // Relaxing tBcc to t2Bcc. tBcc has a signed 9-bit displacement with the + // low bit being an implied zero. There's an implied +4 offset for the + // branch, so we adjust the other way here to determine what's + // encodable. // // Relax if the value is too big for a (signed) i8. - return int64_t(Value) != int64_t(int8_t(Value)); + return int64_t((Value - 4)>>1) != int64_t(int8_t((Value - 4)>>1)); } void ARMAsmBackend::RelaxInstruction(const MCInst &Inst, MCInst &Res) const { |