#include "llvm/Target/TargetData.h"
#include "llvm/DerivedTypes.h"
-#include "llvm/ConstantVals.h"
+#include "llvm/Constants.h"
static inline void getTypeInfo(const Type *Ty, const TargetData *TD,
- unsigned &Size, unsigned char &Alignment);
+ uint64_t &Size, unsigned char &Alignment);
//===----------------------------------------------------------------------===//
// Support for StructLayout Annotation
TE = ST->getElementTypes().end(); TI != TE; ++TI) {
const Type *Ty = *TI;
unsigned char A;
- unsigned TySize, TyAlign;
- getTypeInfo(Ty, &TD, TySize, A); TyAlign = A;
+ unsigned TyAlign;
+ uint64_t TySize;
+ getTypeInfo(Ty, &TD, TySize, A);
+ TyAlign = A;
// Add padding if neccesary to make the data element aligned properly...
if (StructSize % TyAlign != 0)
StructSize = (StructSize/TyAlign + 1) * TyAlign; // Add padding...
// Keep track of maximum alignment constraint
- StructAlignment = max(TyAlign, StructAlignment);
+ StructAlignment = std::max(TyAlign, StructAlignment);
MemberOffsets.push_back(StructSize);
- StructSize += TySize; // Consume space for this data item...
+ StructSize += TySize; // Consume space for this data item
}
// Add padding to the end of the struct so that it could be put in an array
const TargetData &TD = *(const TargetData*)D;
assert(AID == TD.AID && "Target data annotation ID mismatch!");
const Type *Ty = cast<const Type>((const Value *)T);
- assert(Ty->isStructType() &&
+ assert(isa<StructType>(Ty) &&
"Can only create StructLayout annotation on structs!");
return new StructLayout((const StructType *)Ty, TD);
}
// TargetData Class Implementation
//===----------------------------------------------------------------------===//
-TargetData::TargetData(const string &TargetName, unsigned char PtrSize = 8,
+TargetData::TargetData(const std::string &TargetName,
+ unsigned char IntRegSize = 8, unsigned char PtrSize = 8,
unsigned char PtrAl = 8, unsigned char DoubleAl = 8,
unsigned char FloatAl = 4, unsigned char LongAl = 8,
unsigned char IntAl = 4, unsigned char ShortAl = 2,
: AID(AnnotationManager::getID("TargetData::" + TargetName)) {
AnnotationManager::registerAnnotationFactory(AID, TypeAnFactory, this);
+ IntegerRegSize = IntRegSize;
PointerSize = PtrSize;
PointerAlignment = PtrAl;
DoubleAlignment = DoubleAl;
}
static inline void getTypeInfo(const Type *Ty, const TargetData *TD,
- unsigned &Size, unsigned char &Alignment) {
+ uint64_t &Size, unsigned char &Alignment) {
assert(Ty->isSized() && "Cannot getTypeInfo() on a type that is unsized!");
switch (Ty->getPrimitiveID()) {
case Type::VoidTyID:
}
}
-unsigned TargetData::getTypeSize(const Type *Ty) const {
- unsigned Size; unsigned char Align;
+uint64_t TargetData::getTypeSize(const Type *Ty) const {
+ uint64_t Size;
+ unsigned char Align;
getTypeInfo(Ty, this, Size, Align);
return Size;
}
unsigned char TargetData::getTypeAlignment(const Type *Ty) const {
- unsigned Size; unsigned char Align;
+ uint64_t Size;
+ unsigned char Align;
getTypeInfo(Ty, this, Size, Align);
return Align;
}
-unsigned TargetData::getIndexedOffset(const Type *ptrTy,
- const vector<Constant*> &Idx) const {
+uint64_t TargetData::getIndexedOffset(const Type *ptrTy,
+ const std::vector<Value*> &Idx) const {
const PointerType *PtrTy = cast<const PointerType>(ptrTy);
- unsigned Result = 0;
+ uint64_t Result = 0;
// Get the type pointed to...
const Type *Ty = PtrTy->getElementType();
for (unsigned CurIDX = 0; CurIDX < Idx.size(); ++CurIDX) {
- if (const StructType *STy = dyn_cast<const StructType>(Ty)) {
+ if (Idx[CurIDX]->getType() == Type::UIntTy) {
+ // Get the array index and the size of each array element.
+ // Both must be known constants, or this will fail.
+ unsigned arrayIdx = cast<ConstantUInt>(Idx[CurIDX])->getValue();
+ uint64_t elementSize = this->getTypeSize(Ty);
+ Result += arrayIdx * elementSize;
+
+ } else if (const StructType *STy = dyn_cast<const StructType>(Ty)) {
assert(Idx[CurIDX]->getType() == Type::UByteTy && "Illegal struct idx");
unsigned FieldNo = cast<ConstantUInt>(Idx[CurIDX])->getValue();
const StructLayout *Layout = getStructLayout(STy);
// Add in the offset, as calculated by the structure layout info...
- assert(FieldNo < Layout->MemberOffsets.size() && "FieldNo out of range!");
+ assert(FieldNo < Layout->MemberOffsets.size() &&"FieldNo out of range!");
Result += Layout->MemberOffsets[FieldNo];
// Update Ty to refer to current element
Ty = STy->getElementTypes()[FieldNo];
- } else if (const ArrayType *ATy = dyn_cast<const ArrayType>(Ty)) {
+ } else if (isa<const ArrayType>(Ty)) {
assert(0 && "Loading from arrays not implemented yet!");
} else {
assert(0 && "Indexing type that is not struct or array?");