Implement constant propogation of multiply and divide instructions!!

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

4 files changed, 41 insertions, 0 deletions

diff --git a/include/llvm/ConstantHandling.h b/include/llvm/ConstantHandling.h
index 261174577c..d0f50fac45 100644
--- a/include/llvm/ConstantHandling.h
+++ b/include/llvm/ConstantHandling.h
@@ -73,6 +73,8 @@ public:
                         const Constant *V2) const = 0;
   virtual Constant *mul(const Constant *V1, 
                         const Constant *V2) const = 0;
+  virtual Constant *div(const Constant *V1, 
+                        const Constant *V2) const = 0;
 
   virtual ConstantBool *lessthan(const Constant *V1, 
                                  const Constant *V2) const = 0;
@@ -146,6 +148,11 @@ inline Constant *operator*(const Constant &V1, const Constant &V2) {
   return ConstRules::get(V1)->mul(&V1, &V2);
 }
 
+inline Constant *operator/(const Constant &V1, const Constant &V2) {
+  assert(V1.getType() == V2.getType() && "Constant types must be identical!");
+  return ConstRules::get(V1)->div(&V1, &V2);
+}
+
 inline ConstantBool *operator<(const Constant &V1, 
                                const Constant &V2) {
   assert(V1.getType() == V2.getType() && "Constant types must be identical!");
@@ -197,6 +204,8 @@ inline Constant *ConstantFoldBinaryInstruction(unsigned Opcode,
   switch (Opcode) {
   case Instruction::Add:     return *V1 + *V2;
   case Instruction::Sub:     return *V1 - *V2;
+  case Instruction::Mul:     return *V1 * *V2;
+  case Instruction::Div:     return *V1 / *V2;
 
   case Instruction::SetEQ:   return *V1 == *V2;
   case Instruction::SetNE:   return *V1 != *V2;
diff --git a/lib/VMCore/ConstantFold.cpp b/lib/VMCore/ConstantFold.cpp
index 80374f339c..5a1cb745a2 100644
--- a/lib/VMCore/ConstantFold.cpp
+++ b/lib/VMCore/ConstantFold.cpp
@@ -47,6 +47,10 @@ class TemplateRules : public ConstRules {
                         const Constant *V2) const { 
     return SubClassName::Mul((const ArgType *)V1, (const ArgType *)V2);  
   }
+  virtual Constant *div(const Constant *V1, 
+                        const Constant *V2) const { 
+    return SubClassName::Div((const ArgType *)V1, (const ArgType *)V2);  
+  }
 
   virtual ConstantBool *lessthan(const Constant *V1, 
                                  const Constant *V2) const { 
@@ -107,6 +111,9 @@ class TemplateRules : public ConstRules {
   inline static Constant *Mul(const ArgType *V1, const ArgType *V2) {
     return 0;
   }
+  inline static Constant *Div(const ArgType *V1, const ArgType *V2) {
+    return 0;
+  }
   inline static ConstantBool *LessThan(const ArgType *V1, const ArgType *V2) {
     return 0;
   }
@@ -263,6 +270,13 @@ struct DirectRules
     return ConstantClass::get(*Ty, Result);
   }
 
+  inline static Constant *Div(const ConstantClass *V1, 
+                              const ConstantClass *V2) {
+    BuiltinType Result = (BuiltinType)V1->getValue() /
+                         (BuiltinType)V2->getValue();
+    return ConstantClass::get(*Ty, Result);
+  }
+
   inline static ConstantBool *LessThan(const ConstantClass *V1, 
                                        const ConstantClass *V2) {
     bool Result = (BuiltinType)V1->getValue() < (BuiltinType)V2->getValue();
diff --git a/lib/VMCore/ConstantFold.h b/lib/VMCore/ConstantFold.h
index 261174577c..d0f50fac45 100644
--- a/lib/VMCore/ConstantFold.h
+++ b/lib/VMCore/ConstantFold.h
@@ -73,6 +73,8 @@ public:
                         const Constant *V2) const = 0;
   virtual Constant *mul(const Constant *V1, 
                         const Constant *V2) const = 0;
+  virtual Constant *div(const Constant *V1, 
+                        const Constant *V2) const = 0;
 
   virtual ConstantBool *lessthan(const Constant *V1, 
                                  const Constant *V2) const = 0;
@@ -146,6 +148,11 @@ inline Constant *operator*(const Constant &V1, const Constant &V2) {
   return ConstRules::get(V1)->mul(&V1, &V2);
 }
 
+inline Constant *operator/(const Constant &V1, const Constant &V2) {
+  assert(V1.getType() == V2.getType() && "Constant types must be identical!");
+  return ConstRules::get(V1)->div(&V1, &V2);
+}
+
 inline ConstantBool *operator<(const Constant &V1, 
                                const Constant &V2) {
   assert(V1.getType() == V2.getType() && "Constant types must be identical!");
@@ -197,6 +204,8 @@ inline Constant *ConstantFoldBinaryInstruction(unsigned Opcode,
   switch (Opcode) {
   case Instruction::Add:     return *V1 + *V2;
   case Instruction::Sub:     return *V1 - *V2;
+  case Instruction::Mul:     return *V1 * *V2;
+  case Instruction::Div:     return *V1 / *V2;
 
   case Instruction::SetEQ:   return *V1 == *V2;
   case Instruction::SetNE:   return *V1 != *V2;
diff --git a/lib/VMCore/ConstantFolding.h b/lib/VMCore/ConstantFolding.h
index 261174577c..d0f50fac45 100644
--- a/lib/VMCore/ConstantFolding.h
+++ b/lib/VMCore/ConstantFolding.h
@@ -73,6 +73,8 @@ public:
                         const Constant *V2) const = 0;
   virtual Constant *mul(const Constant *V1, 
                         const Constant *V2) const = 0;
+  virtual Constant *div(const Constant *V1, 
+                        const Constant *V2) const = 0;
 
   virtual ConstantBool *lessthan(const Constant *V1, 
                                  const Constant *V2) const = 0;
@@ -146,6 +148,11 @@ inline Constant *operator*(const Constant &V1, const Constant &V2) {
   return ConstRules::get(V1)->mul(&V1, &V2);
 }
 
+inline Constant *operator/(const Constant &V1, const Constant &V2) {
+  assert(V1.getType() == V2.getType() && "Constant types must be identical!");
+  return ConstRules::get(V1)->div(&V1, &V2);
+}
+
 inline ConstantBool *operator<(const Constant &V1, 
                                const Constant &V2) {
   assert(V1.getType() == V2.getType() && "Constant types must be identical!");
@@ -197,6 +204,8 @@ inline Constant *ConstantFoldBinaryInstruction(unsigned Opcode,
   switch (Opcode) {
   case Instruction::Add:     return *V1 + *V2;
   case Instruction::Sub:     return *V1 - *V2;
+  case Instruction::Mul:     return *V1 * *V2;
+  case Instruction::Div:     return *V1 / *V2;
 
   case Instruction::SetEQ:   return *V1 == *V2;
   case Instruction::SetNE:   return *V1 != *V2;