/// Size - The size of this fragment.
uint64_t Size;
- /// Alignment - The alignment for this fragment.
- unsigned Alignment;
-
public:
- MCZeroFillFragment(uint64_t _Size, unsigned _Alignment, MCSectionData *SD = 0)
- : MCFragment(FT_ZeroFill, SD),
- Size(_Size), Alignment(_Alignment) {}
+ MCZeroFillFragment(uint64_t _Size, MCSectionData *SD = 0)
+ : MCFragment(FT_ZeroFill, SD), Size(_Size) {}
/// @name Accessors
/// @{
uint64_t getSize() const { return Size; }
- unsigned getAlignment() const { return Alignment; }
-
/// @}
static bool classof(const MCFragment *F) {
}
case MCFragment::FT_ZeroFill: {
- MCZeroFillFragment &ZFF = cast<MCZeroFillFragment>(F);
-
- // Align the fragment offset; it is safe to adjust the offset freely since
- // this is only in virtual sections.
- //
- // FIXME: We shouldn't be doing this here.
- Address = RoundUpToAlignment(Address, ZFF.getAlignment());
- Layout.setFragmentOffset(&F, Address - StartAddress);
-
- EffectiveSize = ZFF.getSize();
+ EffectiveSize = cast<MCZeroFillFragment>(F).getSize();
break;
}
}
MCAlignFragment &AF = cast<MCAlignFragment>(F);
uint64_t Count = FragmentSize / AF.getValueSize();
+ assert(AF.getValueSize() && "Invalid virtual align in concrete fragment!");
+
// FIXME: This error shouldn't actually occur (the front end should emit
// multiple .align directives to enforce the semantics it wants), but is
// severe enough that we want to report it. How to handle this?
OS << "<MCZeroFillFragment ";
this->MCFragment::dump();
OS << "\n ";
- OS << " Size:" << getSize() << " Alignment:" << getAlignment() << ">";
+ OS << " Size:" << getSize() << ">";
}
void MCSectionData::dump() {
MCSymbolData &SD = Assembler.getOrCreateSymbolData(*Symbol);
- MCFragment *F = new MCZeroFillFragment(Size, ByteAlignment, &SectData);
+ // Emit an align fragment if necessary.
+ if (ByteAlignment != 1)
+ new MCAlignFragment(ByteAlignment, 0, 0, ByteAlignment, /*EmitNops=*/false,
+ &SectData);
+
+ MCFragment *F = new MCZeroFillFragment(Size, &SectData);
SD.setFragment(F);
if (Assembler.isSymbolLinkerVisible(&SD))
F->setAtom(&SD);