summaryrefslogtreecommitdiff
path: root/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
diff options
context:
space:
mode:
authorGordon Keiser <gkeiser@arxan.com>2013-03-28 19:22:28 +0000
committerGordon Keiser <gkeiser@arxan.com>2013-03-28 19:22:28 +0000
commitce888351106a72825e2a107cb08d7130f3dce0ee (patch)
tree35d67c802f5c543db0e4c5ae441eb4542451b6da /lib/Target/ARM/Disassembler/ARMDisassembler.cpp
parent93b10789c6ca1c7c5ca8a453a4709f47099ec819 (diff)
downloadllvm-ce888351106a72825e2a107cb08d7130f3dce0ee.tar.gz
llvm-ce888351106a72825e2a107cb08d7130f3dce0ee.tar.bz2
llvm-ce888351106a72825e2a107cb08d7130f3dce0ee.tar.xz
Fix issue with disassembler decoding CBZ/CBNZ immediates as negatives when the upper bit is set.
They should always be zero-extended, not sign extended. Added test case. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@178275 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/Disassembler/ARMDisassembler.cpp')
-rw-r--r--lib/Target/ARM/Disassembler/ARMDisassembler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
index ec895c3930..2e009e55e3 100644
--- a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
+++ b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
@@ -3049,9 +3049,9 @@ static DecodeStatus DecodeT2BROperand(MCInst &Inst, unsigned Val,
static DecodeStatus DecodeThumbCmpBROperand(MCInst &Inst, unsigned Val,
uint64_t Address, const void *Decoder) {
- if (!tryAddingSymbolicOperand(Address, Address + SignExtend32<7>(Val<<1) + 4,
+ if (!tryAddingSymbolicOperand(Address, Address + (Val<<1) + 4,
true, 2, Inst, Decoder))
- Inst.addOperand(MCOperand::CreateImm(SignExtend32<7>(Val << 1)));
+ Inst.addOperand(MCOperand::CreateImm(Val << 1));
return MCDisassembler::Success;
}