diff options
author | Bill Wendling <isanbard@gmail.com> | 2010-09-08 10:09:17 +0000 |
---|---|---|
committer | Bill Wendling <isanbard@gmail.com> | 2010-09-08 10:09:17 +0000 |
commit | d6f2a011202eefbf0a7afdac063332a9404eae3b (patch) | |
tree | c0632d674675dcc9eb016d750914a4c077ba48e3 | |
parent | c9a2cd0ab785b487949ec61cec86b559b23ea2c6 (diff) | |
download | llvm-d6f2a011202eefbf0a7afdac063332a9404eae3b.zip llvm-d6f2a011202eefbf0a7afdac063332a9404eae3b.tar.gz llvm-d6f2a011202eefbf0a7afdac063332a9404eae3b.tar.bz2 |
$ 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
-rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 4 | ||||
-rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp index 14acf80..e220289 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -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; diff --git a/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h b/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h index 62cd5a0..9c30d33 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassemblerCore.h @@ -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); |