From 8bfdd8771431cd187794fb185f86727e73748810 Mon Sep 17 00:00:00 2001
From: Wesley Peck <peckw@wesleypeck.com>
Date: Fri, 12 Nov 2010 23:41:10 +0000
Subject: [PATCH] Fixing improperly encoded reverse subtract instructions in
 MBlaze backend.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@118943 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Target/MBlaze/MBlazeInstrFormats.td | 15 +++++++--------
 lib/Target/MBlaze/MBlazeInstrInfo.td    |  2 +-
 test/MC/MBlaze/mblaze_typea.s           | 16 ++++++++--------
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/lib/Target/MBlaze/MBlazeInstrFormats.td b/lib/Target/MBlaze/MBlazeInstrFormats.td
index 27fa049f809..d62574d0ede 100644
--- a/lib/Target/MBlaze/MBlazeInstrFormats.td
+++ b/lib/Target/MBlaze/MBlazeInstrFormats.td
@@ -125,18 +125,17 @@ class TB<bits<6> op, dag outs, dag ins, string asmstr, list<dag> pattern,
 
 class TAR<bits<6> op, bits<11> flags, dag outs, dag ins, string asmstr,
           list<dag> pattern, InstrItinClass itin> :
-          MBlazeInst<op,FRRR,outs, ins, asmstr, pattern, itin>
+          TA<op, flags, outs, ins, asmstr, pattern, itin>
 {
-  bits<5> rd;
-  bits<5> rb;
-  bits<5> ra;
+  bits<5> rrd;
+  bits<5> rrb;
+  bits<5> rra;
 
   let Form = FRRRR;
 
-  let Inst{6-10}  = rd;
-  let Inst{11-15} = ra;
-  let Inst{16-20} = rb;
-  let Inst{21-31} = flags;
+  let rd = rrd;
+  let ra = rra;
+  let rb = rrb;
 }
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/Target/MBlaze/MBlazeInstrInfo.td b/lib/Target/MBlaze/MBlazeInstrInfo.td
index 9802361c51d..ae05b736b5a 100644
--- a/lib/Target/MBlaze/MBlazeInstrInfo.td
+++ b/lib/Target/MBlaze/MBlazeInstrInfo.td
@@ -177,7 +177,7 @@ class ShiftI<bits<6> op, bits<2> flags, string instr_asm, SDNode OpNode,
 
 class ArithR<bits<6> op, bits<11> flags, string instr_asm, SDNode OpNode,
             InstrItinClass itin> :
-            TAR<op, flags, (outs GPR:$dst), (ins GPR:$c, GPR:$b),
+            TAR<op, flags, (outs GPR:$dst), (ins GPR:$b, GPR:$c),
                 !strconcat(instr_asm, "   $dst, $c, $b"),
                 [(set GPR:$dst, (OpNode GPR:$b, GPR:$c))], itin>;
 
diff --git a/test/MC/MBlaze/mblaze_typea.s b/test/MC/MBlaze/mblaze_typea.s
index be260447b4a..a0735e482cb 100644
--- a/test/MC/MBlaze/mblaze_typea.s
+++ b/test/MC/MBlaze/mblaze_typea.s
@@ -81,24 +81,24 @@
 # CHECK:    encoding: [0x80,0x22,0x18,0x00]
             or      r1, r2, r3
 
-# FIXMEC:   rsub
+# CHECK:    rsub
 # BINARY:   000001 00001 00010 00011 00000000000
-# FIXMEC:   encoding: [0x04,0x22,0x18,0x00]
+# CHECK:    encoding: [0x04,0x22,0x18,0x00]
             rsub    r1, r2, r3
 
-# FIXMEC:   rsubc
+# CHECK:    rsubc
 # BINARY:   000011 00001 00010 00011 00000000000
-# FIXMEC:   encoding: [0x0c,0x22,0x18,0x00]
+# CHECK:    encoding: [0x0c,0x22,0x18,0x00]
             rsubc   r1, r2, r3
 
-# FIXMEC:   rsubk
+# CHECK:    rsubk
 # BINARY:   000101 00001 00010 00011 00000000000
-# FIXMEC:   encoding: [0x14,0x22,0x18,0x00]
+# CHECK:    encoding: [0x14,0x22,0x18,0x00]
             rsubk   r1, r2, r3
 
-# FIXMEC:   rsubkc
+# CHECK:    rsubkc
 # BINARY:   000111 00001 00010 00011 00000000000
-# FIXMEC:   encoding: [0x1c,0x22,0x18,0x00]
+# CHECK:    encoding: [0x1c,0x22,0x18,0x00]
             rsubkc  r1, r2, r3
 
 # CHECK:    sext16
-- 
2.34.1