Last in the series of removing unnecessary '0' arguments for

address space. Reordered the EmitULEB128IntValue arguments to
make this easier.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171949 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher
2013-01-09 03:52:05 +00:00
parent 47579cf390
commit 1ced208be9
12 changed files with 22 additions and 22 deletions

View File

@ -400,8 +400,8 @@ namespace llvm {
/// EmitULEB128Value - Special case of EmitULEB128Value that avoids the /// EmitULEB128Value - Special case of EmitULEB128Value that avoids the
/// client having to pass in a MCExpr for constant integers. /// client having to pass in a MCExpr for constant integers.
void EmitULEB128IntValue(uint64_t Value, unsigned AddrSpace = 0, void EmitULEB128IntValue(uint64_t Value, unsigned Padding = 0,
unsigned Padding = 0); unsigned AddrSpace = 0);
/// EmitSLEB128Value - Special case of EmitSLEB128Value that avoids the /// EmitSLEB128Value - Special case of EmitSLEB128Value that avoids the
/// client having to pass in a MCExpr for constant integers. /// client having to pass in a MCExpr for constant integers.

View File

@ -46,7 +46,7 @@ void AsmPrinter::EmitULEB128(unsigned Value, const char *Desc,
if (isVerbose() && Desc) if (isVerbose() && Desc)
OutStreamer.AddComment(Desc); OutStreamer.AddComment(Desc);
OutStreamer.EmitULEB128IntValue(Value, 0/*addrspace*/, PadTo); OutStreamer.EmitULEB128IntValue(Value, PadTo);
} }
/// EmitCFAByte - Emit a .byte 42 directive for a DW_CFA_xxx value. /// EmitCFAByte - Emit a .byte 42 directive for a DW_CFA_xxx value.

View File

@ -173,7 +173,7 @@ void DwarfAccelTable::EmitOffsets(AsmPrinter *Asm, MCSymbol *SecBegin) {
MCBinaryExpr::CreateSub(MCSymbolRefExpr::Create((*HI)->Sym, Context), MCBinaryExpr::CreateSub(MCSymbolRefExpr::Create((*HI)->Sym, Context),
MCSymbolRefExpr::Create(SecBegin, Context), MCSymbolRefExpr::Create(SecBegin, Context),
Context); Context);
Asm->OutStreamer.EmitValue(Sub, sizeof(uint32_t), 0); Asm->OutStreamer.EmitValue(Sub, sizeof(uint32_t));
} }
} }
} }

View File

@ -2160,7 +2160,7 @@ void DwarfUnits::emitStrings(const MCSection *StrSection,
unsigned offset = 0; unsigned offset = 0;
unsigned size = 4; unsigned size = 4;
for (unsigned i = 0, e = Entries.size(); i != e; ++i) { for (unsigned i = 0, e = Entries.size(); i != e; ++i) {
Asm->OutStreamer.EmitIntValue(offset, size, 0); Asm->OutStreamer.EmitIntValue(offset, size);
offset += Entries[i].second->getKeyLength() + 1; offset += Entries[i].second->getKeyLength() + 1;
} }
} }
@ -2201,8 +2201,8 @@ void DwarfDebug::emitDebugLoc() {
Asm->OutStreamer.EmitIntValue(0, Size); Asm->OutStreamer.EmitIntValue(0, Size);
Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("debug_loc", index)); Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("debug_loc", index));
} else { } else {
Asm->OutStreamer.EmitSymbolValue(Entry.Begin, Size, 0); Asm->OutStreamer.EmitSymbolValue(Entry.Begin, Size);
Asm->OutStreamer.EmitSymbolValue(Entry.End, Size, 0); Asm->OutStreamer.EmitSymbolValue(Entry.End, Size);
DIVariable DV(Entry.Variable); DIVariable DV(Entry.Variable);
Asm->OutStreamer.AddComment("Loc expr size"); Asm->OutStreamer.AddComment("Loc expr size");
MCSymbol *begin = Asm->OutStreamer.getContext().CreateTempSymbol(); MCSymbol *begin = Asm->OutStreamer.getContext().CreateTempSymbol();
@ -2288,7 +2288,7 @@ void DwarfDebug::emitDebugRanges() {
I = DebugRangeSymbols.begin(), E = DebugRangeSymbols.end(); I = DebugRangeSymbols.begin(), E = DebugRangeSymbols.end();
I != E; ++I) { I != E; ++I) {
if (*I) if (*I)
Asm->OutStreamer.EmitSymbolValue(const_cast<MCSymbol*>(*I), Size, 0); Asm->OutStreamer.EmitSymbolValue(const_cast<MCSymbol*>(*I), Size);
else else
Asm->OutStreamer.EmitIntValue(0, Size); Asm->OutStreamer.EmitIntValue(0, Size);
} }
@ -2374,7 +2374,7 @@ void DwarfDebug::emitDebugInlineInfo() {
if (Asm->isVerbose()) Asm->OutStreamer.AddComment("low_pc"); if (Asm->isVerbose()) Asm->OutStreamer.AddComment("low_pc");
Asm->OutStreamer.EmitSymbolValue(LI->first, Asm->OutStreamer.EmitSymbolValue(LI->first,
Asm->getDataLayout().getPointerSize(),0); Asm->getDataLayout().getPointerSize());
} }
} }

View File

@ -145,7 +145,7 @@ void OcamlGCMetadataPrinter::finishAssembly(AsmPrinter &AP) {
"Live root count "+Twine(LiveCount)+" >= 65536."); "Live root count "+Twine(LiveCount)+" >= 65536.");
} }
AP.OutStreamer.EmitSymbolValue(J->Label, IntPtrSize, 0); AP.OutStreamer.EmitSymbolValue(J->Label, IntPtrSize);
AP.EmitInt16(FrameSize); AP.EmitInt16(FrameSize);
AP.EmitInt16(LiveCount); AP.EmitInt16(LiveCount);

View File

@ -469,7 +469,7 @@ void MCELFStreamer::FinishImpl() {
} }
void MCELFStreamer::EmitTCEntry(const MCSymbol &S) { void MCELFStreamer::EmitTCEntry(const MCSymbol &S) {
// Creates a R_PPC64_TOC relocation // Creates a R_PPC64_TOC relocation
MCObjectStreamer::EmitSymbolValue(&S, 8, 0); MCObjectStreamer::EmitSymbolValue(&S, 8);
} }
MCStreamer *llvm::createELFStreamer(MCContext &Context, MCAsmBackend &MAB, MCStreamer *llvm::createELFStreamer(MCContext &Context, MCAsmBackend &MAB,

View File

@ -104,8 +104,8 @@ void MCStreamer::EmitIntValue(uint64_t Value, unsigned Size,
/// EmitULEB128Value - Special case of EmitULEB128Value that avoids the /// EmitULEB128Value - Special case of EmitULEB128Value that avoids the
/// client having to pass in a MCExpr for constant integers. /// client having to pass in a MCExpr for constant integers.
void MCStreamer::EmitULEB128IntValue(uint64_t Value, unsigned AddrSpace, void MCStreamer::EmitULEB128IntValue(uint64_t Value, unsigned Padding,
unsigned Padding) { unsigned AddrSpace) {
SmallString<128> Tmp; SmallString<128> Tmp;
raw_svector_ostream OSE(Tmp); raw_svector_ostream OSE(Tmp);
encodeULEB128(Value, OSE, Padding); encodeULEB128(Value, OSE, Padding);

View File

@ -192,11 +192,11 @@ namespace {
// emit each field as its type (ULEB or String) // emit each field as its type (ULEB or String)
for (unsigned int i=0; i<Contents.size(); ++i) { for (unsigned int i=0; i<Contents.size(); ++i) {
AttributeItemType item = Contents[i]; AttributeItemType item = Contents[i];
Streamer.EmitULEB128IntValue(item.Tag, 0); Streamer.EmitULEB128IntValue(item.Tag);
switch (item.Type) { switch (item.Type) {
default: llvm_unreachable("Invalid attribute type"); default: llvm_unreachable("Invalid attribute type");
case AttributeItemType::NumericAttribute: case AttributeItemType::NumericAttribute:
Streamer.EmitULEB128IntValue(item.IntValue, 0); Streamer.EmitULEB128IntValue(item.IntValue);
break; break;
case AttributeItemType::TextAttribute: case AttributeItemType::TextAttribute:
Streamer.EmitBytes(item.StringValue.upper()); Streamer.EmitBytes(item.StringValue.upper());
@ -657,7 +657,7 @@ void ARMAsmPrinter::EmitEndOfAsmFile(Module &M) {
if (MCSym.getInt()) if (MCSym.getInt())
// External to current translation unit. // External to current translation unit.
OutStreamer.EmitIntValue(0, 4/*size*/, 0/*addrspace*/); OutStreamer.EmitIntValue(0, 4/*size*/);
else else
// Internal to current translation unit. // Internal to current translation unit.
// //
@ -667,7 +667,7 @@ void ARMAsmPrinter::EmitEndOfAsmFile(Module &M) {
// We need to fill in the value for the NLP in those cases. // We need to fill in the value for the NLP in those cases.
OutStreamer.EmitValue(MCSymbolRefExpr::Create(MCSym.getPointer(), OutStreamer.EmitValue(MCSymbolRefExpr::Create(MCSym.getPointer(),
OutContext), OutContext),
4/*size*/, 0/*addrspace*/); 4/*size*/);
} }
Stubs.clear(); Stubs.clear();
@ -685,7 +685,7 @@ void ARMAsmPrinter::EmitEndOfAsmFile(Module &M) {
OutStreamer.EmitValue(MCSymbolRefExpr:: OutStreamer.EmitValue(MCSymbolRefExpr::
Create(Stubs[i].second.getPointer(), Create(Stubs[i].second.getPointer(),
OutContext), OutContext),
4/*size*/, 0/*addrspace*/); 4/*size*/);
} }
Stubs.clear(); Stubs.clear();

View File

@ -7649,7 +7649,7 @@ bool ARMAsmParser::parseDirectiveWord(unsigned Size, SMLoc L) {
if (getParser().ParseExpression(Value)) if (getParser().ParseExpression(Value))
return true; return true;
getParser().getStreamer().EmitValue(Value, Size, 0/*addrspace*/); getParser().getStreamer().EmitValue(Value, Size);
if (getLexer().is(AsmToken::EndOfStatement)) if (getLexer().is(AsmToken::EndOfStatement))
break; break;

View File

@ -540,7 +540,7 @@ bool MBlazeAsmParser::ParseDirectiveWord(unsigned Size, SMLoc L) {
if (getParser().ParseExpression(Value)) if (getParser().ParseExpression(Value))
return true; return true;
getParser().getStreamer().EmitValue(Value, Size, 0 /*addrspace*/); getParser().getStreamer().EmitValue(Value, Size);
if (getLexer().is(AsmToken::EndOfStatement)) if (getLexer().is(AsmToken::EndOfStatement))
break; break;

View File

@ -2017,7 +2017,7 @@ bool X86AsmParser::ParseDirectiveWord(unsigned Size, SMLoc L) {
if (getParser().ParseExpression(Value)) if (getParser().ParseExpression(Value))
return true; return true;
getParser().getStreamer().EmitValue(Value, Size, 0 /*addrspace*/); getParser().getStreamer().EmitValue(Value, Size);
if (getLexer().is(AsmToken::EndOfStatement)) if (getLexer().is(AsmToken::EndOfStatement))
break; break;

View File

@ -171,7 +171,7 @@ void XCoreAsmPrinter::EmitGlobalVariable(const GlobalVariable *GV) {
// The ABI requires that unsigned scalar types smaller than 32 bits // The ABI requires that unsigned scalar types smaller than 32 bits
// are padded to 32 bits. // are padded to 32 bits.
if (Size < 4) if (Size < 4)
OutStreamer.EmitZeros(4 - Size, 0); OutStreamer.EmitZeros(4 - Size);
// Mark the end of the global // Mark the end of the global
OutStreamer.EmitRawText("\t.cc_bottom " + Twine(GVSym->getName()) + ".data"); OutStreamer.EmitRawText("\t.cc_bottom " + Twine(GVSym->getName()) + ".data");