[llvm-commits] [llvm] r103438 - in /llvm/trunk: include/llvm/MC/MCAssembler.h lib/MC/MCAssembler.cpp lib/MC/MCMachOStreamer.cpp
Daniel Dunbar
daniel at zuster.org
Mon May 10 15:45:09 PDT 2010
Author: ddunbar
Date: Mon May 10 17:45:09 2010
New Revision: 103438
URL: http://llvm.org/viewvc/llvm-project?rev=103438&view=rev
Log:
MC/Mach-O: Explicitly track atoms, as represented by their defining symbol, for each fragment (not yet used).
Modified:
llvm/trunk/include/llvm/MC/MCAssembler.h
llvm/trunk/lib/MC/MCAssembler.cpp
llvm/trunk/lib/MC/MCMachOStreamer.cpp
Modified: llvm/trunk/include/llvm/MC/MCAssembler.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCAssembler.h?rev=103438&r1=103437&r2=103438&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCAssembler.h (original)
+++ llvm/trunk/include/llvm/MC/MCAssembler.h Mon May 10 17:45:09 2010
@@ -32,6 +32,7 @@
class MCSection;
class MCSectionData;
class MCSymbol;
+class MCSymbolData;
class MCValue;
class TargetAsmBackend;
@@ -78,6 +79,11 @@
/// Parent - The data for the section this fragment is in.
MCSectionData *Parent;
+ /// Atom - The atom this fragment is in, as represented by it's defining
+ /// symbol. Atom's are only used by backends which set
+ /// \see MCAsmBackend::hasReliableSymbolDifference().
+ MCSymbolData *Atom;
+
/// @name Assembler Backend Data
/// @{
//
@@ -110,6 +116,9 @@
MCSectionData *getParent() const { return Parent; }
void setParent(MCSectionData *Value) { Parent = Value; }
+ MCSymbolData *getAtom() const { return Atom; }
+ void setAtom(MCSymbolData *Value) { Atom = Value; }
+
unsigned getOrdinal() const { return Ordinal; }
void setOrdinal(unsigned Value) { Ordinal = Value; }
Modified: llvm/trunk/lib/MC/MCAssembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAssembler.cpp?rev=103438&r1=103437&r2=103438&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCAssembler.cpp (original)
+++ llvm/trunk/lib/MC/MCAssembler.cpp Mon May 10 17:45:09 2010
@@ -133,17 +133,13 @@
SD->FileSize = Value;
}
- /// @}
-
/* *** */
MCFragment::MCFragment() : Kind(FragmentType(~0)) {
}
MCFragment::MCFragment(FragmentType _Kind, MCSectionData *_Parent)
- : Kind(_Kind),
- Parent(_Parent),
- EffectiveSize(~UINT64_C(0))
+ : Kind(_Kind), Parent(_Parent), Atom(0), EffectiveSize(~UINT64_C(0))
{
if (Parent)
Parent->getFragmentList().push_back(this);
Modified: llvm/trunk/lib/MC/MCMachOStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCMachOStreamer.cpp?rev=103438&r1=103437&r2=103438&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCMachOStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCMachOStreamer.cpp Mon May 10 17:45:09 2010
@@ -31,6 +31,9 @@
MCAssembler Assembler;
MCSectionData *CurSectionData;
+ /// Track the current atom for each section.
+ DenseMap<const MCSectionData*, MCSymbolData*> CurrentAtomMap;
+
private:
MCFragment *getCurrentFragment() const {
assert(CurSectionData && "No current section!");
@@ -46,10 +49,17 @@
MCDataFragment *getOrCreateDataFragment() const {
MCDataFragment *F = dyn_cast_or_null<MCDataFragment>(getCurrentFragment());
if (!F)
- F = new MCDataFragment(CurSectionData);
+ F = createDataFragment();
return F;
}
+ /// Create a new data fragment in the current section.
+ MCDataFragment *createDataFragment() const {
+ MCDataFragment *DF = new MCDataFragment(CurSectionData);
+ DF->setAtom(CurrentAtomMap.lookup(CurSectionData));
+ return DF;
+ }
+
public:
MCMachOStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &_OS, MCCodeEmitter *_Emitter)
@@ -159,12 +169,23 @@
assert(!Symbol->isVariable() && "Cannot emit a variable symbol!");
assert(CurSection && "Cannot emit before setting section!");
+ MCSymbolData &SD = Assembler.getOrCreateSymbolData(*Symbol);
+
+ // Update the current atom map, if necessary.
+ bool MustCreateFragment = false;
+ if (Assembler.isSymbolLinkerVisible(&SD)) {
+ CurrentAtomMap[CurSectionData] = &SD;
+
+ // We have to create a new fragment, fragments cannot span atoms.
+ MustCreateFragment = true;
+ }
+
// FIXME: This is wasteful, we don't necessarily need to create a data
// fragment. Instead, we should mark the symbol as pointing into the data
// fragment if it exists, otherwise we should just queue the label and set its
// fragment pointer when we emit the next fragment.
- MCDataFragment *F = getOrCreateDataFragment();
- MCSymbolData &SD = Assembler.getOrCreateSymbolData(*Symbol);
+ MCDataFragment *F =
+ MustCreateFragment ? createDataFragment() : getOrCreateDataFragment();
assert(!SD.getFragment() && "Unexpected fragment on symbol data!");
SD.setFragment(F);
SD.setOffset(F->getContents().size());
@@ -302,6 +323,8 @@
MCFragment *F = new MCZeroFillFragment(Size, ByteAlignment, &SectData);
SD.setFragment(F);
+ if (Assembler.isSymbolLinkerVisible(&SD))
+ F->setAtom(&SD);
Symbol->setSection(*Section);
@@ -336,8 +359,10 @@
unsigned MaxBytesToEmit) {
if (MaxBytesToEmit == 0)
MaxBytesToEmit = ByteAlignment;
- new MCAlignFragment(ByteAlignment, Value, ValueSize, MaxBytesToEmit,
- false /* EmitNops */, CurSectionData);
+ MCFragment *F = new MCAlignFragment(ByteAlignment, Value, ValueSize,
+ MaxBytesToEmit, /*EmitNops=*/false,
+ CurSectionData);
+ F->setAtom(CurrentAtomMap.lookup(CurSectionData));
// Update the maximum alignment on the current section if necessary.
if (ByteAlignment > CurSectionData->getAlignment())
@@ -348,8 +373,9 @@
unsigned MaxBytesToEmit) {
if (MaxBytesToEmit == 0)
MaxBytesToEmit = ByteAlignment;
- new MCAlignFragment(ByteAlignment, 0, 1, MaxBytesToEmit,
- true /* EmitNops */, CurSectionData);
+ MCFragment *F = new MCAlignFragment(ByteAlignment, 0, 1, MaxBytesToEmit,
+ /*EmitNops=*/true, CurSectionData);
+ F->setAtom(CurrentAtomMap.lookup(CurSectionData));
// Update the maximum alignment on the current section if necessary.
if (ByteAlignment > CurSectionData->getAlignment())
@@ -358,7 +384,8 @@
void MCMachOStreamer::EmitValueToOffset(const MCExpr *Offset,
unsigned char Value) {
- new MCOrgFragment(*Offset, Value, CurSectionData);
+ MCFragment *F = new MCOrgFragment(*Offset, Value, CurSectionData);
+ F->setAtom(CurrentAtomMap.lookup(CurSectionData));
}
void MCMachOStreamer::EmitInstruction(const MCInst &Inst) {
@@ -401,6 +428,7 @@
// are going to often know that we can never fully resolve a fixup.
if (Assembler.getBackend().MayNeedRelaxation(Inst, AsmFixups)) {
MCInstFragment *IF = new MCInstFragment(Inst, CurSectionData);
+ IF->setAtom(CurrentAtomMap.lookup(CurSectionData));
// Add the fixups and data.
//
More information about the llvm-commits
mailing list