Commit d6f2a011 authored by Bill Wendling's avatar Bill Wendling
Browse files

$ 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

llvm-svn: 113353
parent c9a2cd0a

llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp

+2 −2
Original line number Diff line number Diff line
@@ -298,7 +298,7 @@ static unsigned T2Morph2LoadLiteral(unsigned Opcode) { 
/// decodeInstruction(insn) is invoked on the original insn.

///

/// Otherwise, decodeThumbInstruction is called with the original insn.

static unsigned decodeThumbSideEffect(bool IsThumb2, uint32_t &insn) {

static unsigned decodeThumbSideEffect(bool IsThumb2, unsigned &insn) {

  if (IsThumb2) {

    uint16_t op1 = slice(insn, 28, 27);

    uint16_t op2 = slice(insn, 26, 20);
@@ -436,7 +436,7 @@ bool ThumbDisassembler::getInstruction(MCInst &MI, 
  // passed to decodeThumbInstruction().  For 16-bit Thumb instruction, the top

  // halfword of insn is 0x00 0x00; otherwise, the first halfword is moved to

  // the top half followed by the second halfword.

  uint32_t insn = 0;

  unsigned insn = 0;

  // Possible second halfword.

  uint16_t insn1 = 0;

llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h

+2 −2
Original line number Diff line number Diff line
@@ -126,8 +126,8 @@ static inline unsigned slice(uint32_t Bits, unsigned From, unsigned To) { 
}



/// Utility function for setting [From, To] bits to Val for a uint32_t.

static inline void setSlice(uint32_t &Bits, unsigned From, unsigned To,

                            uint32_t Val) {

static inline void setSlice(unsigned &Bits, unsigned From, unsigned To,

                            unsigned Val) {

  assert(From < 32 && To < 32 && From >= To);

  uint32_t Mask = ((1 << (From - To + 1)) - 1);

  Bits &= ~(Mask << To);