Changes in directory llvm/lib/ExecutionEngine:
ExecutionEngine.cpp updated: 1.80 -> 1.81 --- Log message: Refactor TargetMachine, pushing handling of TargetData into the target-specific subclasses. This has one caller-visible change: getTargetData() now returns a pointer instead of a reference. This fixes PR 759: http://llvm.cs.uiuc.edu/PR759 . --- Diffs of the changes: (+15 -15) ExecutionEngine.cpp | 30 +++++++++++++++--------------- 1 files changed, 15 insertions(+), 15 deletions(-) Index: llvm/lib/ExecutionEngine/ExecutionEngine.cpp diff -u llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.80 llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.81 --- llvm/lib/ExecutionEngine/ExecutionEngine.cpp:1.80 Sat Apr 22 13:53:45 2006 +++ llvm/lib/ExecutionEngine/ExecutionEngine.cpp Tue May 2 20:29:56 2006 @@ -70,7 +70,7 @@ // static void *CreateArgv(ExecutionEngine *EE, const std::vector<std::string> &InputArgv) { - unsigned PtrSize = EE->getTargetData().getPointerSize(); + unsigned PtrSize = EE->getTargetData()->getPointerSize(); char *Result = new char[(InputArgv.size()+1)*PtrSize]; DEBUG(std::cerr << "ARGV = " << (void*)Result << "\n"); @@ -218,7 +218,7 @@ uint64_t Offset = TD->getIndexedOffset(CE->getOperand(0)->getType(), Indexes); - if (getTargetData().getPointerSize() == 4) + if (getTargetData()->getPointerSize() == 4) Result.IntVal += Offset; else Result.LongVal += Offset; @@ -335,7 +335,7 @@ /// void ExecutionEngine::StoreValueToMemory(GenericValue Val, GenericValue *Ptr, const Type *Ty) { - if (getTargetData().isLittleEndian()) { + if (getTargetData()->isLittleEndian()) { switch (Ty->getTypeID()) { case Type::BoolTyID: case Type::UByteTyID: @@ -352,7 +352,7 @@ Ptr->Untyped[2] = (Val.UIntVal >> 16) & 255; Ptr->Untyped[3] = (Val.UIntVal >> 24) & 255; break; - case Type::PointerTyID: if (getTargetData().getPointerSize() == 4) + case Type::PointerTyID: if (getTargetData()->getPointerSize() == 4) goto Store4BytesLittleEndian; case Type::DoubleTyID: case Type::ULongTyID: @@ -386,7 +386,7 @@ Ptr->Untyped[1] = (Val.UIntVal >> 16) & 255; Ptr->Untyped[0] = (Val.UIntVal >> 24) & 255; break; - case Type::PointerTyID: if (getTargetData().getPointerSize() == 4) + case Type::PointerTyID: if (getTargetData()->getPointerSize() == 4) goto Store4BytesBigEndian; case Type::DoubleTyID: case Type::ULongTyID: @@ -411,7 +411,7 @@ GenericValue ExecutionEngine::LoadValueFromMemory(GenericValue *Ptr, const Type *Ty) { GenericValue Result; - if (getTargetData().isLittleEndian()) { + if (getTargetData()->isLittleEndian()) { switch (Ty->getTypeID()) { case Type::BoolTyID: case Type::UByteTyID: @@ -428,7 +428,7 @@ ((unsigned)Ptr->Untyped[2] << 16) | ((unsigned)Ptr->Untyped[3] << 24); break; - case Type::PointerTyID: if (getTargetData().getPointerSize() == 4) + case Type::PointerTyID: if (getTargetData()->getPointerSize() == 4) goto Load4BytesLittleEndian; case Type::DoubleTyID: case Type::ULongTyID: @@ -462,7 +462,7 @@ ((unsigned)Ptr->Untyped[1] << 16) | ((unsigned)Ptr->Untyped[0] << 24); break; - case Type::PointerTyID: if (getTargetData().getPointerSize() == 4) + case Type::PointerTyID: if (getTargetData()->getPointerSize() == 4) goto Load4BytesBigEndian; case Type::DoubleTyID: case Type::ULongTyID: @@ -491,7 +491,7 @@ return; } else if (const ConstantPacked *CP = dyn_cast<ConstantPacked>(Init)) { unsigned ElementSize = - getTargetData().getTypeSize(CP->getType()->getElementType()); + getTargetData()->getTypeSize(CP->getType()->getElementType()); for (unsigned i = 0, e = CP->getNumOperands(); i != e; ++i) InitializeMemory(CP->getOperand(i), (char*)Addr+i*ElementSize); return; @@ -500,7 +500,7 @@ StoreValueToMemory(Val, (GenericValue*)Addr, Init->getType()); return; } else if (isa<ConstantAggregateZero>(Init)) { - memset(Addr, 0, (size_t)getTargetData().getTypeSize(Init->getType())); + memset(Addr, 0, (size_t)getTargetData()->getTypeSize(Init->getType())); return; } @@ -508,7 +508,7 @@ case Type::ArrayTyID: { const ConstantArray *CPA = cast<ConstantArray>(Init); unsigned ElementSize = - getTargetData().getTypeSize(CPA->getType()->getElementType()); + getTargetData()->getTypeSize(CPA->getType()->getElementType()); for (unsigned i = 0, e = CPA->getNumOperands(); i != e; ++i) InitializeMemory(CPA->getOperand(i), (char*)Addr+i*ElementSize); return; @@ -517,7 +517,7 @@ case Type::StructTyID: { const ConstantStruct *CPS = cast<ConstantStruct>(Init); const StructLayout *SL = - getTargetData().getStructLayout(cast<StructType>(CPS->getType())); + getTargetData()->getStructLayout(cast<StructType>(CPS->getType())); for (unsigned i = 0, e = CPS->getNumOperands(); i != e; ++i) InitializeMemory(CPS->getOperand(i), (char*)Addr+SL->MemberOffsets[i]); return; @@ -534,7 +534,7 @@ /// their initializers into the memory. /// void ExecutionEngine::emitGlobals() { - const TargetData &TD = getTargetData(); + const TargetData *TD = getTargetData(); // Loop over all of the global variables in the program, allocating the memory // to hold them. @@ -546,7 +546,7 @@ const Type *Ty = I->getType()->getElementType(); // Allocate some memory for it! - unsigned Size = TD.getTypeSize(Ty); + unsigned Size = TD->getTypeSize(Ty); addGlobalMapping(I, new char[Size]); } else { // External variable reference. Try to use the dynamic loader to @@ -577,7 +577,7 @@ DEBUG(std::cerr << "Global '" << GV->getName() << "' -> " << GA << "\n"); const Type *ElTy = GV->getType()->getElementType(); - size_t GVSize = (size_t)getTargetData().getTypeSize(ElTy); + size_t GVSize = (size_t)getTargetData()->getTypeSize(ElTy); if (GA == 0) { // If it's not already specified, allocate memory for the global. GA = new char[GVSize]; _______________________________________________ llvm-commits mailing list llvm-commits@cs.uiuc.edu http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
