X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=lib%2FTransforms%2FTransformInternals.cpp;h=51d5ff54c2b741fb6d72b5498997addb7a59782f;hb=e802a023d98b06307831cd122e61da86431e8dac;hp=f8476231cf9b3e6dfcd5bd370b6d77cbe4298e04;hpb=0c0edf8afc35a42b15a24ebb5fa5f3fc674290ae;p=oota-llvm.git diff --git a/lib/Transforms/TransformInternals.cpp b/lib/Transforms/TransformInternals.cpp index f8476231cf9..51d5ff54c2b 100644 --- a/lib/Transforms/TransformInternals.cpp +++ b/lib/Transforms/TransformInternals.cpp @@ -18,7 +18,7 @@ const TargetData TD("LevelRaise: Should be GCC though!"); -static const Type *getStructOffsetStep(const StructType *STy, unsigned &Offset, +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); @@ -56,7 +56,7 @@ const Type *getStructOffsetType(const Type *Ty, unsigned &Offset, 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)) { ThisOffset = Offset; @@ -66,7 +66,7 @@ const Type *getStructOffsetType(const Type *Ty, unsigned &Offset, NextType = ATy->getElementType(); unsigned ChildSize = TD.getTypeSize(NextType); - Indices.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 @@ -94,13 +94,13 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, // 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); + ExprType Expr = ClassifyExpression(OffsetVal); // Get the offset and scale values if they exists... // A scale of zero with Expr.Var != 0 means a scale of 1. // - int Offset = Expr.Offset ? getConstantValue(Expr.Offset) : 0; - int Scale = Expr.Scale ? getConstantValue(Expr.Scale) : 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 @@ -115,7 +115,7 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, if (const StructType *StructTy = dyn_cast(CompTy)) { // Step into the appropriate element of the structure... - unsigned ActualOffset = (Offset < 0) ? 0 : (unsigned)Offset; + uint64_t ActualOffset = (Offset < 0) ? 0 : (uint64_t)Offset; NextTy = getStructOffsetStep(StructTy, ActualOffset, Indices); Offset -= ActualOffset; } else { @@ -123,7 +123,7 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, if (!ElTy->isSized()) return 0; // Type is unreasonable... escape! unsigned ElSize = TD.getTypeSize(ElTy); - int ElSizeS = (int)ElSize; + int64_t ElSizeS = ElSize; // See if the user is indexing into a different cell of this array... if (Scale && (Scale >= ElSizeS || -Scale >= ElSizeS)) { @@ -131,61 +131,50 @@ const Type *ConvertableToGEP(const Type *Ty, Value *OffsetVal, // array by one. In this case, we will have to insert math to munge // the index. // - int ScaleAmt = Scale/ElSizeS; + int64_t ScaleAmt = Scale/ElSizeS; if (Scale-ScaleAmt*ElSizeS) return 0; // Didn't scale by a multiple of element size, bail out Scale = 0; // Scale is consumed - int 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); - Expr.Var = IdxCast; - } + 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, - (unsigned)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); - Expr.Var = Scaler; + Value *ScaleAmtVal = ConstantSInt::get(Type::LongTy, 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, (unsigned)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); - Expr.Var = Offseter; + Value *IndexAmt = ConstantSInt::get(Type::LongTy, Index); + Expr.Var = BinaryOperator::create(Instruction::Add, Expr.Var, + IndexAmt, + Expr.Var->getName()+"-offset", + *BI); } } Indices.push_back(Expr.Var); Expr.Var = 0; - } else if (Offset >= (int)ElSize || -Offset >= (int)ElSize) { + } 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 -= (int)(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 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 }