[AVR] Fix #84 movw instruction

Author: agnat

lib/Target/AVR/AVRInstrFormats.td

@@ -292,8 +292,8 @@ class FMOVWRdRr<dag outs, dag ins, string asmstr, list<dag> pattern>
   bits<5> r;
 
   let Inst{15-8} = 0b00000001;
-  let Inst{7-4} = d{3-0};
-  let Inst{3-0} = r{3-0};
+  let Inst{7-4} = d{4-1};
+  let Inst{3-0} = r{4-1};
 }
 
 //===----------------------------------------------------------------------===//

test/MC/AVR/inst-movw.s

@@ -1,5 +1,4 @@
 ; RUN: llvm-mc -triple avr-none -mattr=movw -show-encoding < %s | FileCheck %s
-; XFAIL: *
 
 
 foo:
@@ -9,7 +8,7 @@ foo:
   movw r20, r22
   movw r8,  r12
 
-; CHECK: movw r10, r8                    ; encoding: [0x54,0x01]
-; CHECK: movw r12, r16                   ; encoding: [0x68,0x01]
-; CHECK: movw r20, r22                   ; encoding: [0xab,0x01]
-; CHECK: movw r8,  r12                   ; encoding: [0x46,0x01]
+; CHECK: movw r11:r10, r9:r8             ; encoding: [0x54,0x01]
+; CHECK: movw r13:r12, r17:r16           ; encoding: [0x68,0x01]
+; CHECK: movw r21:r20, r23:r22           ; encoding: [0xab,0x01]
+; CHECK: movw r9:r8,   r13:r12           ; encoding: [0x46,0x01]

test/MC/AVR/inst-st.s

@@ -63,7 +63,7 @@ foo:
 
 ; Predecrement
 
-; CHECK: st -x, r10                  ; encoding: [0xae,0x92]
+; CHECK: st -x, r10                   ; encoding: [0xae,0x92]
 ; CHECK: st -x,  r17                  ; encoding: [0x1e,0x93]
 
 ; CHECK: st -y,  r30                  ; encoding: [0xea,0x93]