6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-25 13:24:46 +00:00
Code Issues Projects Releases Wiki Activity

Make the levelraise pass be well behaved w.r.t the TargetData that the current

Browse Source 
PassMAnager provides.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5896 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2003-04-24 18:25:27 +00:00
parent ad80a46caa
commit 16125fb749
4 changed files with 126 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

132
lib/Transforms/ExprTypeConvert.cpp
View File

@@ -18,10 +18,11 @@
using std::cerr; using std::cerr;
static bool OperandConvertableToType(User *U, Value *V, const Type *Ty, static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
ValueTypeCache &ConvertedTypes); ValueTypeCache &ConvertedTypes,
const TargetData &TD);
static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal, static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
ValueMapCache &VMC); ValueMapCache &VMC, const TargetData &TD);
// Peephole Malloc instructions: we take a look at the use chain of the // Peephole Malloc instructions: we take a look at the use chain of the
// malloc instruction, and try to find out if the following conditions hold: // malloc instruction, and try to find out if the following conditions hold:
@@ -35,7 +36,8 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
// element. TODO: This comment is out of date WRT arrays // element. TODO: This comment is out of date WRT arrays
// //
static bool MallocConvertableToType(MallocInst *MI, const Type *Ty, static bool MallocConvertableToType(MallocInst *MI, const Type *Ty,
ValueTypeCache &CTMap) { ValueTypeCache &CTMap,
const TargetData &TD) {
if (!isa<PointerType>(Ty)) return false; // Malloc always returns pointers if (!isa<PointerType>(Ty)) return false; // Malloc always returns pointers
// Deal with the type to allocate, not the pointer type... // Deal with the type to allocate, not the pointer type...
@@ -73,7 +75,8 @@ static bool MallocConvertableToType(MallocInst *MI, const Type *Ty,
static Instruction *ConvertMallocToType(MallocInst *MI, const Type *Ty, static Instruction *ConvertMallocToType(MallocInst *MI, const Type *Ty,
const std::string &Name, const std::string &Name,
ValueMapCache &VMC){ ValueMapCache &VMC,
const TargetData &TD){
BasicBlock *BB = MI->getParent(); BasicBlock *BB = MI->getParent();
BasicBlock::iterator It = BB->end(); BasicBlock::iterator It = BB->end();
@@ -131,7 +134,7 @@ static Instruction *ConvertMallocToType(MallocInst *MI, const Type *Ty,
// ExpressionConvertableToType - Return true if it is possible // ExpressionConvertableToType - Return true if it is possible
bool ExpressionConvertableToType(Value *V, const Type *Ty, bool ExpressionConvertableToType(Value *V, const Type *Ty,
ValueTypeCache &CTMap) { ValueTypeCache &CTMap, const TargetData &TD) {
// Expression type must be holdable in a register. // Expression type must be holdable in a register.
if (!Ty->isFirstClassType()) if (!Ty->isFirstClassType())
return false; return false;
@@ -172,8 +175,8 @@ bool ExpressionConvertableToType(Value *V, const Type *Ty,
case Instruction::Add: case Instruction::Add:
case Instruction::Sub: case Instruction::Sub:
if (!Ty->isInteger() && !Ty->isFloatingPoint()) return false; if (!Ty->isInteger() && !Ty->isFloatingPoint()) return false;
if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap) || if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap, TD) ||
!ExpressionConvertableToType(I->getOperand(1), Ty, CTMap)) !ExpressionConvertableToType(I->getOperand(1), Ty, CTMap, TD))
return false; return false;
break; break;
case Instruction::Shr: case Instruction::Shr:
@@ -182,27 +185,27 @@ bool ExpressionConvertableToType(Value *V, const Type *Ty,
// FALL THROUGH // FALL THROUGH
case Instruction::Shl: case Instruction::Shl:
if (!Ty->isInteger()) return false; if (!Ty->isInteger()) return false;
if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap)) if (!ExpressionConvertableToType(I->getOperand(0), Ty, CTMap, TD))
return false; return false;
break; break;
case Instruction::Load: { case Instruction::Load: {
LoadInst *LI = cast<LoadInst>(I); LoadInst *LI = cast<LoadInst>(I);
if (!ExpressionConvertableToType(LI->getPointerOperand(), if (!ExpressionConvertableToType(LI->getPointerOperand(),
PointerType::get(Ty), CTMap)) PointerType::get(Ty), CTMap, TD))
return false; return false;
break; break;
} }
case Instruction::PHINode: { case Instruction::PHINode: {
PHINode *PN = cast<PHINode>(I); PHINode *PN = cast<PHINode>(I);
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i) for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap)) if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap, TD))
return false; return false;
break; break;
} }
case Instruction::Malloc: case Instruction::Malloc:
if (!MallocConvertableToType(cast<MallocInst>(I), Ty, CTMap)) if (!MallocConvertableToType(cast<MallocInst>(I), Ty, CTMap, TD))
return false; return false;
break; break;
@@ -258,10 +261,10 @@ bool ExpressionConvertableToType(Value *V, const Type *Ty,
// the appropriate size... if so, allow it. // the appropriate size... if so, allow it.
// //
std::vector<Value*> Indices; std::vector<Value*> Indices;
const Type *ElTy = ConvertableToGEP(PTy, I->getOperand(1), Indices); const Type *ElTy = ConvertableToGEP(PTy, I->getOperand(1), Indices, TD);
if (ElTy == PVTy) { if (ElTy == PVTy) {
if (!ExpressionConvertableToType(I->getOperand(0), if (!ExpressionConvertableToType(I->getOperand(0),
PointerType::get(ElTy), CTMap)) PointerType::get(ElTy), CTMap, TD))
return false; // Can't continue, ExConToTy might have polluted set! return false; // Can't continue, ExConToTy might have polluted set!
break; break;
} }
@@ -278,7 +281,7 @@ bool ExpressionConvertableToType(Value *V, const Type *Ty,
TD.getTypeSize(PTy->getElementType()) == TD.getTypeSize(PTy->getElementType()) ==
TD.getTypeSize(GEP->getType()->getElementType())) { TD.getTypeSize(GEP->getType()->getElementType())) {
const PointerType *NewSrcTy = PointerType::get(PVTy); const PointerType *NewSrcTy = PointerType::get(PVTy);
if (!ExpressionConvertableToType(I->getOperand(0), NewSrcTy, CTMap)) if (!ExpressionConvertableToType(I->getOperand(0), NewSrcTy, CTMap, TD))
return false; return false;
break; break;
} }
@@ -300,7 +303,7 @@ bool ExpressionConvertableToType(Value *V, const Type *Ty,
const FunctionType *NewTy = const FunctionType *NewTy =
FunctionType::get(Ty, ArgTys, FT->isVarArg()); FunctionType::get(Ty, ArgTys, FT->isVarArg());
if (!ExpressionConvertableToType(I->getOperand(0), if (!ExpressionConvertableToType(I->getOperand(0),
PointerType::get(NewTy), CTMap)) PointerType::get(NewTy), CTMap, TD))
return false; return false;
break; break;
} }
@@ -313,14 +316,15 @@ bool ExpressionConvertableToType(Value *V, const Type *Ty,
// recursion. // recursion.
// //
for (Value::use_iterator It = I->use_begin(), E = I->use_end(); It != E; ++It) for (Value::use_iterator It = I->use_begin(), E = I->use_end(); It != E; ++It)
if (!OperandConvertableToType(*It, I, Ty, CTMap)) if (!OperandConvertableToType(*It, I, Ty, CTMap, TD))
return false; return false;
return true; return true;
} }
Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) { Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
const TargetData &TD) {
if (V->getType() == Ty) return V; // Already where we need to be? if (V->getType() == Ty) return V; // Already where we need to be?
ValueMapCache::ExprMapTy::iterator VMCI = VMC.ExprMap.find(V); ValueMapCache::ExprMapTy::iterator VMCI = VMC.ExprMap.find(V);
@@ -373,8 +377,8 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
Dummy, Dummy, Name); Dummy, Dummy, Name);
VMC.ExprMap[I] = Res; // Add node to expression eagerly VMC.ExprMap[I] = Res; // Add node to expression eagerly
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Ty, VMC)); Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Ty, VMC, TD));
Res->setOperand(1, ConvertExpressionToType(I->getOperand(1), Ty, VMC)); Res->setOperand(1, ConvertExpressionToType(I->getOperand(1), Ty, VMC, TD));
break; break;
case Instruction::Shl: case Instruction::Shl:
@@ -382,7 +386,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
Res = new ShiftInst(cast<ShiftInst>(I)->getOpcode(), Dummy, Res = new ShiftInst(cast<ShiftInst>(I)->getOpcode(), Dummy,
I->getOperand(1), Name); I->getOperand(1), Name);
VMC.ExprMap[I] = Res; VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Ty, VMC)); Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Ty, VMC, TD));
break; break;
case Instruction::Load: { case Instruction::Load: {
@@ -391,7 +395,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
Res = new LoadInst(Constant::getNullValue(PointerType::get(Ty)), Name); Res = new LoadInst(Constant::getNullValue(PointerType::get(Ty)), Name);
VMC.ExprMap[I] = Res; VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(LI->getPointerOperand(), Res->setOperand(0, ConvertExpressionToType(LI->getPointerOperand(),
PointerType::get(Ty), VMC)); PointerType::get(Ty), VMC, TD));
assert(Res->getOperand(0)->getType() == PointerType::get(Ty)); assert(Res->getOperand(0)->getType() == PointerType::get(Ty));
assert(Ty == Res->getType()); assert(Ty == Res->getType());
assert(Res->getType()->isFirstClassType() && "Load of structure or array!"); assert(Res->getType()->isFirstClassType() && "Load of structure or array!");
@@ -408,7 +412,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
Value *OldVal = OldPN->getIncomingValue(0); Value *OldVal = OldPN->getIncomingValue(0);
ValueHandle OldValHandle(VMC, OldVal); ValueHandle OldValHandle(VMC, OldVal);
OldPN->removeIncomingValue(BB, false); OldPN->removeIncomingValue(BB, false);
Value *V = ConvertExpressionToType(OldVal, Ty, VMC); Value *V = ConvertExpressionToType(OldVal, Ty, VMC, TD);
NewPN->addIncoming(V, BB); NewPN->addIncoming(V, BB);
} }
Res = NewPN; Res = NewPN;
@@ -416,7 +420,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
} }
case Instruction::Malloc: { case Instruction::Malloc: {
Res = ConvertMallocToType(cast<MallocInst>(I), Ty, Name, VMC); Res = ConvertMallocToType(cast<MallocInst>(I), Ty, Name, VMC, TD);
break; break;
} }
@@ -468,14 +472,14 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
// //
std::vector<Value*> Indices; std::vector<Value*> Indices;
const Type *ElTy = ConvertableToGEP(NewSrcTy, I->getOperand(1), const Type *ElTy = ConvertableToGEP(NewSrcTy, I->getOperand(1),
Indices, &It); Indices, TD, &It);
if (ElTy) { if (ElTy) {
assert(ElTy == PVTy && "Internal error, setup wrong!"); assert(ElTy == PVTy && "Internal error, setup wrong!");
Res = new GetElementPtrInst(Constant::getNullValue(NewSrcTy), Res = new GetElementPtrInst(Constant::getNullValue(NewSrcTy),
Indices, Name); Indices, Name);
VMC.ExprMap[I] = Res; VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
NewSrcTy, VMC)); NewSrcTy, VMC, TD));
} }
} }
@@ -491,7 +495,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
Indices, Name); Indices, Name);
VMC.ExprMap[I] = Res; VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
NewSrcTy, VMC)); NewSrcTy, VMC, TD));
} }
@@ -519,7 +523,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
std::vector<Value*>(I->op_begin()+1, I->op_end()), std::vector<Value*>(I->op_begin()+1, I->op_end()),
Name); Name);
VMC.ExprMap[I] = Res; VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), NewPTy, VMC)); Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),NewPTy,VMC,TD));
break; break;
} }
default: default:
@@ -541,7 +545,7 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
unsigned NumUses = I->use_size(); unsigned NumUses = I->use_size();
for (unsigned It = 0; It < NumUses; ) { for (unsigned It = 0; It < NumUses; ) {
unsigned OldSize = NumUses; unsigned OldSize = NumUses;
ConvertOperandToType(*(I->use_begin()+It), I, Res, VMC); ConvertOperandToType(*(I->use_begin()+It), I, Res, VMC, TD);
NumUses = I->use_size(); NumUses = I->use_size();
if (NumUses == OldSize) ++It; if (NumUses == OldSize) ++It;
} }
@@ -556,7 +560,8 @@ Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC) {
// ValueConvertableToType - Return true if it is possible // ValueConvertableToType - Return true if it is possible
bool ValueConvertableToType(Value *V, const Type *Ty, bool ValueConvertableToType(Value *V, const Type *Ty,
ValueTypeCache &ConvertedTypes) { ValueTypeCache &ConvertedTypes,
const TargetData &TD) {
ValueTypeCache::iterator I = ConvertedTypes.find(V); ValueTypeCache::iterator I = ConvertedTypes.find(V);
if (I != ConvertedTypes.end()) return I->second == Ty; if (I != ConvertedTypes.end()) return I->second == Ty;
ConvertedTypes[V] = Ty; ConvertedTypes[V] = Ty;
@@ -566,7 +571,7 @@ bool ValueConvertableToType(Value *V, const Type *Ty,
// //
if (V->getType() != Ty) { if (V->getType() != Ty) {
for (Value::use_iterator I = V->use_begin(), E = V->use_end(); I != E; ++I) for (Value::use_iterator I = V->use_begin(), E = V->use_end(); I != E; ++I)
if (!OperandConvertableToType(*I, V, Ty, ConvertedTypes)) if (!OperandConvertableToType(*I, V, Ty, ConvertedTypes, TD))
return false; return false;
} }
@@ -584,7 +589,8 @@ bool ValueConvertableToType(Value *V, const Type *Ty,
// the expression, not the static current type. // the expression, not the static current type.
// //
static bool OperandConvertableToType(User *U, Value *V, const Type *Ty, static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
ValueTypeCache &CTMap) { ValueTypeCache &CTMap,
const TargetData &TD) {
// if (V->getType() == Ty) return true; // Operand already the right type? // if (V->getType() == Ty) return true; // Operand already the right type?
// Expression type must be holdable in a register. // Expression type must be holdable in a register.
@@ -630,11 +636,11 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
if (isa<PointerType>(Ty)) { if (isa<PointerType>(Ty)) {
Value *IndexVal = I->getOperand(V == I->getOperand(0) ? 1 : 0); Value *IndexVal = I->getOperand(V == I->getOperand(0) ? 1 : 0);
std::vector<Value*> Indices; std::vector<Value*> Indices;
if (const Type *ETy = ConvertableToGEP(Ty, IndexVal, Indices)) { if (const Type *ETy = ConvertableToGEP(Ty, IndexVal, Indices, TD)) {
const Type *RetTy = PointerType::get(ETy); const Type *RetTy = PointerType::get(ETy);
// Only successful if we can convert this type to the required type // Only successful if we can convert this type to the required type
if (ValueConvertableToType(I, RetTy, CTMap)) { if (ValueConvertableToType(I, RetTy, CTMap, TD)) {
CTMap[I] = RetTy; CTMap[I] = RetTy;
return true; return true;
} }
@@ -648,13 +654,13 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
if (!Ty->isInteger() && !Ty->isFloatingPoint()) return false; if (!Ty->isInteger() && !Ty->isFloatingPoint()) return false;
Value *OtherOp = I->getOperand((V == I->getOperand(0)) ? 1 : 0); Value *OtherOp = I->getOperand((V == I->getOperand(0)) ? 1 : 0);
return ValueConvertableToType(I, Ty, CTMap) && return ValueConvertableToType(I, Ty, CTMap, TD) &&
ExpressionConvertableToType(OtherOp, Ty, CTMap); ExpressionConvertableToType(OtherOp, Ty, CTMap, TD);
} }
case Instruction::SetEQ: case Instruction::SetEQ:
case Instruction::SetNE: { case Instruction::SetNE: {
Value *OtherOp = I->getOperand((V == I->getOperand(0)) ? 1 : 0); Value *OtherOp = I->getOperand((V == I->getOperand(0)) ? 1 : 0);
return ExpressionConvertableToType(OtherOp, Ty, CTMap); return ExpressionConvertableToType(OtherOp, Ty, CTMap, TD);
} }
case Instruction::Shr: case Instruction::Shr:
if (Ty->isSigned() != V->getType()->isSigned()) return false; if (Ty->isSigned() != V->getType()->isSigned()) return false;
@@ -662,7 +668,7 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
case Instruction::Shl: case Instruction::Shl:
if (I->getOperand(1) == V) return false; // Cannot change shift amount type if (I->getOperand(1) == V) return false; // Cannot change shift amount type
if (!Ty->isInteger()) return false; if (!Ty->isInteger()) return false;
return ValueConvertableToType(I, Ty, CTMap); return ValueConvertableToType(I, Ty, CTMap, TD);
case Instruction::Free: case Instruction::Free:
assert(I->getOperand(0) == V); assert(I->getOperand(0) == V);
@@ -681,7 +687,7 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
if (const CompositeType *CT = dyn_cast<CompositeType>(LoadedTy)) { if (const CompositeType *CT = dyn_cast<CompositeType>(LoadedTy)) {
unsigned Offset = 0; // No offset, get first leaf. unsigned Offset = 0; // No offset, get first leaf.
std::vector<Value*> Indices; // Discarded... std::vector<Value*> Indices; // Discarded...
LoadedTy = getStructOffsetType(CT, Offset, Indices, false); LoadedTy = getStructOffsetType(CT, Offset, Indices, TD, false);
assert(Offset == 0 && "Offset changed from zero???"); assert(Offset == 0 && "Offset changed from zero???");
} }
@@ -691,7 +697,7 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
if (TD.getTypeSize(LoadedTy) != TD.getTypeSize(LI->getType())) if (TD.getTypeSize(LoadedTy) != TD.getTypeSize(LI->getType()))
return false; return false;
return ValueConvertableToType(LI, LoadedTy, CTMap); return ValueConvertableToType(LI, LoadedTy, CTMap, TD);
} }
return false; return false;
@@ -722,7 +728,7 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
if (const StructType *SElTy = dyn_cast<StructType>(ElTy)) { if (const StructType *SElTy = dyn_cast<StructType>(ElTy)) {
unsigned Offset = 0; unsigned Offset = 0;
std::vector<Value*> Indices; std::vector<Value*> Indices;
ElTy = getStructOffsetType(ElTy, Offset, Indices, false); ElTy = getStructOffsetType(ElTy, Offset, Indices, TD, false);
assert(Offset == 0 && "Offset changed!"); assert(Offset == 0 && "Offset changed!");
if (ElTy == 0) // Element at offset zero in struct doesn't exist! if (ElTy == 0) // Element at offset zero in struct doesn't exist!
return false; // Can only happen for {}* return false; // Can only happen for {}*
@@ -738,7 +744,7 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
// Can convert the store if we can convert the pointer operand to match // Can convert the store if we can convert the pointer operand to match
// the new value type... // the new value type...
return ExpressionConvertableToType(I->getOperand(1), PointerType::get(Ty), return ExpressionConvertableToType(I->getOperand(1), PointerType::get(Ty),
CTMap); CTMap, TD);
} else if (const PointerType *PT = dyn_cast<PointerType>(Ty)) { } else if (const PointerType *PT = dyn_cast<PointerType>(Ty)) {
const Type *ElTy = PT->getElementType(); const Type *ElTy = PT->getElementType();
assert(V == I->getOperand(1)); assert(V == I->getOperand(1));
@@ -749,7 +755,7 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
// //
unsigned Offset = 0; unsigned Offset = 0;
std::vector<Value*> Indices; std::vector<Value*> Indices;
ElTy = getStructOffsetType(ElTy, Offset, Indices, false); ElTy = getStructOffsetType(ElTy, Offset, Indices, TD, false);
assert(Offset == 0 && "Offset changed!"); assert(Offset == 0 && "Offset changed!");
if (ElTy == 0) // Element at offset zero in struct doesn't exist! if (ElTy == 0) // Element at offset zero in struct doesn't exist!
return false; // Can only happen for {}* return false; // Can only happen for {}*
@@ -761,7 +767,7 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
return false; return false;
// Can convert store if the incoming value is convertable... // Can convert store if the incoming value is convertable...
return ExpressionConvertableToType(I->getOperand(0), ElTy, CTMap); return ExpressionConvertableToType(I->getOperand(0), ElTy, CTMap, TD);
} }
return false; return false;
} }
@@ -795,20 +801,20 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
// be converted to the appropriate size... if so, allow it. // be converted to the appropriate size... if so, allow it.
// //
std::vector<Value*> Indices; std::vector<Value*> Indices;
const Type *ElTy = ConvertableToGEP(Ty, Index, Indices); const Type *ElTy = ConvertableToGEP(Ty, Index, Indices, TD);
delete TempScale; // Free our temporary multiply if we made it delete TempScale; // Free our temporary multiply if we made it
if (ElTy == 0) return false; // Cannot make conversion... if (ElTy == 0) return false; // Cannot make conversion...
return ValueConvertableToType(I, PointerType::get(ElTy), CTMap); return ValueConvertableToType(I, PointerType::get(ElTy), CTMap, TD);
} }
return false; return false;
case Instruction::PHINode: { case Instruction::PHINode: {
PHINode *PN = cast<PHINode>(I); PHINode *PN = cast<PHINode>(I);
for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i) for (unsigned i = 0; i < PN->getNumIncomingValues(); ++i)
if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap)) if (!ExpressionConvertableToType(PN->getIncomingValue(i), Ty, CTMap, TD))
return false; return false;
return ValueConvertableToType(PN, Ty, CTMap); return ValueConvertableToType(PN, Ty, CTMap, TD);
} }
case Instruction::Call: { case Instruction::Call: {
@@ -859,7 +865,7 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
// converted. We succeed if we can change the return type if // converted. We succeed if we can change the return type if
// neccesary... // neccesary...
// //
return ValueConvertableToType(I, FTy->getReturnType(), CTMap); return ValueConvertableToType(I, FTy->getReturnType(), CTMap, TD);
} }
const PointerType *MPtr = cast<PointerType>(I->getOperand(0)->getType()); const PointerType *MPtr = cast<PointerType>(I->getOperand(0)->getType());
@@ -879,13 +885,14 @@ static bool OperandConvertableToType(User *U, Value *V, const Type *Ty,
} }
void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC) { void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC,
const TargetData &TD) {
ValueHandle VH(VMC, V); ValueHandle VH(VMC, V);
unsigned NumUses = V->use_size(); unsigned NumUses = V->use_size();
for (unsigned It = 0; It < NumUses; ) { for (unsigned It = 0; It < NumUses; ) {
unsigned OldSize = NumUses; unsigned OldSize = NumUses;
ConvertOperandToType(*(V->use_begin()+It), V, NewVal, VMC); ConvertOperandToType(*(V->use_begin()+It), V, NewVal, VMC, TD);
NumUses = V->use_size(); NumUses = V->use_size();
if (NumUses == OldSize) ++It; if (NumUses == OldSize) ++It;
} }
@@ -894,7 +901,7 @@ void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC) {
static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal, static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
ValueMapCache &VMC) { ValueMapCache &VMC, const TargetData &TD) {
if (isa<ValueHandle>(U)) return; // Valuehandles don't let go of operands... if (isa<ValueHandle>(U)) return; // Valuehandles don't let go of operands...
if (VMC.OperandsMapped.count(U)) return; if (VMC.OperandsMapped.count(U)) return;
@@ -944,7 +951,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
std::vector<Value*> Indices; std::vector<Value*> Indices;
BasicBlock::iterator It = I; BasicBlock::iterator It = I;
if (const Type *ETy = ConvertableToGEP(NewTy, IndexVal, Indices, &It)) { if (const Type *ETy = ConvertableToGEP(NewTy, IndexVal, Indices, TD,&It)){
// If successful, convert the add to a GEP // If successful, convert the add to a GEP
//const Type *RetTy = PointerType::get(ETy); //const Type *RetTy = PointerType::get(ETy);
// First operand is actually the given pointer... // First operand is actually the given pointer...
@@ -965,7 +972,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
unsigned OtherIdx = (OldVal == I->getOperand(0)) ? 1 : 0; unsigned OtherIdx = (OldVal == I->getOperand(0)) ? 1 : 0;
Value *OtherOp = I->getOperand(OtherIdx); Value *OtherOp = I->getOperand(OtherIdx);
Value *NewOther = ConvertExpressionToType(OtherOp, NewTy, VMC); Value *NewOther = ConvertExpressionToType(OtherOp, NewTy, VMC, TD);
Res->setOperand(OtherIdx, NewOther); Res->setOperand(OtherIdx, NewOther);
Res->setOperand(!OtherIdx, NewVal); Res->setOperand(!OtherIdx, NewVal);
@@ -996,7 +1003,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
Indices.push_back(ConstantSInt::get(Type::LongTy, 0)); Indices.push_back(ConstantSInt::get(Type::LongTy, 0));
unsigned Offset = 0; // No offset, get first leaf. unsigned Offset = 0; // No offset, get first leaf.
LoadedTy = getStructOffsetType(CT, Offset, Indices, false); LoadedTy = getStructOffsetType(CT, Offset, Indices, TD, false);
assert(LoadedTy->isFirstClassType()); assert(LoadedTy->isFirstClassType());
if (Indices.size() != 1) { // Do not generate load X, 0 if (Indices.size() != 1) { // Do not generate load X, 0
@@ -1032,7 +1039,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
Indices.push_back(Constant::getNullValue(Type::LongTy)); Indices.push_back(Constant::getNullValue(Type::LongTy));
unsigned Offset = 0; unsigned Offset = 0;
const Type *Ty = getStructOffsetType(ElTy, Offset, Indices, false); const Type *Ty = getStructOffsetType(ElTy, Offset, Indices, TD,false);
assert(Offset == 0 && "Offset changed!"); assert(Offset == 0 && "Offset changed!");
assert(NewTy == Ty && "Did not convert to correct type!"); assert(NewTy == Ty && "Did not convert to correct type!");
@@ -1049,7 +1056,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
Res = new StoreInst(NewVal, Constant::getNullValue(NewPT)); Res = new StoreInst(NewVal, Constant::getNullValue(NewPT));
VMC.ExprMap[I] = Res; VMC.ExprMap[I] = Res;
Res->setOperand(1, ConvertExpressionToType(I->getOperand(1), Res->setOperand(1, ConvertExpressionToType(I->getOperand(1),
NewPT, VMC)); NewPT, VMC, TD));
} }
} else { // Replace the source pointer } else { // Replace the source pointer
const Type *ValTy = cast<PointerType>(NewTy)->getElementType(); const Type *ValTy = cast<PointerType>(NewTy)->getElementType();
@@ -1061,7 +1068,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
Indices.push_back(Constant::getNullValue(Type::LongTy)); Indices.push_back(Constant::getNullValue(Type::LongTy));
unsigned Offset = 0; unsigned Offset = 0;
ValTy = getStructOffsetType(ValTy, Offset, Indices, false); ValTy = getStructOffsetType(ValTy, Offset, Indices, TD, false);
assert(Offset == 0 && ValTy); assert(Offset == 0 && ValTy);
@@ -1072,7 +1079,8 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
Res = new StoreInst(Constant::getNullValue(ValTy), SrcPtr); Res = new StoreInst(Constant::getNullValue(ValTy), SrcPtr);
VMC.ExprMap[I] = Res; VMC.ExprMap[I] = Res;
Res->setOperand(0, ConvertExpressionToType(I->getOperand(0), ValTy, VMC)); Res->setOperand(0, ConvertExpressionToType(I->getOperand(0),
ValTy, VMC, TD));
} }
break; break;
} }
@@ -1097,7 +1105,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
// Perform the conversion now... // Perform the conversion now...
// //
std::vector<Value*> Indices; std::vector<Value*> Indices;
const Type *ElTy = ConvertableToGEP(NewVal->getType(), Index, Indices, &It); const Type *ElTy = ConvertableToGEP(NewVal->getType(),Index,Indices,TD,&It);
assert(ElTy != 0 && "GEP Conversion Failure!"); assert(ElTy != 0 && "GEP Conversion Failure!");
Res = new GetElementPtrInst(NewVal, Indices, Name); Res = new GetElementPtrInst(NewVal, Indices, Name);
assert(Res->getType() == PointerType::get(ElTy) && assert(Res->getType() == PointerType::get(ElTy) &&
@@ -1115,7 +1123,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
// //
std::vector<Value*> Indices; std::vector<Value*> Indices;
const Type *ElTy = ConvertableToGEP(NewVal->getType(), I->getOperand(1), const Type *ElTy = ConvertableToGEP(NewVal->getType(), I->getOperand(1),
Indices, &It); Indices, TD, &It);
assert(ElTy != 0 && "GEP Conversion Failure!"); assert(ElTy != 0 && "GEP Conversion Failure!");
Res = new GetElementPtrInst(NewVal, Indices, Name); Res = new GetElementPtrInst(NewVal, Indices, Name);
@@ -1140,7 +1148,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
BasicBlock *BB = OldPN->getIncomingBlock(0); BasicBlock *BB = OldPN->getIncomingBlock(0);
Value *OldVal = OldPN->getIncomingValue(0); Value *OldVal = OldPN->getIncomingValue(0);
OldPN->removeIncomingValue(BB, false); OldPN->removeIncomingValue(BB, false);
Value *V = ConvertExpressionToType(OldVal, NewTy, VMC); Value *V = ConvertExpressionToType(OldVal, NewTy, VMC, TD);
NewPN->addIncoming(V, BB); NewPN->addIncoming(V, BB);
} }
Res = NewPN; Res = NewPN;
@@ -1211,7 +1219,7 @@ static void ConvertOperandToType(User *U, Value *OldVal, Value *NewVal,
VMC.ExprMap[I] = Res; VMC.ExprMap[I] = Res;
if (I->getType() != Res->getType()) if (I->getType() != Res->getType())
ConvertValueToNewType(I, Res, VMC); ConvertValueToNewType(I, Res, VMC, TD);
else { else {
for (unsigned It = 0; It < I->use_size(); ) { for (unsigned It = 0; It < I->use_size(); ) {
User *Use = *(I->use_begin()+It); User *Use = *(I->use_begin()+It);

77
lib/Transforms/LevelRaise.cpp
View File

@@ -62,6 +62,28 @@ NumVarargCallChanges("raise", "Number of vararg call peepholes");
do { PRINT_PEEPHOLE(ID, 0, I1); PRINT_PEEPHOLE(ID, 1, I2); \ do { PRINT_PEEPHOLE(ID, 0, I1); PRINT_PEEPHOLE(ID, 1, I2); \
PRINT_PEEPHOLE(ID, 2, I3); PRINT_PEEPHOLE(ID, 3, I4); } while (0) PRINT_PEEPHOLE(ID, 2, I3); PRINT_PEEPHOLE(ID, 3, I4); } while (0)
namespace {
struct RPR : public FunctionPass {
virtual bool runOnFunction(Function &F);
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.setPreservesCFG();
AU.addRequired<TargetData>();
}
private:
bool DoRaisePass(Function &F);
bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI);
};
RegisterOpt<RPR> X("raise", "Raise Pointer References");
}
Pass *createRaisePointerReferencesPass() {
return new RPR();
}
// isReinterpretingCast - Return true if the cast instruction specified will // isReinterpretingCast - Return true if the cast instruction specified will
// cause the operand to be "reinterpreted". A value is reinterpreted if the // cause the operand to be "reinterpreted". A value is reinterpreted if the
@@ -80,7 +102,8 @@ static inline bool isReinterpretingCast(const CastInst *CI) {
// %t2 = cast <eltype> * %t3 to {<...>}* // %t2 = cast <eltype> * %t3 to {<...>}*
// //
static bool HandleCastToPointer(BasicBlock::iterator BI, static bool HandleCastToPointer(BasicBlock::iterator BI,
const PointerType *DestPTy) { const PointerType *DestPTy,
const TargetData &TD) {
CastInst &CI = cast<CastInst>(*BI); CastInst &CI = cast<CastInst>(*BI);
if (CI.use_empty()) return false; if (CI.use_empty()) return false;
@@ -101,7 +124,7 @@ static bool HandleCastToPointer(BasicBlock::iterator BI,
std::vector<Value*> Indices; std::vector<Value*> Indices;
Value *Src = CI.getOperand(0); Value *Src = CI.getOperand(0);
const Type *Result = ConvertableToGEP(DestPTy, Src, Indices, &BI); const Type *Result = ConvertableToGEP(DestPTy, Src, Indices, TD, &BI);
if (Result == 0) return false; // Not convertable... if (Result == 0) return false; // Not convertable...
PRINT_PEEPHOLE2("cast-add-to-gep:in", Src, CI); PRINT_PEEPHOLE2("cast-add-to-gep:in", Src, CI);
@@ -155,7 +178,8 @@ static bool HandleCastToPointer(BasicBlock::iterator BI,
// %t2 = cast <eltype> * %t3 to {<...>}* // %t2 = cast <eltype> * %t3 to {<...>}*
// //
static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI, static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI,
Value *AddOp1, CastInst *AddOp2) { Value *AddOp1, CastInst *AddOp2,
const TargetData &TD) {
const CompositeType *CompTy; const CompositeType *CompTy;
Value *OffsetVal = AddOp2->getOperand(0); Value *OffsetVal = AddOp2->getOperand(0);
Value *SrcPtr = 0; // Of type pointer to struct... Value *SrcPtr = 0; // Of type pointer to struct...
@@ -172,7 +196,7 @@ static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI,
return false; return false;
std::vector<Value*> Indices; std::vector<Value*> Indices;
if (!ConvertableToGEP(SrcPtr->getType(), OffsetVal, Indices, &BI)) if (!ConvertableToGEP(SrcPtr->getType(), OffsetVal, Indices, TD, &BI))
return false; // Not convertable... perhaps next time return false; // Not convertable... perhaps next time
if (getPointedToComposite(AddOp1->getType())) { // case 1 if (getPointedToComposite(AddOp1->getType())) { // case 1
@@ -190,8 +214,9 @@ static bool PeepholeOptimizeAddCast(BasicBlock *BB, BasicBlock::iterator &BI,
return true; return true;
} }
static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) { bool RPR::PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
Instruction *I = BI; Instruction *I = BI;
const TargetData &TD = getAnalysis<TargetData>();
if (CastInst *CI = dyn_cast<CastInst>(I)) { if (CastInst *CI = dyn_cast<CastInst>(I)) {
Value *Src = CI->getOperand(0); Value *Src = CI->getOperand(0);
@@ -230,13 +255,13 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
// destination type of the cast... // destination type of the cast...
// //
ConvertedTypes[CI] = CI->getType(); // Make sure the cast doesn't change ConvertedTypes[CI] = CI->getType(); // Make sure the cast doesn't change
if (ExpressionConvertableToType(Src, DestTy, ConvertedTypes)) { if (ExpressionConvertableToType(Src, DestTy, ConvertedTypes, TD)) {
PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", Src, CI, BB->getParent()); PRINT_PEEPHOLE3("CAST-SRC-EXPR-CONV:in ", Src, CI, BB->getParent());
DEBUG(cerr << "\nCONVERTING SRC EXPR TYPE:\n"); DEBUG(cerr << "\nCONVERTING SRC EXPR TYPE:\n");
{ // ValueMap must be destroyed before function verified! { // ValueMap must be destroyed before function verified!
ValueMapCache ValueMap; ValueMapCache ValueMap;
Value *E = ConvertExpressionToType(Src, DestTy, ValueMap); Value *E = ConvertExpressionToType(Src, DestTy, ValueMap, TD);
if (Constant *CPV = dyn_cast<Constant>(E)) if (Constant *CPV = dyn_cast<Constant>(E))
CI->replaceAllUsesWith(CPV); CI->replaceAllUsesWith(CPV);
@@ -258,13 +283,13 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
ConvertedTypes.clear(); ConvertedTypes.clear();
// Make sure the source doesn't change type // Make sure the source doesn't change type
ConvertedTypes[Src] = Src->getType(); ConvertedTypes[Src] = Src->getType();
if (ValueConvertableToType(CI, Src->getType(), ConvertedTypes)) { if (ValueConvertableToType(CI, Src->getType(), ConvertedTypes, TD)) {
PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", Src, CI, BB->getParent()); PRINT_PEEPHOLE3("CAST-DEST-EXPR-CONV:in ", Src, CI, BB->getParent());
DEBUG(cerr << "\nCONVERTING EXPR TYPE:\n"); DEBUG(cerr << "\nCONVERTING EXPR TYPE:\n");
{ // ValueMap must be destroyed before function verified! { // ValueMap must be destroyed before function verified!
ValueMapCache ValueMap; ValueMapCache ValueMap;
ConvertValueToNewType(CI, Src, ValueMap); // This will delete CI! ConvertValueToNewType(CI, Src, ValueMap, TD); // This will delete CI!
} }
PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", Src); PRINT_PEEPHOLE1("CAST-DEST-EXPR-CONV:out", Src);
@@ -283,7 +308,7 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
// so, convert the add into a getelementptr instruction... // so, convert the add into a getelementptr instruction...
// //
if (const PointerType *DestPTy = dyn_cast<PointerType>(DestTy)) { if (const PointerType *DestPTy = dyn_cast<PointerType>(DestTy)) {
if (HandleCastToPointer(BI, DestPTy)) { if (HandleCastToPointer(BI, DestPTy, TD)) {
BI = BB->begin(); // Rescan basic block. BI might be invalidated. BI = BB->begin(); // Rescan basic block. BI might be invalidated.
++NumGEPInstFormed; ++NumGEPInstFormed;
return true; return true;
@@ -454,7 +479,7 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
isa<CastInst>(I->getOperand(1))) { isa<CastInst>(I->getOperand(1))) {
if (PeepholeOptimizeAddCast(BB, BI, I->getOperand(0), if (PeepholeOptimizeAddCast(BB, BI, I->getOperand(0),
cast<CastInst>(I->getOperand(1)))) { cast<CastInst>(I->getOperand(1)), TD)) {
++NumGEPInstFormed; ++NumGEPInstFormed;
return true; return true;
} }
@@ -500,7 +525,7 @@ static bool PeepholeOptimize(BasicBlock *BB, BasicBlock::iterator &BI) {
static bool DoRaisePass(Function &F) { bool RPR::DoRaisePass(Function &F) {
bool Changed = false; bool Changed = false;
for (Function::iterator BB = F.begin(), BBE = F.end(); BB != BBE; ++BB) for (Function::iterator BB = F.begin(), BBE = F.end(); BB != BBE; ++BB)
for (BasicBlock::iterator BI = BB->begin(); BI != BB->end();) { for (BasicBlock::iterator BI = BB->begin(); BI != BB->end();) {
@@ -520,17 +545,14 @@ static bool DoRaisePass(Function &F) {
} }
// RaisePointerReferences::doit - Raise a function representation to a higher // runOnFunction - Raise a function representation to a higher level.
// level. bool RPR::runOnFunction(Function &F) {
//
static bool doRPR(Function &F) {
DEBUG(cerr << "\n\n\nStarting to work on Function '" << F.getName() << "'\n"); DEBUG(cerr << "\n\n\nStarting to work on Function '" << F.getName() << "'\n");
// Insert casts for all incoming pointer pointer values that are treated as // Insert casts for all incoming pointer pointer values that are treated as
// arrays... // arrays...
// //
bool Changed = false, LocalChange; bool Changed = false, LocalChange;
// If the StartInst option was specified, then Peephole optimize that // If the StartInst option was specified, then Peephole optimize that
// instruction first if it occurs in this function. // instruction first if it occurs in this function.
@@ -559,24 +581,3 @@ static bool doRPR(Function &F) {
return Changed; return Changed;
} }
namespace {
struct RaisePointerReferences : public FunctionPass {
// FIXME: constructor should save and use target data here!!
RaisePointerReferences(const TargetData &TD) {}
virtual bool runOnFunction(Function &F) { return doRPR(F); }
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.setPreservesCFG();
}
};
}
Pass *createRaisePointerReferencesPass(const TargetData &TD) {
return new RaisePointerReferences(TD);
}
static RegisterOpt<RaisePointerReferences>
X("raise", "Raise Pointer References", createRaisePointerReferencesPass);

19
lib/Transforms/TransformInternals.cpp
View File

@@ -11,15 +11,9 @@
#include "llvm/Function.h" #include "llvm/Function.h"
#include "llvm/iOther.h" #include "llvm/iOther.h"
// TargetData Hack: Eventually we will have annotations given to us by the
// backend so that we know stuff about type size and alignments. For now
// though, just use this, because it happens to match the model that GCC uses.
//
const TargetData TD("LevelRaise: Should be GCC though!");
static const Type *getStructOffsetStep(const StructType *STy, uint64_t &Offset, static const Type *getStructOffsetStep(const StructType *STy, uint64_t &Offset,
std::vector<Value*> &Indices) { std::vector<Value*> &Indices,
const TargetData &TD) {
assert(Offset < TD.getTypeSize(STy) && "Offset not in composite!"); assert(Offset < TD.getTypeSize(STy) && "Offset not in composite!");
const StructLayout *SL = TD.getStructLayout(STy); const StructLayout *SL = TD.getStructLayout(STy);
@@ -52,7 +46,7 @@ static const Type *getStructOffsetStep(const StructType *STy, uint64_t &Offset,
// //
const Type *getStructOffsetType(const Type *Ty, unsigned &Offset, const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
std::vector<Value*> &Indices, std::vector<Value*> &Indices,
bool StopEarly) { const TargetData &TD, bool StopEarly) {
if (Offset == 0 && StopEarly && !Indices.empty()) if (Offset == 0 && StopEarly && !Indices.empty())
return Ty; // Return the leaf type return Ty; // Return the leaf type
@@ -60,7 +54,7 @@ const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
const Type *NextType; const Type *NextType;
if (const StructType *STy = dyn_cast<StructType>(Ty)) { if (const StructType *STy = dyn_cast<StructType>(Ty)) {
ThisOffset = Offset; ThisOffset = Offset;
NextType = getStructOffsetStep(STy, ThisOffset, Indices); NextType = getStructOffsetStep(STy, ThisOffset, Indices, TD);
} else if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) { } else if (const ArrayType *ATy = dyn_cast<ArrayType>(Ty)) {
assert(Offset < TD.getTypeSize(ATy) && "Offset not in composite!"); assert(Offset < TD.getTypeSize(ATy) && "Offset not in composite!");
@@ -75,7 +69,7 @@ const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
unsigned SubOffs = Offset - ThisOffset; unsigned SubOffs = Offset - ThisOffset;
const Type *LeafTy = getStructOffsetType(NextType, SubOffs, const Type *LeafTy = getStructOffsetType(NextType, SubOffs,
Indices, StopEarly); Indices, TD, StopEarly);
Offset = ThisOffset + SubOffs; Offset = ThisOffset + SubOffs;
return LeafTy; return LeafTy;
} }
@@ -87,6 +81,7 @@ const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
// //
const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal,
std::vector<Value*> &Indices, std::vector<Value*> &Indices,
const TargetData &TD,
BasicBlock::iterator *BI) { BasicBlock::iterator *BI) {
const CompositeType *CompTy = dyn_cast<CompositeType>(Ty); const CompositeType *CompTy = dyn_cast<CompositeType>(Ty);
if (CompTy == 0) return 0; if (CompTy == 0) return 0;
@@ -116,7 +111,7 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal,
if (const StructType *StructTy = dyn_cast<StructType>(CompTy)) { if (const StructType *StructTy = dyn_cast<StructType>(CompTy)) {
// Step into the appropriate element of the structure... // Step into the appropriate element of the structure...
uint64_t ActualOffset = (Offset < 0) ? 0 : (uint64_t)Offset; uint64_t ActualOffset = (Offset < 0) ? 0 : (uint64_t)Offset;
NextTy = getStructOffsetStep(StructTy, ActualOffset, Indices); NextTy = getStructOffsetStep(StructTy, ActualOffset, Indices, TD);
Offset -= ActualOffset; Offset -= ActualOffset;
} else { } else {
const Type *ElTy = cast<SequentialType>(CompTy)->getElementType(); const Type *ElTy = cast<SequentialType>(CompTy)->getElementType();

23
lib/Transforms/TransformInternals.h
View File

@@ -15,14 +15,6 @@
#include <map> #include <map>
#include <set> #include <set>
// TargetData Hack: Eventually we will have annotations given to us by the
// backend so that we know stuff about type size and alignments. For now
// though, just use this, because it happens to match the model that GCC uses.
//
// FIXME: This should use annotations
//
extern const TargetData TD;
static inline int64_t getConstantValue(const ConstantInt *CPI) { static inline int64_t getConstantValue(const ConstantInt *CPI) {
if (const ConstantSInt *CSI = dyn_cast<ConstantSInt>(CPI)) if (const ConstantSInt *CSI = dyn_cast<ConstantSInt>(CPI))
return CSI->getValue(); return CSI->getValue();
@@ -49,6 +41,7 @@ static inline const CompositeType *getPointedToComposite(const Type *Ty) {
// //
const Type *ConvertableToGEP(const Type *Ty, Value *V, const Type *ConvertableToGEP(const Type *Ty, Value *V,
std::vector<Value*> &Indices, std::vector<Value*> &Indices,
const TargetData &TD,
BasicBlock::iterator *BI = 0); BasicBlock::iterator *BI = 0);
@@ -112,14 +105,18 @@ struct ValueMapCache {
}; };
bool ExpressionConvertableToType(Value *V, const Type *Ty, ValueTypeCache &Map); bool ExpressionConvertableToType(Value *V, const Type *Ty, ValueTypeCache &Map,
Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC); const TargetData &TD);
Value *ConvertExpressionToType(Value *V, const Type *Ty, ValueMapCache &VMC,
const TargetData &TD);
// ValueConvertableToType - Return true if it is possible // ValueConvertableToType - Return true if it is possible
bool ValueConvertableToType(Value *V, const Type *Ty, bool ValueConvertableToType(Value *V, const Type *Ty,
ValueTypeCache &ConvertedTypes); ValueTypeCache &ConvertedTypes,
const TargetData &TD);
void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC); void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC,
const TargetData &TD);
// getStructOffsetType - Return a vector of offsets that are to be used to index // getStructOffsetType - Return a vector of offsets that are to be used to index
@@ -135,6 +132,6 @@ void ConvertValueToNewType(Value *V, Value *NewVal, ValueMapCache &VMC);
// //
const Type *getStructOffsetType(const Type *Ty, unsigned &Offset, const Type *getStructOffsetType(const Type *Ty, unsigned &Offset,
std::vector<Value*> &Offsets, std::vector<Value*> &Offsets,
bool StopEarly = true); const TargetData &TD, bool StopEarly = true);
#endif #endif