Change to use the new GenericBinaryInst class. Support lots more operators.

llvm-svn: 92

1 files changed, 15 insertions, 8 deletions

diff --git a/llvm/lib/VMCore/iOperators.cpp b/llvm/lib/VMCore/iOperators.cpp
index d856a20d0a5..c1efb42e716 100644
--- a/llvm/lib/VMCore/iOperators.cpp
+++ b/llvm/lib/VMCore/iOperators.cpp
@@ -10,14 +10,21 @@
 BinaryOperator *BinaryOperator::create(unsigned Op, Value *S1, Value *S2,
 				       const string &Name) {
   switch (Op) {
-  case Add: return new AddInst(S1, S2, Name);
-  case Sub: return new SubInst(S1, S2, Name);
-  case SetLT:
-  case SetGT:
-  case SetLE:
-  case SetGE:
-  case SetEQ:
-  case SetNE:
+  // Standard binary operators...
+  case Add: return new GenericBinaryInst(Op, S1, S2, "add", Name);
+  case Sub: return new GenericBinaryInst(Op, S1, S2, "sub", Name);
+  case Mul: return new GenericBinaryInst(Op, S1, S2, "mul", Name);
+  case Div: return new GenericBinaryInst(Op, S1, S2, "div", Name);
+  case Rem: return new GenericBinaryInst(Op, S1, S2, "rem", Name);
+
+  // Logical operators...
+  case And: return new GenericBinaryInst(Op, S1, S2, "and", Name);
+  case Or : return new GenericBinaryInst(Op, S1, S2, "or", Name);
+  case Xor: return new GenericBinaryInst(Op, S1, S2, "xor", Name);
+
+  // Binary comparison operators...
+  case SetLT: case SetGT: case SetLE:
+  case SetGE: case SetEQ: case SetNE:
     return new SetCondInst((BinaryOps)Op, S1, S2, Name);
 
   default: