[llvm-commits] CVS: llvm/lib/Target/X86/X86FloatingPoint.cpp X86ISelPattern.cpp X86InstrInfo.td

[Evan Cheng]

Changes in directory llvm/lib/Target/X86:

X86FloatingPoint.cpp updated: 1.46 -> 1.47
X86ISelPattern.cpp updated: 1.198 -> 1.199
X86InstrInfo.td updated: 1.215 -> 1.216
---
Log message:

Rename fcmovae to fcmovnb and fcmova to fcmovnbe (following Intel manual).
Some assemblers can't recognize the aliases.


---
Diffs of the changes:  (+9 -9)

 X86FloatingPoint.cpp |    4 ++--
 X86ISelPattern.cpp   |    2 +-
 X86InstrInfo.td      |   12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)


Index: llvm/lib/Target/X86/X86FloatingPoint.cpp
diff -u llvm/lib/Target/X86/X86FloatingPoint.cpp:1.46 llvm/lib/Target/X86/X86FloatingPoint.cpp:1.47
--- llvm/lib/Target/X86/X86FloatingPoint.cpp:1.46	Tue Jan 10 16:22:02 2006
+++ llvm/lib/Target/X86/X86FloatingPoint.cpp	Fri Jan 20 20:55:41 2006
@@ -324,11 +324,11 @@
   { X86::FpADD32m  , X86::FADD32m  },
   { X86::FpADD64m  , X86::FADD64m  },
   { X86::FpCHS     , X86::FCHS     },
-  { X86::FpCMOVA   , X86::FCMOVA   },
-  { X86::FpCMOVAE  , X86::FCMOVAE  },
   { X86::FpCMOVB   , X86::FCMOVB   },
   { X86::FpCMOVBE  , X86::FCMOVBE  },
   { X86::FpCMOVE   , X86::FCMOVE   },
+  { X86::FpCMOVNB  , X86::FCMOVNB  },
+  { X86::FpCMOVNBE , X86::FCMOVNBE },
   { X86::FpCMOVNE  , X86::FCMOVNE  },
   { X86::FpCMOVNP  , X86::FCMOVNP  },
   { X86::FpCMOVP   , X86::FCMOVP   },


Index: llvm/lib/Target/X86/X86ISelPattern.cpp
diff -u llvm/lib/Target/X86/X86ISelPattern.cpp:1.198 llvm/lib/Target/X86/X86ISelPattern.cpp:1.199
--- llvm/lib/Target/X86/X86ISelPattern.cpp:1.198	Sun Jan 15 03:00:21 2006
+++ llvm/lib/Target/X86/X86ISelPattern.cpp	Fri Jan 20 20:55:41 2006
@@ -758,7 +758,7 @@
   static const unsigned CMOVTABFP[] = {
     X86::FpCMOVE,  X86::FpCMOVNE, /*missing*/0, /*missing*/0,
     /*missing*/0,  /*missing*/ 0, X86::FpCMOVB, X86::FpCMOVBE,
-    X86::FpCMOVA,  X86::FpCMOVAE, X86::FpCMOVP, X86::FpCMOVNP
+    X86::FpCMOVNBE,X86::FpCMOVNB, X86::FpCMOVP, X86::FpCMOVNP
   };
   static const int SSE_CMOVTAB[] = {
     /*CMPEQ*/   0, /*CMPNEQ*/   4, /*missing*/  0, /*missing*/  0,


Index: llvm/lib/Target/X86/X86InstrInfo.td
diff -u llvm/lib/Target/X86/X86InstrInfo.td:1.215 llvm/lib/Target/X86/X86InstrInfo.td:1.216
--- llvm/lib/Target/X86/X86InstrInfo.td:1.215	Thu Jan 19 19:13:30 2006
+++ llvm/lib/Target/X86/X86InstrInfo.td	Fri Jan 20 20:55:41 2006
@@ -2862,10 +2862,10 @@
   def FpCMOVP  : FpI<(ops RFP:$dst, RFP:$src1, RFP:$src2), CondMovFP,
                      [(set RFP:$dst, (X86cmov RFP:$src1, RFP:$src2,
                                       X86_COND_P, STATUS))]>;
-  def FpCMOVAE : FpI<(ops RFP:$dst, RFP:$src1, RFP:$src2), CondMovFP,
+  def FpCMOVNB : FpI<(ops RFP:$dst, RFP:$src1, RFP:$src2), CondMovFP,
                      [(set RFP:$dst, (X86cmov RFP:$src1, RFP:$src2,
                                       X86_COND_AE, STATUS))]>;
-  def FpCMOVA  : FpI<(ops RFP:$dst, RFP:$src1, RFP:$src2), CondMovFP,
+  def FpCMOVNBE: FpI<(ops RFP:$dst, RFP:$src1, RFP:$src2), CondMovFP,
                      [(set RFP:$dst, (X86cmov RFP:$src1, RFP:$src2,
                                       X86_COND_A, STATUS))]>;
   def FpCMOVNE : FpI<(ops RFP:$dst, RFP:$src1, RFP:$src2), CondMovFP,
@@ -2884,10 +2884,10 @@
                   "fcmove {$op, %ST(0)|%ST(0), $op}">, DA;
 def FCMOVP  : FPI<0xD8, AddRegFrm, (ops RST:$op),
                   "fcmovu  {$op, %ST(0)|%ST(0), $op}">, DA;
-def FCMOVAE : FPI<0xC0, AddRegFrm, (ops RST:$op),
-                  "fcmovae {$op, %ST(0)|%ST(0), $op}">, DB;
-def FCMOVA  : FPI<0xD0, AddRegFrm, (ops RST:$op),
-                  "fcmova {$op, %ST(0)|%ST(0), $op}">, DB;
+def FCMOVNB : FPI<0xC0, AddRegFrm, (ops RST:$op),
+                  "fcmovnb {$op, %ST(0)|%ST(0), $op}">, DB;
+def FCMOVNBE  : FPI<0xD0, AddRegFrm, (ops RST:$op),
+                  "fcmovnbe {$op, %ST(0)|%ST(0), $op}">, DB;
 def FCMOVNE : FPI<0xC8, AddRegFrm, (ops RST:$op),
                   "fcmovne {$op, %ST(0)|%ST(0), $op}">, DB;
 def FCMOVNP : FPI<0xD8, AddRegFrm, (ops RST:$op),