* Set annul bit to be 0, because the Sparc backend currently does not use it.

* Use the name of the predict field instead of just the const 1 in the
  Instruction.

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

diff --git a/lib/Target/SparcV9/SparcV9_F2.td b/lib/Target/SparcV9/SparcV9_F2.td
index a9cd247..e0408a0 100644 (file)
--- a/lib/Target/SparcV9/SparcV9_F2.td
+++ b/lib/Target/SparcV9/SparcV9_F2.td
@@ -27,7 +27,7 @@ class F2_br : F2 {                    // Format 2 Branch instruction
 
 class F2_2<bits<4> cond, string name> : F2_br { // Format 2.2 instructions
   bits<22> disp;
-  bit      annul;
+  bit      annul = 0; // currently unused by Sparc backend
 
   let Name        = name;
   let Inst{29}    = annul;
@@ -39,13 +39,13 @@ class F2_3<bits<4> cond, string name> : F2_br { // Format 2.3 instructions
   bits<2>  cc;
   bits<19> disp;
   bit      predict = 1;
-  bit      annul;
+  bit      annul = 0; // currently unused by Sparc backend
 
   let Name        = name;
   let Inst{29}    = annul;
   let Inst{28-25} = cond;
   let Inst{21-20} = cc;
-  let Inst{19}    = 1; // predict;
+  let Inst{19}    = predict;
   let Inst{18-0}  = disp;
 }
 
@@ -53,14 +53,14 @@ class F2_4<bits<3> rcond, string name> : F2_br { // Format 2.4 instructions
   bits<5>  rs1;
   bits<16> disp;
   bit      predict = 1;
-  bit      annul;
+  bit      annul = 0; // currently unused by Sparc backend
 
   let Name        = name;
   let Inst{29}    = annul;
   let Inst{28}    = 0;
   let Inst{27-25} = rcond;
   let Inst{21-20} = disp{15-14};
-  let Inst{19}    = 1; // predict;
+  let Inst{19}    = predict;
   let Inst{18-14} = rs1;
   let Inst{13-0 } = disp{13-0};
 }