6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-23 01:30:19 +00:00
Code Issues Projects Releases Wiki Activity

Rename obj2yaml local namespace to avoid conflicts with llvm::yaml.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@179922 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Rafael Espindola 2013-04-20 03:16:59 +00:00
parent 9e39d0bc20
commit daf0f44e31
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tools/obj2yaml/coff2yaml.cpp
View File

@ -243,7 +243,7 @@ static raw_ostream &yamlCOFFHeader(const object::coff_file_header *Header,
Out << " Machine: ";
Out << nameLookup(MachineTypePairs, Header->Machine, "# Unknown_MachineTypes")
<< " # (";
return yaml::writeHexNumber(Out, Header->Machine) << ")\n\n";
return objyaml::writeHexNumber(Out, Header->Machine) << ")\n\n";
}
@ -267,12 +267,12 @@ static raw_ostream &yamlCOFFSections(object::COFFObjectFile &Obj,
<< ", ";
writeBitMask(Out, SectionCharacteristicsPairs2, sect->Characteristics);
Out << "] # ";
yaml::writeHexNumber(Out, sect->Characteristics) << '\n';
objyaml::writeHexNumber(Out, sect->Characteristics) << '\n';
ArrayRef<uint8_t> sectionData;
Obj.getSectionContents(sect, sectionData);
Out << " SectionData: ";
yaml::writeHexStream(Out, sectionData) << '\n';
objyaml::writeHexStream(Out, sectionData) << '\n';
if (iter->begin_relocations() != iter->end_relocations())
Out << " Relocations:\n";
for (object::relocation_iterator rIter = iter->begin_relocations();
@ -281,7 +281,7 @@ static raw_ostream &yamlCOFFSections(object::COFFObjectFile &Obj,
Out << " - !Relocation\n";
Out << " VirtualAddress: " ;
yaml::writeHexNumber(Out, reloc->VirtualAddress) << '\n';
objyaml::writeHexNumber(Out, reloc->VirtualAddress) << '\n';
Out << " SymbolTableIndex: " << reloc->SymbolTableIndex << '\n';
Out << " Type: "
<< nameLookup(RelocationTypeX86Pairs, reloc->Type) << '\n';
@ -334,7 +334,7 @@ static raw_ostream& yamlCOFFSymbols(object::COFFObjectFile &Obj,
Out << " NumberOfAuxSymbols: "
<< (int) symbol->NumberOfAuxSymbols << '\n';
Out << " AuxillaryData: ";
yaml::writeHexStream(Out, aux);
objyaml::writeHexStream(Out, aux);
}
Out << '\n';

2
tools/obj2yaml/obj2yaml.cpp
View File

@ -18,7 +18,7 @@
using namespace llvm;
namespace yaml { // generic yaml-writing specific routines
namespace objyaml { // generic yaml-writing specific routines
unsigned char printable(unsigned char Ch) {
return Ch >= ' ' && Ch <= '~' ? Ch : '.';

2
tools/obj2yaml/obj2yaml.h
View File

@ -18,7 +18,7 @@
#include "llvm/Support/raw_ostream.h"
#include "llvm/Support/system_error.h"
namespace yaml { // routines for writing YAML
namespace objyaml { // routines for writing YAML
// Write a hex stream:
// <Prefix> !hex: "<hex digits>" #|<ASCII chars>\n
llvm::raw_ostream &writeHexStream