X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FMC%2FMCAsmLayout.h;h=cf79216d076a29d4cd0312a6eb167eadb3d5f68e;hb=d7802bf0ddcac16ee910105922492aee86a53e1b;hp=9b9cdf2c8d914d1902b5f2f46a264811be31a7b4;hpb=432cd5fd9b4c97f1e4a53fcf45e16f7dd6bc085e;p=oota-llvm.git

diff --git a/include/llvm/MC/MCAsmLayout.h b/include/llvm/MC/MCAsmLayout.h
index 9b9cdf2c8d9..cf79216d076 100644
--- a/include/llvm/MC/MCAsmLayout.h
+++ b/include/llvm/MC/MCAsmLayout.h
@@ -10,6 +10,9 @@
 #ifndef LLVM_MC_MCASMLAYOUT_H
 #define LLVM_MC_MCASMLAYOUT_H
 
+#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/SmallVector.h"
+
 namespace llvm {
 class MCAssembler;
 class MCFragment;
@@ -24,28 +27,77 @@ class MCSymbolData;
 /// efficiently compute the exact addresses of any symbol in the assembly file,
 /// even during the relaxation process.
 class MCAsmLayout {
+public:
+  typedef llvm::SmallVectorImpl<MCSectionData*>::const_iterator const_iterator;
+  typedef llvm::SmallVectorImpl<MCSectionData*>::iterator iterator;
+
 private:
   MCAssembler &Assembler;
 
+  /// List of sections in layout order.
+  llvm::SmallVector<MCSectionData*, 16> SectionOrder;
+
+  /// The last fragment which was laid out, or 0 if nothing has been laid
+  /// out. Fragments are always laid out in order, so all fragments with a
+  /// lower ordinal will be up to date.
+  mutable DenseMap<const MCSectionData*, MCFragment *> LastValidFragment;
+
+  /// \brief Make sure that the layout for the given fragment is valid, lazily
+  /// computing it if necessary.
+  void EnsureValid(const MCFragment *F) const;
+
+  bool isFragmentUpToDate(const MCFragment *F) const;
+
 public:
-  MCAsmLayout(MCAssembler &_Assembler) : Assembler(_Assembler) {}
+  MCAsmLayout(MCAssembler &_Assembler);
 
   /// Get the assembler object this is a layout for.
   MCAssembler &getAssembler() const { return Assembler; }
 
-  uint64_t getFragmentAddress(const MCFragment *F) const;
+  /// \brief Invalidate all following fragments because a fragment has been
+  /// resized. The fragments size should have already been updated.
+  void Invalidate(MCFragment *F);
+
+  /// \brief Perform layout for a single fragment, assuming that the previous
+  /// fragment has already been laid out correctly, and the parent section has
+  /// been initialized.
+  void LayoutFragment(MCFragment *Fragment);
+
+  /// @name Section Access (in layout order)
+  /// @{
 
-  uint64_t getFragmentEffectiveSize(const MCFragment *F) const;
-  void setFragmentEffectiveSize(MCFragment *F, uint64_t Value);
+  llvm::SmallVectorImpl<MCSectionData*> &getSectionOrder() {
+    return SectionOrder;
+  }
+  const llvm::SmallVectorImpl<MCSectionData*> &getSectionOrder() const {
+    return SectionOrder;
+  }
 
+  /// @}
+  /// @name Fragment Layout Data
+  /// @{
+
+  /// \brief Get the offset of the given fragment inside its containing section.
   uint64_t getFragmentOffset(const MCFragment *F) const;
-  void setFragmentOffset(MCFragment *F, uint64_t Value);
 
-  uint64_t getSectionAddress(const MCSectionData *SD) const;
+  /// @}
+  /// @name Utility Functions
+  /// @{
+
+  /// \brief Get the address space size of the given section, as it effects
+  /// layout. This may differ from the size reported by \see getSectionSize() by
+  /// not including section tail padding.
+  uint64_t getSectionAddressSize(const MCSectionData *SD) const;
+
+  /// \brief Get the data size of the given section, as emitted to the object
+  /// file. This may include additional padding, or be 0 for virtual sections.
+  uint64_t getSectionFileSize(const MCSectionData *SD) const;
 
-  uint64_t getSymbolAddress(const MCSymbolData *SD) const;
+  /// \brief Get the offset of the given symbol, as computed in the current
+  /// layout.
+  uint64_t getSymbolOffset(const MCSymbolData *SD) const;
 
-  void setSectionAddress(MCSectionData *SD, uint64_t Value);
+  /// @}
 };
 
 } // end namespace llvm