diff options
| author | Chad Rosier <mcrosier@apple.com> | 2012-07-09 20:43:34 +0000 |
|---|---|---|
| committer | Chad Rosier <mcrosier@apple.com> | 2012-07-09 20:43:34 +0000 |
| commit | aeed158f75f8ea9e812e49e6c19083c3d409ea03 (patch) | |
| tree | f579af4ddde421f9ae18856331dc62f2a8bae965 /llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | |
| parent | fb982ddeda7f796de23a39632f535f66a16af537 (diff) | |
| download | bcm5719-llvm-aeed158f75f8ea9e812e49e6c19083c3d409ea03.tar.gz bcm5719-llvm-aeed158f75f8ea9e812e49e6c19083c3d409ea03.zip | |
Revert r159938 (and r159945) to appease the buildbots.
llvm-svn: 159960
Diffstat (limited to 'llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp')
| -rw-r--r-- | llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp | 8 |
1 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 c42edd53952..66ea1171ff9 100644 --- a/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp +++ b/llvm/lib/Target/ARM/Disassembler/ARMDisassembler.cpp @@ -4198,9 +4198,9 @@ static DecodeStatus DecodeVMOVSRR(MCInst &Inst, unsigned Insn, DecodeStatus S = MCDisassembler::Success; unsigned Rt = fieldFromInstruction32(Insn, 12, 4); unsigned Rt2 = fieldFromInstruction32(Insn, 16, 4); - unsigned Rm = fieldFromInstruction32(Insn, 5, 1); + unsigned Rm = fieldFromInstruction32(Insn, 0, 4); unsigned pred = fieldFromInstruction32(Insn, 28, 4); - Rm |= fieldFromInstruction32(Insn, 0, 4) << 4; + Rm |= fieldFromInstruction32(Insn, 5, 1) << 4; if (Rt == 0xF || Rt2 == 0xF || Rm == 0x1F) S = MCDisassembler::SoftFail; @@ -4224,9 +4224,9 @@ static DecodeStatus DecodeVMOVRRS(MCInst &Inst, unsigned Insn, DecodeStatus S = MCDisassembler::Success; unsigned Rt = fieldFromInstruction32(Insn, 12, 4); unsigned Rt2 = fieldFromInstruction32(Insn, 16, 4); - unsigned Rm = fieldFromInstruction32(Insn, 5, 1); + unsigned Rm = fieldFromInstruction32(Insn, 0, 4); unsigned pred = fieldFromInstruction32(Insn, 28, 4); - Rm |= fieldFromInstruction32(Insn, 0, 4) << 1; + Rm |= fieldFromInstruction32(Insn, 5, 1) << 4; if (Rt == 0xF || Rt2 == 0xF || Rm == 0x1F) S = MCDisassembler::SoftFail; |
