X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTarget%2FSparc%2FSparcInstrFormats.td;h=dca6852ae4beb9505785202b0a052a76f7e7fc2d;hb=749b758b2efee9c74bd4d2f7614c8153d60ee16d;hp=b63e39148fb3b954f5bf26794c5818ac7ad85779;hpb=1c4f4356032195f05c715b113b4ee5e2d4909915;p=oota-llvm.git

diff --git a/lib/Target/Sparc/SparcInstrFormats.td b/lib/Target/Sparc/SparcInstrFormats.td
index b63e39148fb..dca6852ae4b 100644
--- a/lib/Target/Sparc/SparcInstrFormats.td
+++ b/lib/Target/Sparc/SparcInstrFormats.td
@@ -1,4 +1,4 @@
-//===- SparcV8InstrFormats.td - SparcV8 Instr Formats ------*- tablegen -*-===//
+//===- SparcInstrFormats.td - Sparc Instruction Formats ----*- tablegen -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,11 +7,26 @@
 // 
 //===----------------------------------------------------------------------===//
 
+class InstSP<dag ops, string asmstr, list<dag> pattern> : Instruction {
+  field bits<32> Inst;
+
+  let Namespace = "SP";
+
+  bits<2> op;
+  let Inst{31-30} = op;               // Top two bits are the 'op' field
+  
+  dag OperandList = ops;
+  let AsmString   = asmstr;
+  let Pattern = pattern;
+}
+
 //===----------------------------------------------------------------------===//
-// Format #2 instruction classes in the SparcV8
+// Format #2 instruction classes in the Sparc
 //===----------------------------------------------------------------------===//
 
-class F2 : InstV8 {                   // Format 2 instructions
+// Format 2 instructions
+class F2<dag ops, string asmstr, list<dag> pattern>
+   : InstSP<ops, asmstr, pattern> {
   bits<3>  op2;
   bits<22> imm22;
   let op          = 0;    // op = 0
@@ -21,32 +36,33 @@ class F2 : InstV8 {                   // Format 2 instructions
 
 // Specific F2 classes: SparcV8 manual, page 44
 //
-class F2_1<bits<3> op2Val, string name> : F2 {
+class F2_1<bits<3> op2Val, dag ops, string asmstr, list<dag> pattern>
+   : F2<ops, asmstr, pattern> {
   bits<5>  rd;
 
   let op2         = op2Val;
-  let Name        = name;
 
   let Inst{29-25} = rd;
 }
 
-class F2_2<bits<4> condVal, bits<3> op2Val, string name> : F2 {
+class F2_2<bits<4> condVal, bits<3> op2Val, dag ops, string asmstr, 
+           list<dag> pattern> : F2<ops, asmstr, pattern> {
   bits<4>   cond;
   bit       annul = 0;     // currently unused
 
   let cond        = condVal;
   let op2         = op2Val;
-  let Name        = name;
 
   let Inst{29}    = annul;
   let Inst{28-25} = cond;
 }
 
 //===----------------------------------------------------------------------===//
-// Format #3 instruction classes in the SparcV8
+// Format #3 instruction classes in the Sparc
 //===----------------------------------------------------------------------===//
 
-class F3 : InstV8 {
+class F3<dag ops, string asmstr, list<dag> pattern>
+    : InstSP<ops, asmstr, pattern> {
   bits<5> rd;
   bits<6> op3;
   bits<5> rs1;
@@ -58,13 +74,11 @@ class F3 : InstV8 {
 
 // Specific F3 classes: SparcV8 manual, page 44
 //
-class F3_1<bits<2> opVal, bits<6> op3val, dag ops, string asmstr> : F3 {
-  bits<8> asi = 0; // asi not currently used in SparcV8
+class F3_1<bits<2> opVal, bits<6> op3val, dag ops,
+           string asmstr, list<dag> pattern> : F3<ops, asmstr, pattern> {
+  bits<8> asi = 0; // asi not currently used
   bits<5> rs2;
 
-  dag OperandList = ops;
-  let AsmString   = asmstr;
-
   let op         = opVal;
   let op3        = op3val;
 
@@ -73,26 +87,24 @@ class F3_1<bits<2> opVal, bits<6> op3val, dag ops, string asmstr> : F3 {
   let Inst{4-0}  = rs2;
 }
 
-class F3_2<bits<2> opVal, bits<6> op3val, dag ops, string name> : F3 {
+class F3_2<bits<2> opVal, bits<6> op3val, dag ops, 
+           string asmstr, list<dag> pattern> : F3<ops, asmstr, pattern> {
   bits<13> simm13;
 
-  dag OperandList = ops;
-  
   let op         = opVal;
   let op3        = op3val;
-  let Name       = name;
 
   let Inst{13}   = 1;     // i field = 1
   let Inst{12-0} = simm13;
 }
 
 // floating-point
-class F3_3<bits<2> opVal, bits<6> op3val, bits<9> opfval, string name> : F3 {
+class F3_3<bits<2> opVal, bits<6> op3val, bits<9> opfval, dag ops,
+           string asmstr, list<dag> pattern> : F3<ops, asmstr, pattern> {
   bits<5> rs2;
 
   let op         = opVal;
   let op3        = op3val;
-  let Name       = name;
 
   let Inst{13-5} = opfval;   // fp opcode
   let Inst{4-0}  = rs2;