Merge System into Support.

[oota-llvm.git] / include / llvm / Target / TargetInstrDesc.h

diff --git a/include/llvm/Target/TargetInstrDesc.h b/include/llvm/Target/TargetInstrDesc.h
index ee1ac5ff5d88a601ea86602d6f7966bbd418545b..8823d5a4d17e43dee837f6ed329684f3452d6226 100644 (file)
--- a/include/llvm/Target/TargetInstrDesc.h
+++ b/include/llvm/Target/TargetInstrDesc.h
@@ -15,7 +15,7 @@
 #ifndef LLVM_TARGET_TARGETINSTRDESC_H
 #define LLVM_TARGET_TARGETINSTRDESC_H
 
-#include "llvm/System/DataTypes.h"
+#include "llvm/Support/DataTypes.h"
 
 namespace llvm {
 
@@ -99,18 +99,18 @@ namespace TID {
     HasOptionalDef,
     Return,
     Call,
-    ConditionalMove,
     Barrier,
     Terminator,
     Branch,
     IndirectBranch,
-    Predicable,
-    NotDuplicable,
     Compare,
+    MoveImm,
     DelaySlot,
     FoldableAsLoad,
     MayLoad,
     MayStore,
+    Predicable,
+    NotDuplicable,
     UnmodeledSideEffects,
     Commutable,
     ConvertibleTo3Addr,
@@ -353,10 +353,10 @@ public:
     return Flags & (1 << TID::Compare);
   }
   
-  /// isConditionalMove - Return true if this instruction can be considered a
-  /// conditional move, like CMOV on X86 or MOVCC on ARM.
-  bool isConditionalMove() const {
-    return Flags & (1 << TID::ConditionalMove);
+  /// isMoveImmediate - Return true if this instruction is a move immediate
+  /// (including conditional moves) instruction. 
+  bool isMoveImmediate() const {
+    return Flags & (1 << TID::MoveImm);
   }
   
   /// isNotDuplicable - Return true if this instruction cannot be safely