Fix incorrect encoding of UMAAL and friends. Patch by James Molloy.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@137641 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARM/ARMInstrInfo.td b/lib/Target/ARM/ARMInstrInfo.td
index 9e0e56e..1377928 100644 (file)
--- a/lib/Target/ARM/ARMInstrInfo.td
+++ b/lib/Target/ARM/ARMInstrInfo.td
@@ -3461,8 +3461,8 @@ def UMAAL : AMul1I <0b0000010, (outs GPR:$RdLo, GPR:$RdHi),
   bits<4> RdHi;
   bits<4> Rm;
   bits<4> Rn;
-  let Inst{19-16} = RdLo;
-  let Inst{15-12} = RdHi;
+  let Inst{19-16} = RdHi;
+  let Inst{15-12} = RdLo;
   let Inst{11-8}  = Rm;
   let Inst{3-0}   = Rn;
 }

diff --git a/test/MC/ARM/basic-arm-instructions.s b/test/MC/ARM/basic-arm-instructions.s
index 3d0fffc..1a26235 100644 (file)
--- a/test/MC/ARM/basic-arm-instructions.s
+++ b/test/MC/ARM/basic-arm-instructions.s
@@ -2197,8 +2197,8 @@ Lforward:
         umaal r3, r4, r5, r6
         umaallt r3, r4, r5, r6
 
-@ CHECK: umaal r3, r4, r5, r6          @ encoding: [0x95,0x46,0x43,0xe0]
-@ CHECK: umaallt       r3, r4, r5, r6  @ encoding: [0x95,0x46,0x43,0xb0]
+@ CHECK: umaal r3, r4, r5, r6          @ encoding: [0x95,0x36,0x44,0xe0]
+@ CHECK: umaallt       r3, r4, r5, r6          @ encoding: [0x95,0x36,0x44,0xb0]
 
 
 @------------------------------------------------------------------------------

diff --git a/test/MC/Disassembler/ARM/basic-arm-instructions.txt b/test/MC/Disassembler/ARM/basic-arm-instructions.txt
index f4143a1..306b906 100644 (file)
--- a/test/MC/Disassembler/ARM/basic-arm-instructions.txt
+++ b/test/MC/Disassembler/ARM/basic-arm-instructions.txt
@@ -2090,8 +2090,8 @@
 # CHECK: umaal r3, r4, r5, r6
 # CHECK: umaallt r3, r4, r5, r6
 
-0x95 0x46 0x43 0xe0
-0x95 0x46 0x43 0xb0
+0x95 0x36 0x44 0xe0
+0x95 0x36 0x44 0xb0
 
 
 #------------------------------------------------------------------------------