Moved removeFile() and getUniqueFilename() into FileUtilities.

[oota-llvm.git] / include / llvm / Instruction.def

diff --git a/include/llvm/Instruction.def b/include/llvm/Instruction.def
index c84a465529c52567aea9599a0133e7fb7a3953ea..2b9c1a7a848e01857f1c206d499488e170f386f3 100644 (file)
--- a/include/llvm/Instruction.def
+++ b/include/llvm/Instruction.def
@@ -25,20 +25,6 @@
 #define LAST_TERM_INST(num)
 #endif
 
-#ifndef FIRST_UNARY_INST
-#define FIRST_UNARY_INST(num)
-#endif
-#ifndef HANDLE_UNARY_INST
-#ifndef HANDLE_INST
-#define HANDLE_UNARY_INST(num, opcode, Class)
-#else
-#define HANDLE_UNARY_INST(num, opcode, Class) HANDLE_INST(num, opcode, Class)
-#endif
-#endif
-#ifndef LAST_UNARY_INST
-#define LAST_UNARY_INST(num)
-#endif
-
 #ifndef FIRST_BINARY_INST
 #define FIRST_BINARY_INST(num)
 #endif
@@ -93,23 +79,18 @@ HANDLE_TERM_INST  ( 3, Switch, SwitchInst)
 HANDLE_TERM_INST  ( 4, Invoke, InvokeInst)
   LAST_TERM_INST  ( 4)
 
-// The single unary instruction... a binary inverse.
- FIRST_UNARY_INST ( 5)
-HANDLE_UNARY_INST ( 5, Not   , GenericBinaryInst)  // THIS IS WRONG.  *REMOVEME*
-  LAST_UNARY_INST ( 5)
-
 // Standard binary operators...
  FIRST_BINARY_INST( 6)
-HANDLE_BINARY_INST( 6, Add   , GenericBinaryInst)
-HANDLE_BINARY_INST( 7, Sub   , GenericBinaryInst)
-HANDLE_BINARY_INST( 8, Mul   , GenericBinaryInst)
-HANDLE_BINARY_INST( 9, Div   , GenericBinaryInst)
-HANDLE_BINARY_INST(10, Rem   , GenericBinaryInst)
+HANDLE_BINARY_INST( 6, Add   , BinaryOperator)
+HANDLE_BINARY_INST( 7, Sub   , BinaryOperator)
+HANDLE_BINARY_INST( 8, Mul   , BinaryOperator)
+HANDLE_BINARY_INST( 9, Div   , BinaryOperator)
+HANDLE_BINARY_INST(10, Rem   , BinaryOperator)
 
 // Logical operators...
-HANDLE_BINARY_INST(11, And   , GenericBinaryInst)
-HANDLE_BINARY_INST(12, Or    , GenericBinaryInst)
-HANDLE_BINARY_INST(13, Xor   , GenericBinaryInst)
+HANDLE_BINARY_INST(11, And   , BinaryOperator)
+HANDLE_BINARY_INST(12, Or    , BinaryOperator)
+HANDLE_BINARY_INST(13, Xor   , BinaryOperator)
 
 // Binary comparison operators...
 HANDLE_BINARY_INST(14, SetEQ , SetCondInst)
@@ -138,19 +119,16 @@ HANDLE_OTHER_INST(28, Call   , CallInst   )  // Call a function
 
 HANDLE_OTHER_INST(29, Shl    , ShiftInst  )  // Shift operations
 HANDLE_OTHER_INST(30, Shr    , ShiftInst  )
+HANDLE_OTHER_INST(31, VarArg , VarArgInst )  // va_arg instruction
 
-HANDLE_OTHER_INST(31, UserOp1, Instruction)  // May be used internally in a pass
-HANDLE_OTHER_INST(32, UserOp2, Instruction)
-  LAST_OTHER_INST(32)
+HANDLE_OTHER_INST(32, UserOp1, Instruction)  // May be used internally in a pass
+HANDLE_OTHER_INST(33, UserOp2, Instruction)
+  LAST_OTHER_INST(33)
 
 #undef  FIRST_TERM_INST
 #undef HANDLE_TERM_INST
 #undef   LAST_TERM_INST
 
-#undef  FIRST_UNARY_INST
-#undef HANDLE_UNARY_INST
-#undef   LAST_UNARY_INST
-
 #undef  FIRST_BINARY_INST
 #undef HANDLE_BINARY_INST
 #undef   LAST_BINARY_INST