From bdd15ad565d5881251f84a9fd13bf89f81d340ec Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 3 May 2002 21:40:37 +0000 Subject: [PATCH] Implement remainder git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2463 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/ConstantHandling.h | 24 +++++++++++++----------- lib/VMCore/ConstantFold.h | 24 +++++++++++++----------- lib/VMCore/ConstantFolding.h | 24 +++++++++++++----------- 3 files changed, 39 insertions(+), 33 deletions(-) diff --git a/include/llvm/ConstantHandling.h b/include/llvm/ConstantHandling.h index 14231cb6abf..ef0a810b401 100644 --- a/include/llvm/ConstantHandling.h +++ b/include/llvm/ConstantHandling.h @@ -67,14 +67,11 @@ public: virtual Constant *op_not(const Constant *V) const = 0; // Binary Operators... - virtual Constant *add(const Constant *V1, - const Constant *V2) const = 0; - virtual Constant *sub(const Constant *V1, - 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 Constant *add(const Constant *V1, const Constant *V2) const = 0; + virtual Constant *sub(const Constant *V1, 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 Constant *rem(const Constant *V1, const Constant *V2) const = 0; virtual ConstantBool *lessthan(const Constant *V1, const Constant *V2) const = 0; @@ -127,7 +124,7 @@ private : }; -inline Constant *operator!(const Constant &V) { +inline Constant *operator~(const Constant &V) { return ConstRules::get(V)->op_not(&V); } @@ -153,6 +150,11 @@ inline Constant *operator/(const Constant &V1, const Constant &V2) { return ConstRules::get(V1)->div(&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)->rem(&V1, &V2); +} + inline ConstantBool *operator<(const Constant &V1, const Constant &V2) { assert(V1.getType() == V2.getType() && "Constant types must be identical!"); @@ -192,8 +194,7 @@ inline Constant *ConstantFoldCastInstruction(const Constant *V, inline Constant *ConstantFoldUnaryInstruction(unsigned Opcode, const Constant *V) { switch (Opcode) { - case Instruction::Not: return !*V; - // TODO: Handle get element ptr instruction here in the future? GEP null? + case Instruction::Not: return ~*V; } return 0; } @@ -206,6 +207,7 @@ inline Constant *ConstantFoldBinaryInstruction(unsigned Opcode, case Instruction::Sub: return *V1 - *V2; case Instruction::Mul: return *V1 * *V2; case Instruction::Div: return *V1 / *V2; + case Instruction::Rem: return *V1 % *V2; case Instruction::SetEQ: return *V1 == *V2; case Instruction::SetNE: return *V1 != *V2; diff --git a/lib/VMCore/ConstantFold.h b/lib/VMCore/ConstantFold.h index 14231cb6abf..ef0a810b401 100644 --- a/lib/VMCore/ConstantFold.h +++ b/lib/VMCore/ConstantFold.h @@ -67,14 +67,11 @@ public: virtual Constant *op_not(const Constant *V) const = 0; // Binary Operators... - virtual Constant *add(const Constant *V1, - const Constant *V2) const = 0; - virtual Constant *sub(const Constant *V1, - 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 Constant *add(const Constant *V1, const Constant *V2) const = 0; + virtual Constant *sub(const Constant *V1, 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 Constant *rem(const Constant *V1, const Constant *V2) const = 0; virtual ConstantBool *lessthan(const Constant *V1, const Constant *V2) const = 0; @@ -127,7 +124,7 @@ private : }; -inline Constant *operator!(const Constant &V) { +inline Constant *operator~(const Constant &V) { return ConstRules::get(V)->op_not(&V); } @@ -153,6 +150,11 @@ inline Constant *operator/(const Constant &V1, const Constant &V2) { return ConstRules::get(V1)->div(&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)->rem(&V1, &V2); +} + inline ConstantBool *operator<(const Constant &V1, const Constant &V2) { assert(V1.getType() == V2.getType() && "Constant types must be identical!"); @@ -192,8 +194,7 @@ inline Constant *ConstantFoldCastInstruction(const Constant *V, inline Constant *ConstantFoldUnaryInstruction(unsigned Opcode, const Constant *V) { switch (Opcode) { - case Instruction::Not: return !*V; - // TODO: Handle get element ptr instruction here in the future? GEP null? + case Instruction::Not: return ~*V; } return 0; } @@ -206,6 +207,7 @@ inline Constant *ConstantFoldBinaryInstruction(unsigned Opcode, case Instruction::Sub: return *V1 - *V2; case Instruction::Mul: return *V1 * *V2; case Instruction::Div: return *V1 / *V2; + case Instruction::Rem: 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 14231cb6abf..ef0a810b401 100644 --- a/lib/VMCore/ConstantFolding.h +++ b/lib/VMCore/ConstantFolding.h @@ -67,14 +67,11 @@ public: virtual Constant *op_not(const Constant *V) const = 0; // Binary Operators... - virtual Constant *add(const Constant *V1, - const Constant *V2) const = 0; - virtual Constant *sub(const Constant *V1, - 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 Constant *add(const Constant *V1, const Constant *V2) const = 0; + virtual Constant *sub(const Constant *V1, 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 Constant *rem(const Constant *V1, const Constant *V2) const = 0; virtual ConstantBool *lessthan(const Constant *V1, const Constant *V2) const = 0; @@ -127,7 +124,7 @@ private : }; -inline Constant *operator!(const Constant &V) { +inline Constant *operator~(const Constant &V) { return ConstRules::get(V)->op_not(&V); } @@ -153,6 +150,11 @@ inline Constant *operator/(const Constant &V1, const Constant &V2) { return ConstRules::get(V1)->div(&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)->rem(&V1, &V2); +} + inline ConstantBool *operator<(const Constant &V1, const Constant &V2) { assert(V1.getType() == V2.getType() && "Constant types must be identical!"); @@ -192,8 +194,7 @@ inline Constant *ConstantFoldCastInstruction(const Constant *V, inline Constant *ConstantFoldUnaryInstruction(unsigned Opcode, const Constant *V) { switch (Opcode) { - case Instruction::Not: return !*V; - // TODO: Handle get element ptr instruction here in the future? GEP null? + case Instruction::Not: return ~*V; } return 0; } @@ -206,6 +207,7 @@ inline Constant *ConstantFoldBinaryInstruction(unsigned Opcode, case Instruction::Sub: return *V1 - *V2; case Instruction::Mul: return *V1 * *V2; case Instruction::Div: return *V1 / *V2; + case Instruction::Rem: return *V1 % *V2; case Instruction::SetEQ: return *V1 == *V2; case Instruction::SetNE: return *V1 != *V2;