6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-03-12 17:37:13 +00:00
Code Issues Projects Releases Wiki Activity

MC/Mach-O: Factor out getOrCreateDataFragment().

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@99204 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2010-03-22 20:35:46 +00:00
parent 2a6e3f5be2
commit f70f477024
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
lib/MC/MCMachOStreamer.cpp
View File

@ -57,6 +57,15 @@ private:
return 0; return 0;
} }
/// Get a data fragment to write into, creating a new one if the current
/// fragment is not a data fragment.
MCDataFragment *getOrCreateDataFragment() const {
MCDataFragment *F = dyn_cast_or_null<MCDataFragment>(getCurrentFragment());
if (!F)
F = new MCDataFragment(CurSectionData);
return F;
}
public: public:
MCMachOStreamer(MCContext &Context, TargetAsmBackend &TAB, MCMachOStreamer(MCContext &Context, TargetAsmBackend &TAB,
raw_ostream &_OS, MCCodeEmitter *_Emitter) raw_ostream &_OS, MCCodeEmitter *_Emitter)
@ -150,11 +159,11 @@ void MCMachOStreamer::SwitchSection(const MCSection *Section) {
void MCMachOStreamer::EmitLabel(MCSymbol *Symbol) { void MCMachOStreamer::EmitLabel(MCSymbol *Symbol) {
assert(Symbol->isUndefined() && "Cannot define a symbol twice!"); assert(Symbol->isUndefined() && "Cannot define a symbol twice!");
// FIXME: We should also use offsets into Fill fragments. // FIXME: This is wasteful, we don't necessarily need to create a data
MCDataFragment *F = dyn_cast_or_null<MCDataFragment>(getCurrentFragment()); // fragment. Instead, we should mark the symbol as pointing into the data
if (!F) // fragment if it exists, otherwise we should just queue the label and set its
F = new MCDataFragment(CurSectionData); // fragment pointer when we emit the next fragment.
MCDataFragment *F = getOrCreateDataFragment();
MCSymbolData &SD = Assembler.getOrCreateSymbolData(*Symbol); MCSymbolData &SD = Assembler.getOrCreateSymbolData(*Symbol);
assert(!SD.getFragment() && "Unexpected fragment on symbol data!"); assert(!SD.getFragment() && "Unexpected fragment on symbol data!");
SD.setFragment(F); SD.setFragment(F);
@ -307,17 +316,12 @@ void MCMachOStreamer::EmitZerofill(const MCSection *Section, MCSymbol *Symbol,
} }
void MCMachOStreamer::EmitBytes(StringRef Data, unsigned AddrSpace) { void MCMachOStreamer::EmitBytes(StringRef Data, unsigned AddrSpace) {
MCDataFragment *DF = dyn_cast_or_null<MCDataFragment>(getCurrentFragment()); getOrCreateDataFragment()->getContents().append(Data.begin(), Data.end());
if (!DF)
DF = new MCDataFragment(CurSectionData);
DF->getContents().append(Data.begin(), Data.end());
} }
void MCMachOStreamer::EmitValue(const MCExpr *Value, unsigned Size, void MCMachOStreamer::EmitValue(const MCExpr *Value, unsigned Size,
unsigned AddrSpace) { unsigned AddrSpace) {
MCDataFragment *DF = dyn_cast_or_null<MCDataFragment>(getCurrentFragment()); MCDataFragment *DF = getOrCreateDataFragment();
if (!DF)
DF = new MCDataFragment(CurSectionData);
// Avoid fixups when possible. // Avoid fixups when possible.
int64_t AbsValue; int64_t AbsValue;
@ -349,7 +353,7 @@ void MCMachOStreamer::EmitCodeAlignment(unsigned ByteAlignment,
unsigned MaxBytesToEmit) { unsigned MaxBytesToEmit) {
if (MaxBytesToEmit == 0) if (MaxBytesToEmit == 0)
MaxBytesToEmit = ByteAlignment; MaxBytesToEmit = ByteAlignment;
// FIXME the 0x90 is the default x86 1 byte nop opcode. // FIXME: The 0x90 is the default x86 1 byte nop opcode.
new MCAlignFragment(ByteAlignment, 0x90, 1, MaxBytesToEmit, new MCAlignFragment(ByteAlignment, 0x90, 1, MaxBytesToEmit,
true /* EmitNops */, CurSectionData); true /* EmitNops */, CurSectionData);
@ -378,9 +382,7 @@ void MCMachOStreamer::EmitInstruction(const MCInst &Inst) {
VecOS.flush(); VecOS.flush();
// Add the fixups and data. // Add the fixups and data.
MCDataFragment *DF = dyn_cast_or_null<MCDataFragment>(getCurrentFragment()); MCDataFragment *DF = getOrCreateDataFragment();
if (!DF)
DF = new MCDataFragment(CurSectionData);
for (unsigned i = 0, e = Fixups.size(); i != e; ++i) { for (unsigned i = 0, e = Fixups.size(); i != e; ++i) {
MCFixup &F = Fixups[i]; MCFixup &F = Fixups[i];
DF->addFixup(MCAsmFixup(DF->getContents().size()+F.getOffset(), DF->addFixup(MCAsmFixup(DF->getContents().size()+F.getOffset(),