summaryrefslogtreecommitdiffstats
path: root/llvm/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
commit772cf466dab6beadf3cab40722cf6cf10342f808 (patch)
treee685a31c501cb44543123e5e7f3069228372eeb9 /llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
parent04a94d14422a83bd6883c8a4a6837b04108b0742 (diff)
downloadbcm5719-llvm-772cf466dab6beadf3cab40722cf6cf10342f808.tar.gz
bcm5719-llvm-772cf466dab6beadf3cab40722cf6cf10342f808.zip
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. llvm-svn: 178275
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp')
-rw-r--r--llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
index ec895c3930e..2e009e55e3b 100644
--- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
+++ b/llvm/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;
}
OpenPOWER on IntegriCloud