[llvm-commits] [llvm] r84235 - in /llvm/trunk: include/llvm/MC/MCExpr.h lib/MC/MCAsmStreamer.cpp lib/MC/MCAssembler.cpp
Daniel Dunbar
daniel at zuster.org
Thu Oct 15 18:58:15 PDT 2009
Author: ddunbar
Date: Thu Oct 15 20:58:15 2009
New Revision: 84235
URL: http://llvm.org/viewvc/llvm-project?rev=84235&view=rev
Log:
Minor formatting tweaks.
Modified:
llvm/trunk/include/llvm/MC/MCExpr.h
llvm/trunk/lib/MC/MCAsmStreamer.cpp
llvm/trunk/lib/MC/MCAssembler.cpp
Modified: llvm/trunk/include/llvm/MC/MCExpr.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/MC/MCExpr.h?rev=84235&r1=84234&r2=84235&view=diff
==============================================================================
--- llvm/trunk/include/llvm/MC/MCExpr.h (original)
+++ llvm/trunk/include/llvm/MC/MCExpr.h Thu Oct 15 20:58:15 2009
@@ -121,9 +121,7 @@
static const MCSymbolRefExpr *Create(const MCSymbol *Symbol, MCContext &Ctx);
static const MCSymbolRefExpr *Create(const StringRef &Name, MCContext &Ctx);
-
-
-
+
/// @}
/// @name Accessors
/// @{
Modified: llvm/trunk/lib/MC/MCAsmStreamer.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAsmStreamer.cpp?rev=84235&r1=84234&r2=84235&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCAsmStreamer.cpp (original)
+++ llvm/trunk/lib/MC/MCAsmStreamer.cpp Thu Oct 15 20:58:15 2009
@@ -132,18 +132,18 @@
void MCAsmStreamer::EmitSymbolAttribute(MCSymbol *Symbol,
SymbolAttr Attribute) {
switch (Attribute) {
- case Global: OS << ".globl"; break;
- case Hidden: OS << ".hidden"; break;
+ case Global: OS << ".globl"; break;
+ case Hidden: OS << ".hidden"; break;
case IndirectSymbol: OS << ".indirect_symbol"; break;
- case Internal: OS << ".internal"; break;
- case LazyReference: OS << ".lazy_reference"; break;
- case NoDeadStrip: OS << ".no_dead_strip"; break;
- case PrivateExtern: OS << ".private_extern"; break;
- case Protected: OS << ".protected"; break;
- case Reference: OS << ".reference"; break;
- case Weak: OS << ".weak"; break;
+ case Internal: OS << ".internal"; break;
+ case LazyReference: OS << ".lazy_reference"; break;
+ case NoDeadStrip: OS << ".no_dead_strip"; break;
+ case PrivateExtern: OS << ".private_extern"; break;
+ case Protected: OS << ".protected"; break;
+ case Reference: OS << ".reference"; break;
+ case Weak: OS << ".weak"; break;
case WeakDefinition: OS << ".weak_definition"; break;
- case WeakReference: OS << ".weak_reference"; break;
+ case WeakReference: OS << ".weak_reference"; break;
}
OS << ' ';
Modified: llvm/trunk/lib/MC/MCAssembler.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/MC/MCAssembler.cpp?rev=84235&r1=84234&r2=84235&view=diff
==============================================================================
--- llvm/trunk/lib/MC/MCAssembler.cpp (original)
+++ llvm/trunk/lib/MC/MCAssembler.cpp Thu Oct 15 20:58:15 2009
@@ -51,7 +51,7 @@
Header_Magic32 = 0xFEEDFACE,
Header_Magic64 = 0xFEEDFACF
};
-
+
static const unsigned Header32Size = 28;
static const unsigned Header64Size = 32;
static const unsigned SegmentLoadCommand32Size = 56;
@@ -130,7 +130,7 @@
bool IsLSB;
public:
- MachObjectWriter(raw_ostream &_OS, bool _IsLSB = true)
+ MachObjectWriter(raw_ostream &_OS, bool _IsLSB = true)
: OS(_OS), IsLSB(_IsLSB) {
}
@@ -173,10 +173,10 @@
void WriteZeros(unsigned N) {
const char Zeros[16] = { 0 };
-
+
for (unsigned i = 0, e = N / 16; i != e; ++i)
OS << StringRef(Zeros, 16);
-
+
OS << StringRef(Zeros, N % 16);
}
@@ -187,7 +187,7 @@
}
/// @}
-
+
void WriteHeader32(unsigned NumLoadCommands, unsigned LoadCommandsSize,
bool SubsectionsViaSymbols) {
uint32_t Flags = 0;
@@ -387,7 +387,7 @@
Write32(MSD.StringIndex);
Write8(Type);
Write8(MSD.SectionIndex);
-
+
// The Mach-O streamer uses the lowest 16-bits of the flags for the 'desc'
// value.
Write16(Flags);
@@ -464,7 +464,7 @@
Target.getConstant()))
return ComputeScatteredRelocationInfo(Asm, Fixup, Target,
SymbolMap, Relocs);
-
+
// See <reloc.h>.
uint32_t Address = Fixup.Fragment->getOffset() + Fixup.Offset;
uint32_t Value = 0;
@@ -481,7 +481,7 @@
} else {
const MCSymbol *Symbol = Target.getSymA();
MCSymbolData *SD = SymbolMap.lookup(Symbol);
-
+
if (Symbol->isUndefined()) {
IsExtern = 1;
Index = SD->getIndex();
@@ -517,7 +517,7 @@
(Type << 28));
Relocs.push_back(MRE);
}
-
+
void BindIndirectSymbols(MCAssembler &Asm,
DenseMap<const MCSymbol*,MCSymbolData*> &SymbolMap) {
// This is the point where 'as' creates actual symbols for indirect symbols
@@ -710,7 +710,7 @@
if (NumSymbols)
ComputeSymbolTable(Asm, StringTable, LocalSymbolData, ExternalSymbolData,
UndefinedSymbolData);
-
+
// The section data starts after the header, the segment load command (and
// section headers) and the symbol table.
unsigned NumLoadCommands = 1;
@@ -740,7 +740,7 @@
SectionDataSize = std::max(SectionDataSize,
SD.getAddress() + SD.getSize());
- SectionDataFileSize = std::max(SectionDataFileSize,
+ SectionDataFileSize = std::max(SectionDataFileSize,
SD.getAddress() + SD.getFileSize());
}
@@ -755,9 +755,9 @@
Asm.getSubsectionsViaSymbols());
WriteSegmentLoadCommand32(NumSections, VMSize,
SectionDataStart, SectionDataSize);
-
+
// ... and then the section headers.
- //
+ //
// We also compute the section relocations while we do this. Note that
// compute relocation info will also update the fixup to have the correct
// value; this will be overwrite the appropriate data in the fragment when
@@ -781,7 +781,7 @@
WriteSection32(SD, SectionStart, RelocTableEnd, NumRelocs);
RelocTableEnd += NumRelocs * RelocationInfoSize;
}
-
+
// Write the symbol table load command, if used.
if (NumSymbols) {
unsigned FirstLocalSymbol = 0;
@@ -930,7 +930,7 @@
return 0;
}
-
+
/* *** */
MCSymbolData::MCSymbolData() : Symbol(0) {}
@@ -967,7 +967,7 @@
switch (F.getKind()) {
case MCFragment::FT_Align: {
MCAlignFragment &AF = cast<MCAlignFragment>(F);
-
+
uint64_t Size = OffsetToAlignment(Address, AF.getAlignment());
if (Size > AF.getMaxBytesToEmit())
AF.setFileSize(0);
@@ -1016,12 +1016,12 @@
// FIXME: We need a way to communicate this error.
if (OrgOffset < Offset)
- llvm_report_error("invalid .org offset '" + Twine(OrgOffset) +
+ llvm_report_error("invalid .org offset '" + Twine(OrgOffset) +
"' (at offset '" + Twine(Offset) + "'");
-
+
F.setFileSize(OrgOffset - Offset);
break;
- }
+ }
case MCFragment::FT_ZeroFill: {
MCZeroFillFragment &ZFF = cast<MCZeroFillFragment>(F);
@@ -1053,7 +1053,7 @@
MachObjectWriter &MOW) {
uint64_t Start = OS.tell();
(void) Start;
-
+
++EmittedFragments;
// FIXME: Embed in fragments instead?
@@ -1066,8 +1066,8 @@
// multiple .align directives to enforce the semantics it wants), but is
// severe enough that we want to report it. How to handle this?
if (Count * AF.getValueSize() != AF.getFileSize())
- llvm_report_error("undefined .align directive, value size '" +
- Twine(AF.getValueSize()) +
+ llvm_report_error("undefined .align directive, value size '" +
+ Twine(AF.getValueSize()) +
"' is not a divisor of padding size '" +
Twine(AF.getFileSize()) + "'");
@@ -1121,7 +1121,7 @@
}
break;
}
-
+
case MCFragment::FT_Org: {
MCOrgFragment &OF = cast<MCOrgFragment>(F);
@@ -1151,7 +1151,7 @@
uint64_t Start = OS.tell();
(void) Start;
-
+
for (MCSectionData::const_iterator it = SD.begin(),
ie = SD.end(); it != ie; ++it)
WriteFileData(OS, *it, MOW);
More information about the llvm-commits
mailing list