6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-14 11:32:34 +00:00
Code Issues Projects Releases Wiki Activity

*** Huge: Make constantexprs be handled correctly, conservatively

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5923 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2003-04-25 02:51:46 +00:00
parent 46326d9cdf
commit eca8e8f111
3 changed files with 66 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
include/llvm/ConstantHandling.h
View File

@ -112,10 +112,13 @@ public:
// we just want to make sure to hit the cache instead of doing it indirectly,
// if possible...
//
static inline ConstRules *get(const Constant &V) {
return (ConstRules*)V.getType()->getOrCreateAnnotation(AID);
static inline ConstRules *get(const Constant &V1, const Constant &V2) {
if (isa<ConstantExpr>(V1) || isa<ConstantExpr>(V2))
return getConstantExprRules();
return (ConstRules*)V1.getType()->getOrCreateAnnotation(AID);
}
private:
static ConstRules *getConstantExprRules();
static Annotation *find(AnnotationID AID, const Annotable *Ty, void *);
ConstRules(const ConstRules &); // Do not implement
@ -126,60 +129,60 @@ private:
// Standard binary operators...
inline Constant *operator+(const Constant &V1, const Constant &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
return ConstRules::get(V1)->add(&V1, &V2);
return ConstRules::get(V1, V2)->add(&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)->sub(&V1, &V2);
return ConstRules::get(V1, V2)->sub(&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)->mul(&V1, &V2);
return ConstRules::get(V1, V2)->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);
return ConstRules::get(V1, V2)->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);
return ConstRules::get(V1, V2)->rem(&V1, &V2);
}
// Logical Operators...
inline Constant *operator&(const Constant &V1, const Constant &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
return ConstRules::get(V1)->op_and(&V1, &V2);
return ConstRules::get(V1, V2)->op_and(&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)->op_or(&V1, &V2);
return ConstRules::get(V1, V2)->op_or(&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)->op_xor(&V1, &V2);
return ConstRules::get(V1, V2)->op_xor(&V1, &V2);
}
// Shift Instructions...
inline Constant *operator<<(const Constant &V1, const Constant &V2) {
assert(V1.getType()->isInteger() && V2.getType() == Type::UByteTy);
return ConstRules::get(V1)->shl(&V1, &V2);
return ConstRules::get(V1, V2)->shl(&V1, &V2);
}
inline Constant *operator>>(const Constant &V1, const Constant &V2) {
assert(V1.getType()->isInteger() && V2.getType() == Type::UByteTy);
return ConstRules::get(V1)->shr(&V1, &V2);
return ConstRules::get(V1, V2)->shr(&V1, &V2);
}
inline ConstantBool *operator<(const Constant &V1,
const Constant &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
return ConstRules::get(V1)->lessthan(&V1, &V2);
return ConstRules::get(V1, V2)->lessthan(&V1, &V2);
}
@ -194,12 +197,16 @@ inline ConstantBool *operator>(const Constant &V1,
inline ConstantBool *operator>=(const Constant &V1,
const Constant &V2) {
return (V1 < V2)->inverted(); // !(V1 < V2)
if (ConstantBool *V = (V1 < V2))
return V->inverted(); // !(V1 < V2)
return 0;
}
inline ConstantBool *operator<=(const Constant &V1,
const Constant &V2) {
return (V1 > V2)->inverted(); // !(V1 > V2)
if (ConstantBool *V = (V1 > V2))
return V->inverted(); // !(V1 > V2)
return 0;
}

37
lib/VMCore/ConstantFold.h
View File

@ -112,10 +112,13 @@ public:
// we just want to make sure to hit the cache instead of doing it indirectly,
// if possible...
//
static inline ConstRules *get(const Constant &V) {
return (ConstRules*)V.getType()->getOrCreateAnnotation(AID);
static inline ConstRules *get(const Constant &V1, const Constant &V2) {
if (isa<ConstantExpr>(V1) || isa<ConstantExpr>(V2))
return getConstantExprRules();
return (ConstRules*)V1.getType()->getOrCreateAnnotation(AID);
}
private:
static ConstRules *getConstantExprRules();
static Annotation *find(AnnotationID AID, const Annotable *Ty, void *);
ConstRules(const ConstRules &); // Do not implement
@ -126,60 +129,60 @@ private:
// Standard binary operators...
inline Constant *operator+(const Constant &V1, const Constant &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
return ConstRules::get(V1)->add(&V1, &V2);
return ConstRules::get(V1, V2)->add(&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)->sub(&V1, &V2);
return ConstRules::get(V1, V2)->sub(&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)->mul(&V1, &V2);
return ConstRules::get(V1, V2)->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);
return ConstRules::get(V1, V2)->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);
return ConstRules::get(V1, V2)->rem(&V1, &V2);
}
// Logical Operators...
inline Constant *operator&(const Constant &V1, const Constant &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
return ConstRules::get(V1)->op_and(&V1, &V2);
return ConstRules::get(V1, V2)->op_and(&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)->op_or(&V1, &V2);
return ConstRules::get(V1, V2)->op_or(&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)->op_xor(&V1, &V2);
return ConstRules::get(V1, V2)->op_xor(&V1, &V2);
}
// Shift Instructions...
inline Constant *operator<<(const Constant &V1, const Constant &V2) {
assert(V1.getType()->isInteger() && V2.getType() == Type::UByteTy);
return ConstRules::get(V1)->shl(&V1, &V2);
return ConstRules::get(V1, V2)->shl(&V1, &V2);
}
inline Constant *operator>>(const Constant &V1, const Constant &V2) {
assert(V1.getType()->isInteger() && V2.getType() == Type::UByteTy);
return ConstRules::get(V1)->shr(&V1, &V2);
return ConstRules::get(V1, V2)->shr(&V1, &V2);
}
inline ConstantBool *operator<(const Constant &V1,
const Constant &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
return ConstRules::get(V1)->lessthan(&V1, &V2);
return ConstRules::get(V1, V2)->lessthan(&V1, &V2);
}
@ -194,12 +197,16 @@ inline ConstantBool *operator>(const Constant &V1,
inline ConstantBool *operator>=(const Constant &V1,
const Constant &V2) {
return (V1 < V2)->inverted(); // !(V1 < V2)
if (ConstantBool *V = (V1 < V2))
return V->inverted(); // !(V1 < V2)
return 0;
}
inline ConstantBool *operator<=(const Constant &V1,
const Constant &V2) {
return (V1 > V2)->inverted(); // !(V1 > V2)
if (ConstantBool *V = (V1 > V2))
return V->inverted(); // !(V1 > V2)
return 0;
}

37
lib/VMCore/ConstantFolding.h
View File

@ -112,10 +112,13 @@ public:
// we just want to make sure to hit the cache instead of doing it indirectly,
// if possible...
//
static inline ConstRules *get(const Constant &V) {
return (ConstRules*)V.getType()->getOrCreateAnnotation(AID);
static inline ConstRules *get(const Constant &V1, const Constant &V2) {
if (isa<ConstantExpr>(V1) || isa<ConstantExpr>(V2))
return getConstantExprRules();
return (ConstRules*)V1.getType()->getOrCreateAnnotation(AID);
}
private:
static ConstRules *getConstantExprRules();
static Annotation *find(AnnotationID AID, const Annotable *Ty, void *);
ConstRules(const ConstRules &); // Do not implement
@ -126,60 +129,60 @@ private:
// Standard binary operators...
inline Constant *operator+(const Constant &V1, const Constant &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
return ConstRules::get(V1)->add(&V1, &V2);
return ConstRules::get(V1, V2)->add(&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)->sub(&V1, &V2);
return ConstRules::get(V1, V2)->sub(&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)->mul(&V1, &V2);
return ConstRules::get(V1, V2)->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);
return ConstRules::get(V1, V2)->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);
return ConstRules::get(V1, V2)->rem(&V1, &V2);
}
// Logical Operators...
inline Constant *operator&(const Constant &V1, const Constant &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
return ConstRules::get(V1)->op_and(&V1, &V2);
return ConstRules::get(V1, V2)->op_and(&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)->op_or(&V1, &V2);
return ConstRules::get(V1, V2)->op_or(&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)->op_xor(&V1, &V2);
return ConstRules::get(V1, V2)->op_xor(&V1, &V2);
}
// Shift Instructions...
inline Constant *operator<<(const Constant &V1, const Constant &V2) {
assert(V1.getType()->isInteger() && V2.getType() == Type::UByteTy);
return ConstRules::get(V1)->shl(&V1, &V2);
return ConstRules::get(V1, V2)->shl(&V1, &V2);
}
inline Constant *operator>>(const Constant &V1, const Constant &V2) {
assert(V1.getType()->isInteger() && V2.getType() == Type::UByteTy);
return ConstRules::get(V1)->shr(&V1, &V2);
return ConstRules::get(V1, V2)->shr(&V1, &V2);
}
inline ConstantBool *operator<(const Constant &V1,
const Constant &V2) {
assert(V1.getType() == V2.getType() && "Constant types must be identical!");
return ConstRules::get(V1)->lessthan(&V1, &V2);
return ConstRules::get(V1, V2)->lessthan(&V1, &V2);
}
@ -194,12 +197,16 @@ inline ConstantBool *operator>(const Constant &V1,
inline ConstantBool *operator>=(const Constant &V1,
const Constant &V2) {
return (V1 < V2)->inverted(); // !(V1 < V2)
if (ConstantBool *V = (V1 < V2))
return V->inverted(); // !(V1 < V2)
return 0;
}
inline ConstantBool *operator<=(const Constant &V1,
const Constant &V2) {
return (V1 > V2)->inverted(); // !(V1 > V2)
if (ConstantBool *V = (V1 > V2))
return V->inverted(); // !(V1 > V2)
return 0;
}