diff options
author | Mike Stump <mrs@apple.com> | 2009-09-09 15:08:12 +0000 |
---|---|---|
committer | Mike Stump <mrs@apple.com> | 2009-09-09 15:08:12 +0000 |
commit | 1eb4433ac451dc16f4133a88af2d002ac26c58ef (patch) | |
tree | 07065b80cb7787bb7b9ffcb985196007a57e86f7 /lib/CodeGen/CGRecordLayoutBuilder.cpp | |
parent | 79d39f92590cf2e91bf81486b02cd1156d13ca54 (diff) |
Remove tabs, and whitespace cleanups.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81346 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen/CGRecordLayoutBuilder.cpp')
-rw-r--r-- | lib/CodeGen/CGRecordLayoutBuilder.cpp | 122 |
1 files changed, 61 insertions, 61 deletions
diff --git a/lib/CodeGen/CGRecordLayoutBuilder.cpp b/lib/CodeGen/CGRecordLayoutBuilder.cpp index f2fd885ee4..d26c7721da 100644 --- a/lib/CodeGen/CGRecordLayoutBuilder.cpp +++ b/lib/CodeGen/CGRecordLayoutBuilder.cpp @@ -37,7 +37,7 @@ void CGRecordLayoutBuilder::Layout(const RecordDecl *D) { if (LayoutFields(D)) return; - + // We weren't able to layout the struct. Try again with a packed struct Packed = true; AlignmentAsLLVMStruct = 1; @@ -45,52 +45,52 @@ void CGRecordLayoutBuilder::Layout(const RecordDecl *D) { FieldTypes.clear(); LLVMFields.clear(); LLVMBitFields.clear(); - + LayoutFields(D); } void CGRecordLayoutBuilder::LayoutBitField(const FieldDecl *D, uint64_t FieldOffset) { - uint64_t FieldSize = + uint64_t FieldSize = D->getBitWidth()->EvaluateAsInt(Types.getContext()).getZExtValue(); - + if (FieldSize == 0) return; uint64_t NextFieldOffset = NextFieldOffsetInBytes * 8; unsigned NumBytesToAppend; - + if (FieldOffset < NextFieldOffset) { assert(BitsAvailableInLastField && "Bitfield size mismatch!"); assert(NextFieldOffsetInBytes && "Must have laid out at least one byte!"); - + // The bitfield begins in the previous bit-field. - NumBytesToAppend = + NumBytesToAppend = llvm::RoundUpToAlignment(FieldSize - BitsAvailableInLastField, 8) / 8; } else { assert(FieldOffset % 8 == 0 && "Field offset not aligned correctly"); // Append padding if necessary. AppendBytes((FieldOffset - NextFieldOffset) / 8); - - NumBytesToAppend = + + NumBytesToAppend = llvm::RoundUpToAlignment(FieldSize, 8) / 8; - + assert(NumBytesToAppend && "No bytes to append!"); } const llvm::Type *Ty = Types.ConvertTypeForMemRecursive(D->getType()); uint64_t TypeSizeInBits = getTypeSizeInBytes(Ty) * 8; - + LLVMBitFields.push_back(LLVMBitFieldInfo(D, FieldOffset / TypeSizeInBits, - FieldOffset % TypeSizeInBits, + FieldOffset % TypeSizeInBits, FieldSize)); - + AppendBytes(NumBytesToAppend); - + AlignmentAsLLVMStruct = std::max(AlignmentAsLLVMStruct, getTypeAlignment(Ty)); - BitsAvailableInLastField = + BitsAvailableInLastField = NextFieldOffsetInBytes * 8 - (FieldOffset + FieldSize); } @@ -105,14 +105,14 @@ bool CGRecordLayoutBuilder::LayoutField(const FieldDecl *D, // don't affect the struct alignment. if (!Packed && !D->getDeclName()) return false; - + LayoutBitField(D, FieldOffset); return true; } - + assert(FieldOffset % 8 == 0 && "FieldOffset is not on a byte boundary!"); uint64_t FieldOffsetInBytes = FieldOffset / 8; - + const llvm::Type *Ty = Types.ConvertTypeForMemRecursive(D->getType()); unsigned TypeAlignment = getTypeAlignment(Ty); @@ -122,7 +122,7 @@ bool CGRecordLayoutBuilder::LayoutField(const FieldDecl *D, assert(!Packed && "Alignment is wrong even with packed struct!"); return false; } - + if (const RecordType *RT = D->getType()->getAs<RecordType>()) { const RecordDecl *RD = cast<RecordDecl>(RT->getDecl()); if (const PragmaPackAttr *PPA = RD->getAttr<PragmaPackAttr>()) { @@ -132,72 +132,72 @@ bool CGRecordLayoutBuilder::LayoutField(const FieldDecl *D, } // Round up the field offset to the alignment of the field type. - uint64_t AlignedNextFieldOffsetInBytes = + uint64_t AlignedNextFieldOffsetInBytes = llvm::RoundUpToAlignment(NextFieldOffsetInBytes, TypeAlignment); if (FieldOffsetInBytes < AlignedNextFieldOffsetInBytes) { assert(!Packed && "Could not place field even with packed struct!"); return false; } - + if (AlignedNextFieldOffsetInBytes < FieldOffsetInBytes) { // Even with alignment, the field offset is not at the right place, // insert padding. uint64_t PaddingInBytes = FieldOffsetInBytes - NextFieldOffsetInBytes; - + AppendBytes(PaddingInBytes); } - + // Now append the field. LLVMFields.push_back(LLVMFieldInfo(D, FieldTypes.size())); AppendField(FieldOffsetInBytes, Ty); - + return true; } void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { assert(D->isUnion() && "Can't call LayoutUnion on a non-union record!"); - + const ASTRecordLayout &Layout = Types.getContext().getASTRecordLayout(D); - + const llvm::Type *Ty = 0; uint64_t Size = 0; unsigned Align = 0; - + unsigned FieldNo = 0; - for (RecordDecl::field_iterator Field = D->field_begin(), + for (RecordDecl::field_iterator Field = D->field_begin(), FieldEnd = D->field_end(); Field != FieldEnd; ++Field, ++FieldNo) { - assert(Layout.getFieldOffset(FieldNo) == 0 && + assert(Layout.getFieldOffset(FieldNo) == 0 && "Union field offset did not start at the beginning of record!"); if (Field->isBitField()) { - uint64_t FieldSize = + uint64_t FieldSize = Field->getBitWidth()->EvaluateAsInt(Types.getContext()).getZExtValue(); - + // Ignore zero sized bit fields. if (FieldSize == 0) continue; - + // Add the bit field info. Types.addBitFieldInfo(*Field, 0, 0, FieldSize); } else Types.addFieldInfo(*Field, 0); - - const llvm::Type *FieldTy = + + const llvm::Type *FieldTy = Types.ConvertTypeForMemRecursive(Field->getType()); unsigned FieldAlign = Types.getTargetData().getABITypeAlignment(FieldTy); uint64_t FieldSize = Types.getTargetData().getTypeAllocSize(FieldTy); - + if (FieldAlign < Align) continue; - + if (FieldAlign > Align || FieldSize > Size) { Ty = FieldTy; Align = FieldAlign; Size = FieldSize; } } - + // Now add our field. if (Ty) { AppendField(0, Ty); @@ -208,7 +208,7 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { Align = 1; } } - + // Append tail padding. if (Layout.getSize() / 8 > Size) AppendPadding(Layout.getSize() / 8, Align); @@ -217,15 +217,15 @@ void CGRecordLayoutBuilder::LayoutUnion(const RecordDecl *D) { bool CGRecordLayoutBuilder::LayoutFields(const RecordDecl *D) { assert(!D->isUnion() && "Can't call LayoutFields on a union!"); assert(Alignment && "Did not set alignment!"); - + const ASTRecordLayout &Layout = Types.getContext().getASTRecordLayout(D); - + unsigned FieldNo = 0; - for (RecordDecl::field_iterator Field = D->field_begin(), + for (RecordDecl::field_iterator Field = D->field_begin(), FieldEnd = D->field_end(); Field != FieldEnd; ++Field, ++FieldNo) { if (!LayoutField(*Field, Layout.getFieldOffset(FieldNo))) { - assert(!Packed && + assert(!Packed && "Could not layout fields even with a packed LLVM struct!"); return false; } @@ -233,21 +233,21 @@ bool CGRecordLayoutBuilder::LayoutFields(const RecordDecl *D) { // Append tail padding if necessary. AppendTailPadding(Layout.getSize()); - + return true; } void CGRecordLayoutBuilder::AppendTailPadding(uint64_t RecordSize) { assert(RecordSize % 8 == 0 && "Invalid record size!"); - + uint64_t RecordSizeInBytes = RecordSize / 8; assert(NextFieldOffsetInBytes <= RecordSizeInBytes && "Size mismatch!"); - + unsigned NumPadBytes = RecordSizeInBytes - NextFieldOffsetInBytes; AppendBytes(NumPadBytes); } -void CGRecordLayoutBuilder::AppendField(uint64_t FieldOffsetInBytes, +void CGRecordLayoutBuilder::AppendField(uint64_t FieldOffsetInBytes, const llvm::Type *FieldTy) { AlignmentAsLLVMStruct = std::max(AlignmentAsLLVMStruct, getTypeAlignment(FieldTy)); @@ -260,19 +260,19 @@ void CGRecordLayoutBuilder::AppendField(uint64_t FieldOffsetInBytes, BitsAvailableInLastField = 0; } -void +void CGRecordLayoutBuilder::AppendPadding(uint64_t FieldOffsetInBytes, const llvm::Type *FieldTy) { AppendPadding(FieldOffsetInBytes, getTypeAlignment(FieldTy)); } -void CGRecordLayoutBuilder::AppendPadding(uint64_t FieldOffsetInBytes, +void CGRecordLayoutBuilder::AppendPadding(uint64_t FieldOffsetInBytes, unsigned FieldAlignment) { assert(NextFieldOffsetInBytes <= FieldOffsetInBytes && "Incorrect field layout!"); - + // Round up the field offset to the alignment of the field type. - uint64_t AlignedNextFieldOffsetInBytes = + uint64_t AlignedNextFieldOffsetInBytes = llvm::RoundUpToAlignment(NextFieldOffsetInBytes, FieldAlignment); if (AlignedNextFieldOffsetInBytes < FieldOffsetInBytes) { @@ -287,11 +287,11 @@ void CGRecordLayoutBuilder::AppendPadding(uint64_t FieldOffsetInBytes, void CGRecordLayoutBuilder::AppendBytes(uint64_t NumBytes) { if (NumBytes == 0) return; - + const llvm::Type *Ty = llvm::Type::getInt8Ty(Types.getLLVMContext()); if (NumBytes > 1) Ty = llvm::ArrayType::get(Ty, NumBytes); - + // Append the padding field AppendField(NextFieldOffsetInBytes, Ty); } @@ -299,7 +299,7 @@ void CGRecordLayoutBuilder::AppendBytes(uint64_t NumBytes) { unsigned CGRecordLayoutBuilder::getTypeAlignment(const llvm::Type *Ty) const { if (Packed) return 1; - + return Types.getTargetData().getABITypeAlignment(Ty); } @@ -311,26 +311,26 @@ void CGRecordLayoutBuilder::CheckForMemberPointer(const FieldDecl *FD) { // This record already contains a member pointer. if (ContainsMemberPointer) return; - + // Can only have member pointers if we're compiling C++. if (!Types.getContext().getLangOptions().CPlusPlus) return; - + QualType Ty = FD->getType(); - + if (Ty->isMemberPointerType()) { // We have a member pointer! ContainsMemberPointer = true; return; } - + } CGRecordLayout * CGRecordLayoutBuilder::ComputeLayout(CodeGenTypes &Types, const RecordDecl *D) { CGRecordLayoutBuilder Builder(Types); - + Builder.Layout(D); const llvm::Type *Ty = llvm::StructType::get(Types.getLLVMContext(), @@ -339,7 +339,7 @@ CGRecordLayoutBuilder::ComputeLayout(CodeGenTypes &Types, assert(Types.getContext().getASTRecordLayout(D).getSize() / 8 == Types.getTargetData().getTypeAllocSize(Ty) && "Type size mismatch!"); - + // Add all the field numbers. for (unsigned i = 0, e = Builder.LLVMFields.size(); i != e; ++i) { const FieldDecl *FD = Builder.LLVMFields[i].first; @@ -351,9 +351,9 @@ CGRecordLayoutBuilder::ComputeLayout(CodeGenTypes &Types, // Add bitfield info. for (unsigned i = 0, e = Builder.LLVMBitFields.size(); i != e; ++i) { const LLVMBitFieldInfo &Info = Builder.LLVMBitFields[i]; - + Types.addBitFieldInfo(Info.FD, Info.FieldNo, Info.Start, Info.Size); } - + return new CGRecordLayout(Ty, Builder.ContainsMemberPointer); } |