#define TRANSFORM_INTERNALS_H
#include "llvm/BasicBlock.h"
-#include "llvm/Instruction.h"
#include "llvm/Target/TargetData.h"
#include "llvm/DerivedTypes.h"
-#include "llvm/ConstPoolVals.h"
+#include "llvm/Constants.h"
#include <map>
#include <set>
//
extern const TargetData TD;
-static int getConstantValue(const ConstPoolInt *CPI) {
- if (const ConstPoolSInt *CSI = dyn_cast<ConstPoolSInt>(CPI))
+static inline int64_t getConstantValue(const ConstantInt *CPI) {
+ if (const ConstantSInt *CSI = dyn_cast<ConstantSInt>(CPI))
return CSI->getValue();
- return cast<ConstPoolUInt>(CPI)->getValue();
+ return (int64_t)cast<ConstantUInt>(CPI)->getValue();
}
-// isFirstClassType - Return true if a value of the specified type can be held
-// in a register.
-//
-static inline bool isFirstClassType(const Type *Ty) {
- return Ty->isPrimitiveType() || Ty->isPointerType();
-}
-
// getPointedToComposite - If the argument is a pointer type, and the pointed to
// value is a composite type, return the composite type, else return null.
//
static inline const CompositeType *getPointedToComposite(const Type *Ty) {
const PointerType *PT = dyn_cast<PointerType>(Ty);
- return PT ? dyn_cast<CompositeType>(PT->getValueType()) : 0;
+ return PT ? dyn_cast<CompositeType>(PT->getElementType()) : 0;
}
-
-// ReplaceInstWithValue - Replace all uses of an instruction (specified by BI)
-// with a value, then remove and delete the original instruction.
-//
-void ReplaceInstWithValue(BasicBlock::InstListType &BIL,
- BasicBlock::iterator &BI, Value *V);
-
-// ReplaceInstWithInst - Replace the instruction specified by BI with the
-// instruction specified by I. The original instruction is deleted and BI is
-// updated to point to the new instruction.
-//
-void ReplaceInstWithInst(BasicBlock::InstListType &BIL,
- BasicBlock::iterator &BI, Instruction *I);
-
-
// ConvertableToGEP - This function returns true if the specified value V is
// a valid index into a pointer of type Ty. If it is valid, Idx is filled in
// with the values that would be appropriate to make this a getelementptr
// If BI is nonnull, cast instructions are inserted as appropriate for the
// arguments of the getelementptr.
//
-const Type *ConvertableToGEP(const Type *Ty, Value *V, vector<Value*> &Indices,
+const Type *ConvertableToGEP(const Type *Ty, Value *V,
+ std::vector<Value*> &Indices,
BasicBlock::iterator *BI = 0);
-// ------------- Expression Conversion ---------------------
-
-typedef map<const Value*, const Type*> ValueTypeCache;
-
-struct ValueMapCache {
- // Operands mapped - Contains an entry if the first value (the user) has had
- // the second value (the operand) mapped already.
- //
- set<const User*> OperandsMapped;
-
- // Expression Map - Contains an entry from the old value to the new value of
- // an expression that has been converted over.
- //
- map<const Value *, Value *> ExprMap;
- typedef map<const Value *, Value *> ExprMapTy;
-};
-
-
-bool ExpressionConvertableToType(Value *V, const Type *Ty, ValueTypeCache &Map);
-Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC);
-
-// ValueConvertableToType - Return true if it is possible
-bool ValueConvertableToType(Value *V, const Type *Ty,
- ValueTypeCache &ConvertedTypes);
-
-void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC);
-
-
//===----------------------------------------------------------------------===//
// ValueHandle Class - Smart pointer that occupies a slot on the users USE list
// that prevents it from being destroyed. This "looks" like an Instruction
// with Opcode UserOp1.
//
+class ValueMapCache;
class ValueHandle : public Instruction {
- ValueHandle(const ValueHandle &); // DO NOT IMPLEMENT
ValueMapCache &Cache;
public:
ValueHandle(ValueMapCache &VMC, Value *V);
+ ValueHandle(const ValueHandle &);
~ValueHandle();
virtual Instruction *clone() const { abort(); return 0; }
return "ValueHandle";
}
+ inline bool operator<(const ValueHandle &VH) const {
+ return getOperand(0) < VH.getOperand(0);
+ }
+
// Methods for support type inquiry through isa, cast, and dyn_cast:
static inline bool classof(const ValueHandle *) { return true; }
static inline bool classof(const Instruction *I) {
}
};
+
+// ------------- Expression Conversion ---------------------
+
+typedef std::map<const Value*, const Type*> ValueTypeCache;
+
+struct ValueMapCache {
+ // Operands mapped - Contains an entry if the first value (the user) has had
+ // the second value (the operand) mapped already.
+ //
+ std::set<const User*> OperandsMapped;
+
+ // Expression Map - Contains an entry from the old value to the new value of
+ // an expression that has been converted over.
+ //
+ std::map<const Value *, Value *> ExprMap;
+ typedef std::map<const Value *, Value *> ExprMapTy;
+
+ // Cast Map - Cast instructions can have their source and destination values
+ // changed independantly for each part. Because of this, our old naive
+ // implementation would create a TWO new cast instructions, which would cause
+ // all kinds of problems. Here we keep track of the newly allocated casts, so
+ // that we only create one for a particular instruction.
+ //
+ std::set<ValueHandle> NewCasts;
+};
+
+
+bool ExpressionConvertableToType(Value *V, const Type *Ty, ValueTypeCache &Map);
+Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC);
+
+// ValueConvertableToType - Return true if it is possible
+bool ValueConvertableToType(Value *V, const Type *Ty,
+ ValueTypeCache &ConvertedTypes);
+
+void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC);
+
+
// getStructOffsetType - Return a vector of offsets that are to be used to index
// into the specified struct type to get as close as possible to index as we
// can. Note that it is possible that we cannot get exactly to Offset, in which
// false if you want a leaf
//
const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
- vector<Value*> &Offsets,
+ std::vector<Value*> &Offsets,
bool StopEarly = true);
#endif