X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTransforms%2FTransformInternals.cpp;h=3e334eb5ebb00e0a8a563197ff94bcfefe7dd787;hb=41174595670a6d51671f174f44e376ada78d1841;hp=63368d55a1d302d288d2d36bf671a710688ae40b;hpb=7c3f415d99908a515ecc1e82a3fb946acee2c6ac;p=oota-llvm.git diff --git a/lib/Transforms/TransformInternals.cpp b/lib/Transforms/TransformInternals.cpp index 63368d55a1d..3e334eb5ebb 100644 --- a/lib/Transforms/TransformInternals.cpp +++ b/lib/Transforms/TransformInternals.cpp @@ -6,10 +6,9 @@ //===----------------------------------------------------------------------===// #include "TransformInternals.h" -#include "llvm/Method.h" #include "llvm/Type.h" -#include "llvm/ConstantVals.h" #include "llvm/Analysis/Expressions.h" +#include "llvm/Function.h" #include "llvm/iOther.h" // TargetData Hack: Eventually we will have annotations given to us by the @@ -18,45 +17,25 @@ // const TargetData TD("LevelRaise: Should be GCC though!"); -// 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) { - Instruction *I = *BI; - // Replaces all of the uses of the instruction with uses of the value - I->replaceAllUsesWith(V); - - // Remove the unneccesary instruction now... - BIL.remove(BI); - - // Make sure to propogate a name if there is one already... - if (I->hasName() && !V->hasName()) - V->setName(I->getName(), BIL.getParent()->getSymbolTable()); - - // Remove the dead instruction now... - delete I; -} - - -// 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) { - assert(I->getParent() == 0 && - "ReplaceInstWithInst: Instruction already inserted into basic block!"); - - // Insert the new instruction into the basic block... - BI = BIL.insert(BI, I)+1; - // Replace all uses of the old instruction, and delete it. - ReplaceInstWithValue(BIL, BI, I); +static const Type *getStructOffsetStep(const StructType *STy, uint64_t &Offset, + std::vector &Indices) { + assert(Offset < TD.getTypeSize(STy) && "Offset not in composite!"); + const StructLayout *SL = TD.getStructLayout(STy); - // Reexamine the instruction just inserted next time around the cleanup pass - // loop. - --BI; + // This loop terminates always on a 0 <= i < MemberOffsets.size() + unsigned i; + for (i = 0; i < SL->MemberOffsets.size()-1; ++i) + if (Offset >= SL->MemberOffsets[i] && Offset < SL->MemberOffsets[i+1]) + break; + + assert(Offset >= SL->MemberOffsets[i] && + (i == SL->MemberOffsets.size()-1 || Offset < SL->MemberOffsets[i+1])); + + // Make sure to save the current index... + Indices.push_back(ConstantUInt::get(Type::UByteTy, i)); + Offset = SL->MemberOffsets[i]; + return STy->getContainedType(i); } @@ -72,46 +51,31 @@ void ReplaceInstWithInst(BasicBlock::InstListType &BIL, // false if you want a leaf // const Type *getStructOffsetType(const Type *Ty, unsigned &Offset, - vector &Offsets, - bool StopEarly = true) { - if (!isa(Ty) || - (Offset == 0 && StopEarly && !Offsets.empty())) { - Offset = 0; // Return the offset that we were able to acheive + std::vector &Indices, + bool StopEarly) { + if (Offset == 0 && StopEarly && !Indices.empty()) return Ty; // Return the leaf type - } - unsigned ThisOffset; + uint64_t ThisOffset; const Type *NextType; if (const StructType *STy = dyn_cast(Ty)) { - assert(Offset < TD.getTypeSize(Ty) && "Offset not in composite!"); - const StructLayout *SL = TD.getStructLayout(STy); - - // This loop terminates always on a 0 <= i < MemberOffsets.size() - unsigned i; - for (i = 0; i < SL->MemberOffsets.size()-1; ++i) - if (Offset >= SL->MemberOffsets[i] && Offset < SL->MemberOffsets[i+1]) - break; - - assert(Offset >= SL->MemberOffsets[i] && - (i == SL->MemberOffsets.size()-1 || Offset MemberOffsets[i+1])); - - // Make sure to save the current index... - Offsets.push_back(ConstantUInt::get(Type::UByteTy, i)); - ThisOffset = SL->MemberOffsets[i]; - NextType = STy->getElementTypes()[i]; - } else { - const ArrayType *ATy = cast(Ty); - assert(ATy->isUnsized() || Offset < TD.getTypeSize(Ty) && - "Offset not in composite!"); + ThisOffset = Offset; + NextType = getStructOffsetStep(STy, ThisOffset, Indices); + } else if (const ArrayType *ATy = dyn_cast(Ty)) { + assert(Offset < TD.getTypeSize(ATy) && "Offset not in composite!"); NextType = ATy->getElementType(); unsigned ChildSize = TD.getTypeSize(NextType); - Offsets.push_back(ConstantUInt::get(Type::UIntTy, Offset/ChildSize)); + Indices.push_back(ConstantSInt::get(Type::LongTy, Offset/ChildSize)); ThisOffset = (Offset/ChildSize)*ChildSize; + } else { + Offset = 0; // Return the offset that we were able to acheive + return Ty; // Return the leaf type } unsigned SubOffs = Offset - ThisOffset; - const Type *LeafTy = getStructOffsetType(NextType, SubOffs, Offsets); + const Type *LeafTy = getStructOffsetType(NextType, SubOffs, + Indices, StopEarly); Offset = ThisOffset + SubOffs; return LeafTy; } @@ -122,44 +86,24 @@ const Type *getStructOffsetType(const Type *Ty, unsigned &Offset, // instruction. The type returned is the root type that the GEP would point to // const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, - vector &Indices, - BasicBlock::iterator *BI = 0) { - const CompositeType *CompTy = getPointedToComposite(Ty); + std::vector &Indices, + BasicBlock::iterator *BI) { + const CompositeType *CompTy = dyn_cast(Ty); if (CompTy == 0) return 0; // See if the cast is of an integer expression that is either a constant, // or a value scaled by some amount with a possible offset. // - analysis::ExprType Expr = analysis::ClassifyExpression(OffsetVal); - - // The expression must either be a constant, or a scaled index to be useful - if (!Expr.Offset && !Expr.Scale) - return 0; - - // Get the offset and scale now... - unsigned Offset = 0, Scale = Expr.Var != 0; - - // Get the offset value if it exists... - if (Expr.Offset) { - int Val = getConstantValue(Expr.Offset); - if (Val < 0) return false; // Don't mess with negative offsets - Offset = (unsigned)Val; - } + ExprType Expr = ClassifyExpression(OffsetVal); - // Get the scale value if it exists... - if (Expr.Scale) { - int Val = getConstantValue(Expr.Scale); - if (Val < 0) return false; // Don't mess with negative scales - Scale = (unsigned)Val; - } - - // Check to make sure the offset is not negative or really large, outside the - // scope of this structure... + // Get the offset and scale values if they exists... + // A scale of zero with Expr.Var != 0 means a scale of 1. // - if (!isa(CompTy) || cast(CompTy)->isSized()) - if (Offset >= TD.getTypeSize(CompTy)) - return 0; + int64_t Offset = Expr.Offset ? getConstantValue(Expr.Offset) : 0; + int64_t Scale = Expr.Scale ? getConstantValue(Expr.Scale) : 0; + if (Expr.Var && Scale == 0) Scale = 1; // Scale != 0 if Expr.Var != 0 + // Loop over the Scale and Offset values, filling in the Indices vector for // our final getelementptr instruction. // @@ -170,75 +114,70 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, CompTy = cast(NextTy); if (const StructType *StructTy = dyn_cast(CompTy)) { - const StructLayout *SL = TD.getStructLayout(StructTy); - unsigned ActualOffset = Offset; - NextTy = getStructOffsetType(StructTy, ActualOffset, Indices); + // Step into the appropriate element of the structure... + uint64_t ActualOffset = (Offset < 0) ? 0 : (uint64_t)Offset; + NextTy = getStructOffsetStep(StructTy, ActualOffset, Indices); Offset -= ActualOffset; } else { - const ArrayType *AT = cast(CompTy); - const Type *ElTy = AT->getElementType(); + const Type *ElTy = cast(CompTy)->getElementType(); + if (!ElTy->isSized()) + return 0; // Type is unreasonable... escape! unsigned ElSize = TD.getTypeSize(ElTy); + int64_t ElSizeS = ElSize; // See if the user is indexing into a different cell of this array... - if (Scale && Scale >= ElSize) { + if (Scale && (Scale >= ElSizeS || -Scale >= ElSizeS)) { // A scale n*ElSize might occur if we are not stepping through // array by one. In this case, we will have to insert math to munge // the index. // - unsigned ScaleAmt = Scale/ElSize; - if (Scale-ScaleAmt*ElSize) + int64_t ScaleAmt = Scale/ElSizeS; + if (Scale-ScaleAmt*ElSizeS) return 0; // Didn't scale by a multiple of element size, bail out - Scale = ElSize; + Scale = 0; // Scale is consumed - unsigned Index = Offset/ElSize; // is zero unless Offset > ElSize + int64_t Index = Offset/ElSize; // is zero unless Offset > ElSize Offset -= Index*ElSize; // Consume part of the offset if (BI) { // Generate code? - BasicBlock *BB = (**BI)->getParent(); - if (Expr.Var->getType() != Type::UIntTy) { - CastInst *IdxCast = new CastInst(Expr.Var, Type::UIntTy); - if (Expr.Var->hasName()) - IdxCast->setName(Expr.Var->getName()+"-idxcast"); - *BI = BB->getInstList().insert(*BI, IdxCast)+1; - Expr.Var = IdxCast; - } + BasicBlock *BB = (*BI)->getParent(); + if (Expr.Var->getType() != Type::LongTy) + Expr.Var = new CastInst(Expr.Var, Type::LongTy, + Expr.Var->getName()+"-idxcast", *BI); if (ScaleAmt && ScaleAmt != 1) { // If we have to scale up our index, do so now - Value *ScaleAmtVal = ConstantUInt::get(Type::UIntTy, ScaleAmt); - Instruction *Scaler = BinaryOperator::create(Instruction::Mul, - Expr.Var,ScaleAmtVal); - if (Expr.Var->hasName()) - Scaler->setName(Expr.Var->getName()+"-scale"); - - *BI = BB->getInstList().insert(*BI, Scaler)+1; - Expr.Var = Scaler; + Value *ScaleAmtVal = ConstantSInt::get(Type::LongTy, + (unsigned)ScaleAmt); + Expr.Var = BinaryOperator::create(Instruction::Mul, Expr.Var, + ScaleAmtVal, + Expr.Var->getName()+"-scale",*BI); } if (Index) { // Add an offset to the index - Value *IndexAmt = ConstantUInt::get(Type::UIntTy, Index); - Instruction *Offseter = BinaryOperator::create(Instruction::Add, - Expr.Var, IndexAmt); - if (Expr.Var->hasName()) - Offseter->setName(Expr.Var->getName()+"-offset"); - *BI = BB->getInstList().insert(*BI, Offseter)+1; - Expr.Var = Offseter; + Value *IndexAmt = ConstantSInt::get(Type::LongTy, (unsigned)Index); + Expr.Var = BinaryOperator::create(Instruction::Add, Expr.Var, + IndexAmt, + Expr.Var->getName()+"-offset", + *BI); } } Indices.push_back(Expr.Var); - Scale = 0; // Consume scale factor! - } else if (Offset >= ElSize) { + Expr.Var = 0; + } else if (Offset >= (int64_t)ElSize || -Offset >= (int64_t)ElSize) { // Calculate the index that we are entering into the array cell with - unsigned Index = Offset/ElSize; - Indices.push_back(ConstantUInt::get(Type::UIntTy, Index)); - Offset -= Index*ElSize; // Consume part of the offset + uint64_t Index = Offset/ElSize; + Indices.push_back(ConstantSInt::get(Type::LongTy, Index)); + Offset -= (int64_t)(Index*ElSize); // Consume part of the offset - } else { + } else if (isa(CompTy) || Indices.empty()) { // Must be indexing a small amount into the first cell of the array // Just index into element zero of the array here. // - Indices.push_back(ConstantUInt::get(Type::UIntTy, 0)); + Indices.push_back(ConstantSInt::get(Type::LongTy, 0)); + } else { + return 0; // Hrm. wierd, can't handle this case. Bail } NextTy = ElTy; }