Skip to content

Fix Thumb2 conditional branch encoding with absolute targets #607

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
xintenseapple wants to merge 1 commit into from
Closed

Fix Thumb2 conditional branch encoding with absolute targets #607

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions llvm/lib/Target/ARM/MCTargetDesc/ARMMCCodeEmitter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,9 +708,15 @@ getBranchTargetOpValue(const MCInst &MI, unsigned OpIdx,
const MCSubtargetInfo &STI) const {
// FIXME: This really, really shouldn't use TargetMachine. We don't want
// coupling between MC and TM anywhere we can help it.
if (isThumb2(STI))
return
::getBranchTargetOpValue(MI, OpIdx, ARM::fixup_t2_condbranch, Fixups, STI);
if (isThumb2(STI)) {
const MCOperand MO = MI.getOperand(OpIdx);
if (MO.isExpr())
return ::getBranchTargetOpValue(MI, OpIdx, ARM::fixup_t2_condbranch,
Fixups, STI);
// The branch target is an absolute address; convert it to a PC-relative
// byte offset. The encoder below drops the (always zero) low bit.
return (uint32_t)(int32_t)(MO.getImm() - MI.getAddress() - 4);
}
return getARMBranchTargetOpValue(MI, OpIdx, Fixups, STI);
}

Expand Down