6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-09-12 16:25:18 +00:00
Code Issues Projects Releases Wiki Activity

introduce a new RoundUpAlignment helper function, use it to

Browse Source 
remove some more 64-bit divs and rems from the StructLayout 
ctor.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60692 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2008-12-08 07:11:56 +00:00
parent 149cfc3519
commit bedb8c1d35
2 changed files with 40 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
lib/Target/TargetData.cpp
View File

@@ -45,15 +45,16 @@ StructLayout::StructLayout(const StructType *ST, const TargetData &TD) {
StructSize = 0;
NumElements = ST->getNumElements();
// Loop over each of the elements, placing them in memory...
// Loop over each of the elements, placing them in memory.
for (unsigned i = 0, e = NumElements; i != e; ++i) {
const Type *Ty = ST->getElementType(i);
unsigned TyAlign = ST->isPacked() ? 1 : TD.getABITypeAlignment(Ty);
// Add padding if necessary to align the data element properly...
StructSize = (StructSize + TyAlign - 1)/TyAlign * TyAlign;
// Add padding if necessary to align the data element properly.
if (StructSize & TyAlign-1)
StructSize = TargetData::RoundUpAlignment(StructSize, TyAlign);
// Keep track of maximum alignment constraint
// Keep track of maximum alignment constraint.
StructAlignment = std::max(TyAlign, StructAlignment);
MemberOffsets[i] = StructSize;
@@ -65,8 +66,8 @@ StructLayout::StructLayout(const StructType *ST, const TargetData &TD) {
// Add padding to the end of the struct so that it could be put in an array
// and all array elements would be aligned correctly.
if (StructSize % StructAlignment != 0)
StructSize = (StructSize/StructAlignment + 1) * StructAlignment;
if (StructSize & (StructAlignment-1) != 0)
StructSize = TargetData::RoundUpAlignment(StructSize, StructAlignment);
}
@@ -346,18 +347,18 @@ typedef DenseMap<LayoutKey, StructLayout*, DenseMapLayoutKeyInfo> LayoutInfoTy;
static ManagedStatic<LayoutInfoTy> LayoutInfo;
TargetData::~TargetData() {
if (LayoutInfo.isConstructed()) {
// Remove any layouts for this TD.
LayoutInfoTy &TheMap = *LayoutInfo;
for (LayoutInfoTy::iterator I = TheMap.begin(), E = TheMap.end();
I != E; ) {
if (I->first.first == this) {
I->second->~StructLayout();
free(I->second);
TheMap.erase(I++);
} else {
++I;
}
if (!LayoutInfo.isConstructed())
return;
// Remove any layouts for this TD.
LayoutInfoTy &TheMap = *LayoutInfo;
for (LayoutInfoTy::iterator I = TheMap.begin(), E = TheMap.end(); I != E; ) {
if (I->first.first == this) {
I->second->~StructLayout();
free(I->second);
TheMap.erase(I++);
} else {
++I;
}
}
}
@@ -390,11 +391,11 @@ void TargetData::InvalidateStructLayoutInfo(const StructType *Ty) const {
if (!LayoutInfo.isConstructed()) return; // No cache.
LayoutInfoTy::iterator I = LayoutInfo->find(LayoutKey(this, Ty));
if (I != LayoutInfo->end()) {
I->second->~StructLayout();
free(I->second);
LayoutInfo->erase(I);
}
if (I == LayoutInfo->end()) return;
I->second->~StructLayout();
free(I->second);
LayoutInfo->erase(I);
}
@@ -426,11 +427,9 @@ uint64_t TargetData::getTypeSizeInBits(const Type *Ty) const {
const ArrayType *ATy = cast<ArrayType>(Ty);
return getABITypeSizeInBits(ATy->getElementType())*ATy->getNumElements();
}
case Type::StructTyID: {
case Type::StructTyID:
// Get the layout annotation... which is lazily created on demand.
const StructLayout *Layout = getStructLayout(cast<StructType>(Ty));
return Layout->getSizeInBits();
}
return getStructLayout(cast<StructType>(Ty))->getSizeInBits();
case Type::IntegerTyID:
return cast<IntegerType>(Ty)->getBitWidth();
case Type::VoidTyID:
@@ -446,10 +445,8 @@ uint64_t TargetData::getTypeSizeInBits(const Type *Ty) const {
// only 80 bits contain information.
case Type::X86_FP80TyID:
return 80;
case Type::VectorTyID: {
const VectorType *PTy = cast<VectorType>(Ty);
return PTy->getBitWidth();
}
case Type::VectorTyID:
return cast<VectorType>(Ty)->getBitWidth();
default:
assert(0 && "TargetData::getTypeSizeInBits(): Unsupported type");
break;
@@ -470,7 +467,7 @@ unsigned char TargetData::getAlignment(const Type *Ty, bool abi_or_pref) const {
assert(Ty->isSized() && "Cannot getTypeInfo() on a type that is unsized!");
switch (Ty->getTypeID()) {
/* Early escape for the non-numeric types */
// Early escape for the non-numeric types.
case Type::LabelTyID:
case Type::PointerTyID:
return (abi_or_pref