[llvm-commits] [llvm] r159960 - in /llvm/trunk: lib/Target/ARM/ARMInstrVFP.td lib/Target/ARM/Disassembler/ARMDisassembler.cpp test/MC/ARM/simple-fp-encoding.s

[Chad Rosier]

Author: mcrosier
Date: Mon Jul  9 15:43:34 2012
New Revision: 159960

URL: http://llvm.org/viewvc/llvm-project?rev=159960&view=rev
Log:
Revert r159938 (and r159945) to appease the buildbots.

Modified:
    llvm/trunk/lib/Target/ARM/ARMInstrVFP.td
    llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
    llvm/trunk/test/MC/ARM/simple-fp-encoding.s

Modified: llvm/trunk/lib/Target/ARM/ARMInstrVFP.td
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMInstrVFP.td?rev=159960&r1=159959&r2=159960&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMInstrVFP.td (original)
+++ llvm/trunk/lib/Target/ARM/ARMInstrVFP.td Mon Jul  9 15:43:34 2012
@@ -567,8 +567,8 @@
   bits<4> Rt2;
 
   // Encode instruction operands.
-  let Inst{3-0}   = src1{4-1};
-  let Inst{5}     = src1{0};
+  let Inst{3-0}   = src1{3-0};
+  let Inst{5}     = src1{4};
   let Inst{15-12} = Rt;
   let Inst{19-16} = Rt2;
 
@@ -617,8 +617,8 @@
   bits<4> src2;
 
   // Encode instruction operands.
-  let Inst{3-0}   = dst1{4-1};
-  let Inst{5}     = dst1{0};
+  let Inst{3-0}   = dst1{3-0};
+  let Inst{5}     = dst1{4};
   let Inst{15-12} = src1;
   let Inst{19-16} = src2;
 

Modified: llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp?rev=159960&r1=159959&r2=159960&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp (original)
+++ llvm/trunk/lib/Target/ARM/Disassembler/ARMDisassembler.cpp Mon Jul  9 15:43:34 2012
@@ -4198,9 +4198,9 @@
   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 @@
   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;

Modified: llvm/trunk/test/MC/ARM/simple-fp-encoding.s
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/MC/ARM/simple-fp-encoding.s?rev=159960&r1=159959&r2=159960&view=diff
==============================================================================
--- llvm/trunk/test/MC/ARM/simple-fp-encoding.s (original)
+++ llvm/trunk/test/MC/ARM/simple-fp-encoding.s Mon Jul  9 15:43:34 2012
@@ -196,27 +196,6 @@
 @ CHECK: vmov r0, r1, d16            @ encoding: [0x30,0x0b,0x51,0xec]
         vmov    r0, r1, d16
 
-@ Between two single precision registers and two core registers
-        vmov s3, s4, r1, r2
-        vmov s2, s3, r1, r2
-        vmov r1, r2, s3, s4
-        vmov r1, r2, s2, s3
-@ CHECK: vmov s3, s4, r1, r2      @ encoding: [0x31,0x1a,0x42,0xec]
-@ CHECK: vmov s2, s3, r1, r2      @ encoding: [0x11,0x1a,0x42,0xec]
-@ CHECK: vmov r1, r2, s3, s4      @ encoding: [0x31,0x1a,0x52,0xec]
-@ CHECK: vmov r1, r2, s2, s3      @ encoding: [0x11,0x1a,0x52,0xec]
-
-@ Between one double precision register and two core registers
-        vmov d15, r1, r2 
-        vmov d16, r1, r2
-        vmov r1, r2, d15
-        vmov r1, r2, d16
-@ CHECK: vmov d15, r1, r2         @ encoding: [0x1f,0x1b,0x42,0xec]
-@ CHECK: vmov d16, r1, r2         @ encoding: [0x30,0x1b,0x42,0xec]
-@ CHECK: vmov r1, r2, d15         @ encoding: [0x1f,0x1b,0x52,0xec]
-@ CHECK: vmov r1, r2, d16         @ encoding: [0x30,0x1b,0x52,0xec]
-
-
 @ CHECK: vldr d17, [r0]           @ encoding: [0x00,0x1b,0xd0,0xed]
 @ CHECK: vldr s0, [lr]            @ encoding: [0x00,0x0a,0x9e,0xed]
 @ CHECK: vldr d0, [lr]            @ encoding: [0x00,0x0b,0x9e,0xed]