From 05bc4a6f20fb4bad971dc6ebb86b9ee29307bd3d Mon Sep 17 00:00:00 2001 From: Rafael Espindola Date: Fri, 31 May 2013 20:26:44 +0000 Subject: [PATCH] Don't allocate temporary string for section data. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@183040 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Object/COFFYaml.h | 34 ++++++++++++++++++++++++++++++++-- lib/Object/COFFYAML.cpp | 17 +++++++++++++++++ tools/obj2yaml/coff2yaml.cpp | 20 ++------------------ tools/yaml2obj/yaml2obj.cpp | 17 ++++++++++------- 4 files changed, 61 insertions(+), 27 deletions(-) diff --git a/include/llvm/Object/COFFYaml.h b/include/llvm/Object/COFFYaml.h index 08cbab428c0..f4732e23bc0 100644 --- a/include/llvm/Object/COFFYaml.h +++ b/include/llvm/Object/COFFYaml.h @@ -36,10 +36,34 @@ inline SectionCharacteristics operator|(SectionCharacteristics a, // The structure of the yaml files is not an exact 1:1 match to COFF. In order // to use yaml::IO, we use these structures which are closer to the source. namespace COFFYAML { + /// In an object file this is just a binary blob. In an yaml file it is an hex + /// string. Using this avoid having to allocate temporary strings. + /// FIXME: not COFF specific. + class BinaryRef { + union { + ArrayRef BinaryData; + StringRef HexData; + }; + bool isBinary; + public: + BinaryRef(ArrayRef BinaryData) + : BinaryData(BinaryData), isBinary(true) {} + BinaryRef(StringRef HexData) : HexData(HexData), isBinary(false) {} + BinaryRef() : isBinary(false) {} + StringRef getHex() const { + assert(!isBinary); + return HexData; + } + ArrayRef getBinary() const { + assert(isBinary); + return BinaryData; + } + }; + struct Section { COFF::section Header; unsigned Alignment; - StringRef SectionData; + BinaryRef SectionData; std::vector Relocations; StringRef Name; Section(); @@ -49,7 +73,7 @@ namespace COFFYAML { COFF::symbol Header; COFF::SymbolBaseType SimpleType; COFF::SymbolComplexType ComplexType; - StringRef AuxiliaryData; + BinaryRef AuxiliaryData; StringRef Name; Symbol(); }; @@ -70,6 +94,12 @@ LLVM_YAML_IS_SEQUENCE_VECTOR(COFF::relocation) namespace llvm { namespace yaml { +template<> +struct ScalarTraits { + static void output(const COFFYAML::BinaryRef &, void*, llvm::raw_ostream &); + static StringRef input(StringRef, void*, COFFYAML::BinaryRef &); +}; + template <> struct ScalarEnumerationTraits { static void enumeration(IO &IO, COFF::MachineTypes &Value); diff --git a/lib/Object/COFFYAML.cpp b/lib/Object/COFFYAML.cpp index 7a154525e2a..0ece09f460b 100644 --- a/lib/Object/COFFYAML.cpp +++ b/lib/Object/COFFYAML.cpp @@ -229,6 +229,23 @@ struct NType { } +void ScalarTraits::output(const COFFYAML::BinaryRef &Val, + void *, llvm::raw_ostream &Out) { + ArrayRef Data = Val.getBinary(); + for (ArrayRef::iterator I = Data.begin(), E = Data.end(); I != E; + ++I) { + uint8_t Byte = *I; + Out << hexdigit(Byte >> 4); + Out << hexdigit(Byte & 0xf); + } +} + +StringRef ScalarTraits::input(StringRef Scalar, void *, + COFFYAML::BinaryRef &Val) { + Val = COFFYAML::BinaryRef(Scalar); + return StringRef(); +} + void MappingTraits::mapping(IO &IO, COFF::relocation &Rel) { MappingNormalization NT(IO, Rel.Type); diff --git a/tools/obj2yaml/coff2yaml.cpp b/tools/obj2yaml/coff2yaml.cpp index 0bb3e24c3ca..b41edc1e8a0 100644 --- a/tools/obj2yaml/coff2yaml.cpp +++ b/tools/obj2yaml/coff2yaml.cpp @@ -13,8 +13,6 @@ #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/YAMLTraits.h" -#include - using namespace llvm; namespace { @@ -25,8 +23,6 @@ class COFFDumper { void dumpHeader(const object::coff_file_header *Header); void dumpSections(unsigned numSections); void dumpSymbols(unsigned numSymbols); - StringRef getHexString(ArrayRef Data); - std::list Strings; public: COFFDumper(const object::COFFObjectFile &Obj); @@ -68,7 +64,7 @@ void COFFDumper::dumpSections(unsigned NumSections) { ArrayRef sectionData; Obj.getSectionContents(Sect, sectionData); - Sec.SectionData = getHexString(sectionData); + Sec.SectionData = COFFYAML::BinaryRef(sectionData); std::vector Relocations; for (object::relocation_iterator rIter = iter->begin_relocations(); @@ -100,23 +96,11 @@ void COFFDumper::dumpSymbols(unsigned NumSymbols) { Sym.Header.Value = Symbol->Value; Sym.Header.SectionNumber = Symbol->SectionNumber; Sym.Header.NumberOfAuxSymbols = Symbol->NumberOfAuxSymbols; - Sym.AuxiliaryData = getHexString(Obj.getSymbolAuxData(Symbol)); + Sym.AuxiliaryData = COFFYAML::BinaryRef(Obj.getSymbolAuxData(Symbol)); Symbols.push_back(Sym); } } -StringRef COFFDumper::getHexString(ArrayRef Data) { - std::string S; - for (ArrayRef::iterator I = Data.begin(), E = Data.end(); I != E; - ++I) { - uint8_t Byte = *I; - S.push_back(hexdigit(Byte >> 4)); - S.push_back(hexdigit(Byte & 0xf)); - } - Strings.push_back(S); - return Strings.back(); -} - COFFYAML::Object &COFFDumper::getYAMLObj() { return YAMLObj; } diff --git a/tools/yaml2obj/yaml2obj.cpp b/tools/yaml2obj/yaml2obj.cpp index d9843463cc0..0c285c2fd8c 100644 --- a/tools/yaml2obj/yaml2obj.cpp +++ b/tools/yaml2obj/yaml2obj.cpp @@ -139,8 +139,9 @@ static bool layoutCOFF(COFFParser &CP) { for (std::vector::iterator i = CP.Obj.Sections.begin(), e = CP.Obj.Sections.end(); i != e; ++i) { - if (!i->SectionData.empty()) { - i->Header.SizeOfRawData = i->SectionData.size()/2; + StringRef SecData = i->SectionData.getHex(); + if (!SecData.empty()) { + i->Header.SizeOfRawData = SecData.size()/2; i->Header.PointerToRawData = CurrentSectionDataOffset; CurrentSectionDataOffset += i->Header.SizeOfRawData; if (!i->Relocations.empty()) { @@ -163,7 +164,7 @@ static bool layoutCOFF(COFFParser &CP) { for (std::vector::iterator i = CP.Obj.Symbols.begin(), e = CP.Obj.Symbols.end(); i != e; ++i) { - unsigned AuxBytes = i->AuxiliaryData.size() / 2; + unsigned AuxBytes = i->AuxiliaryData.getHex().size() / 2; if (AuxBytes % COFF::SymbolSize != 0) { errs() << "AuxiliaryData size not a multiple of symbol size!\n"; return false; @@ -248,8 +249,9 @@ bool writeCOFF(COFFParser &CP, raw_ostream &OS) { for (std::vector::iterator i = CP.Obj.Sections.begin(), e = CP.Obj.Sections.end(); i != e; ++i) { - if (!i->SectionData.empty()) { - if (!writeHexData(i->SectionData, OS)) { + StringRef SecData = i->SectionData.getHex(); + if (!SecData.empty()) { + if (!writeHexData(SecData, OS)) { errs() << "SectionData must be a collection of pairs of hex bytes"; return false; } @@ -273,8 +275,9 @@ bool writeCOFF(COFFParser &CP, raw_ostream &OS) { << binary_le(i->Header.Type) << binary_le(i->Header.StorageClass) << binary_le(i->Header.NumberOfAuxSymbols); - if (!i->AuxiliaryData.empty()) { - if (!writeHexData(i->AuxiliaryData, OS)) { + StringRef Data = i->AuxiliaryData.getHex(); + if (!Data.empty()) { + if (!writeHexData(Data, OS)) { errs() << "AuxiliaryData must be a collection of pairs of hex bytes"; return false; } -- 2.34.1