diff options
author | Owen Anderson <resistor@mac.com> | 2011-09-16 23:04:48 +0000 |
---|---|---|
committer | Owen Anderson <resistor@mac.com> | 2011-09-16 23:04:48 +0000 |
commit | 8b22778431cdeb112366ed5dc6283b3a7af19018 (patch) | |
tree | ed3c0bb4278d9c055d3c9e41fa43f7b677cc1d9b /lib/Target/ARM/Disassembler/ARMDisassembler.cpp | |
parent | 166e0539c987a5bea2432354b2437eba29bb1ce0 (diff) |
Fix bitfield decoding based on Eli's feedback.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139969 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM/Disassembler/ARMDisassembler.cpp')
-rw-r--r-- | lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index d1eb5b3004..4e9c3e58a5 100644 --- a/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -1004,10 +1004,9 @@ static DecodeStatus DecodeBitfieldMaskOperand(llvm::MCInst &Inst, unsigned Val, unsigned msb = fieldFromInstruction32(Val, 5, 5); unsigned lsb = fieldFromInstruction32(Val, 0, 5); - uint32_t msb_mask = (1 << (msb+1)) - 1; - if (msb == 31) msb_mask = 0xFFFFFFFF; - uint32_t lsb_mask = (1 << lsb) - 1; - if (lsb == 31) lsb_mask = 0xFFFFFFFF; + uint32_t msb_mask = 0xFFFFFFFF; + if (msb != 31) msb_mask = (1U << (msb+1)) - 1; + uint32_t lsb_mask = (1U << lsb) - 1; Inst.addOperand(MCOperand::CreateImm(~(msb_mask ^ lsb_mask))); return MCDisassembler::Success; |