llvm.org GIT mirror llvm / 1113b52
$ svn merge -c 113255 https://llvm.org/svn/llvm-project/llvm/trunk --- Merging r113255 into '.': U lib/Target/ARM/Disassembler/ARMDisassemblerCore.h $ svn merge -c 113345 https://llvm.org/svn/llvm-project/llvm/trunk --- Merging r113345 into '.': U lib/Target/ARM/Disassembler/ARMDisassembler.cpp git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_28@113353 91177308-0d34-0410-b5e6-96231b3b80d8 Bill Wendling 9 years ago
2 changed file(s) with 4 addition(s) and 4 deletion(s). Raw diff Collapse all Expand all
297297 /// decodeInstruction(insn) is invoked on the original insn.
298298 ///
299299 /// Otherwise, decodeThumbInstruction is called with the original insn.
300 static unsigned decodeThumbSideEffect(bool IsThumb2, uint32_t &insn) {
300 static unsigned decodeThumbSideEffect(bool IsThumb2, unsigned &insn) {
301301 if (IsThumb2) {
302302 uint16_t op1 = slice(insn, 28, 27);
303303 uint16_t op2 = slice(insn, 26, 20);
435435 // passed to decodeThumbInstruction(). For 16-bit Thumb instruction, the top
436436 // halfword of insn is 0x00 0x00; otherwise, the first halfword is moved to
437437 // the top half followed by the second halfword.
438 uint32_t insn = 0;
438 unsigned insn = 0;
439439 // Possible second halfword.
440440 uint16_t insn1 = 0;
441441
125125 }
126126
127127 /// Utility function for setting [From, To] bits to Val for a uint32_t.
128 static inline void setSlice(uint32_t &Bits, unsigned From, unsigned To,
129 uint32_t Val) {
128 static inline void setSlice(unsigned &Bits, unsigned From, unsigned To,
129 unsigned Val) {
130130 assert(From < 32 && To < 32 && From >= To);
131131 uint32_t Mask = ((1 << (From - To + 1)) - 1);
132132 Bits &= ~(Mask << To);