From 4d0ba668699b74479b1e020a5fdb460d65dbba6e Mon Sep 17 00:00:00 2001 From: Frederic Riss Date: Fri, 5 Jun 2015 20:27:04 +0000 Subject: [PATCH] [dsymutil] Out-line the YAML serialization code. NFC It will get a bit bigger in an upcoming commit. No need to have all of that in the header. Also move parseYAMLDebugMap() to the same place as the serialization code. This way it will be able to share a private Context object with it. llvm-svn: 239185 --- llvm/tools/dsymutil/DebugMap.cpp | 109 ++++++++++++++++++++++++++++ llvm/tools/dsymutil/DebugMap.h | 91 ++++------------------- llvm/tools/dsymutil/MachODebugMapParser.cpp | 25 ++----- 3 files changed, 130 insertions(+), 95 deletions(-) diff --git a/llvm/tools/dsymutil/DebugMap.cpp b/llvm/tools/dsymutil/DebugMap.cpp index dcbba19..5e6cb8c 100644 --- a/llvm/tools/dsymutil/DebugMap.cpp +++ b/llvm/tools/dsymutil/DebugMap.cpp @@ -86,5 +86,114 @@ void DebugMap::print(raw_ostream &OS) const { #ifndef NDEBUG void DebugMap::dump() const { print(errs()); } #endif + +ErrorOr> +DebugMap::parseYAMLDebugMap(StringRef InputFile, StringRef PrependPath, + bool Verbose) { + auto ErrOrFile = MemoryBuffer::getFileOrSTDIN(InputFile); + if (auto Err = ErrOrFile.getError()) + return Err; + + std::unique_ptr Res; + yaml::Input yin((*ErrOrFile)->getBuffer(), &PrependPath); + yin >> Res; + + if (auto EC = yin.error()) + return EC; + + return std::move(Res); +} +} + +namespace yaml { + +// Normalize/Denormalize between YAML and a DebugMapObject. +struct MappingTraits::YamlDMO { + YamlDMO(IO &io) {} + YamlDMO(IO &io, dsymutil::DebugMapObject &Obj); + dsymutil::DebugMapObject denormalize(IO &IO); + + std::string Filename; + std::vector Entries; +}; + +void MappingTraits>:: + mapping(IO &io, std::pair &s) { + io.mapRequired("sym", s.first); + io.mapRequired("objAddr", s.second.ObjectAddress); + io.mapRequired("binAddr", s.second.BinaryAddress); + io.mapOptional("size", s.second.Size); +} + +void MappingTraits::mapping( + IO &io, dsymutil::DebugMapObject &DMO) { + MappingNormalization Norm(io, DMO); + io.mapRequired("filename", Norm->Filename); + io.mapRequired("symbols", Norm->Entries); +} + +void ScalarTraits::output(const Triple &val, void *, + llvm::raw_ostream &out) { + out << val.str(); +} + +StringRef ScalarTraits::input(StringRef scalar, void *, Triple &value) { + value = Triple(scalar); + return StringRef(); +} + +size_t +SequenceTraits>>::size( + IO &io, std::vector> &seq) { + return seq.size(); +} + +dsymutil::DebugMapObject & +SequenceTraits>>::element( + IO &, std::vector> &seq, + size_t index) { + if (index >= seq.size()) { + seq.resize(index + 1); + seq[index].reset(new dsymutil::DebugMapObject); + } + return *seq[index]; +} + +void MappingTraits::mapping(IO &io, + dsymutil::DebugMap &DM) { + io.mapRequired("triple", DM.BinaryTriple); + io.mapOptional("objects", DM.Objects); +} + +void MappingTraits>::mapping( + IO &io, std::unique_ptr &DM) { + if (!DM) + DM.reset(new DebugMap()); + io.mapRequired("triple", DM->BinaryTriple); + io.mapOptional("objects", DM->Objects); +} + +MappingTraits::YamlDMO::YamlDMO( + IO &io, dsymutil::DebugMapObject &Obj) { + Filename = Obj.Filename; + Entries.reserve(Obj.Symbols.size()); + for (auto &Entry : Obj.Symbols) + Entries.push_back(std::make_pair(Entry.getKey(), Entry.getValue())); +} + +dsymutil::DebugMapObject +MappingTraits::YamlDMO::denormalize(IO &IO) { + void *Ctxt = IO.getContext(); + StringRef PrependPath = *reinterpret_cast(Ctxt); + SmallString<80> Path(PrependPath); + sys::path::append(Path, Filename); + dsymutil::DebugMapObject Res(Path); + for (auto &Entry : Entries) { + auto &Mapping = Entry.second; + Res.addSymbol(Entry.first, Mapping.ObjectAddress, Mapping.BinaryAddress, + Mapping.Size); + } + return Res; +} } } diff --git a/llvm/tools/dsymutil/DebugMap.h b/llvm/tools/dsymutil/DebugMap.h index a5dc56e..6f63d7d 100644 --- a/llvm/tools/dsymutil/DebugMap.h +++ b/llvm/tools/dsymutil/DebugMap.h @@ -98,6 +98,10 @@ public: #ifndef NDEBUG void dump() const; #endif + + /// Read a debug map for \a InputFile. + static ErrorOr> + parseYAMLDebugMap(StringRef InputFile, StringRef PrependPath, bool Verbose); }; /// \brief The DebugMapObject represents one object file described by @@ -185,102 +189,37 @@ using namespace llvm::dsymutil; template <> struct MappingTraits> { - - static void - mapping(IO &io, std::pair &s) { - io.mapRequired("sym", s.first); - io.mapRequired("objAddr", s.second.ObjectAddress); - io.mapRequired("binAddr", s.second.BinaryAddress); - io.mapOptional("size", s.second.Size); - } - + static void mapping(IO &io, + std::pair &s); static const bool flow = true; }; template <> struct MappingTraits { - // Normalize/Denormalize between YAML and a DebugMapObject. - struct YamlDMO { - YamlDMO(IO &io) {} - - YamlDMO(IO &io, dsymutil::DebugMapObject &Obj) { - Filename = Obj.Filename; - Entries.reserve(Obj.Symbols.size()); - for (auto &Entry : Obj.Symbols) - Entries.push_back(std::make_pair(Entry.getKey(), Entry.getValue())); - } - - dsymutil::DebugMapObject denormalize(IO &IO) { - void *Ctxt = IO.getContext(); - StringRef PrependPath = *reinterpret_cast(Ctxt); - SmallString<80> Path(PrependPath); - sys::path::append(Path, Filename); - dsymutil::DebugMapObject Res(Path); - for (auto &Entry : Entries) { - auto &Mapping = Entry.second; - Res.addSymbol(Entry.first, Mapping.ObjectAddress, Mapping.BinaryAddress, - Mapping.Size); - } - return Res; - } - - std::string Filename; - std::vector Entries; - }; - - static void mapping(IO &io, dsymutil::DebugMapObject &DMO) { - MappingNormalization Norm(io, DMO); - io.mapRequired("filename", Norm->Filename); - io.mapRequired("symbols", Norm->Entries); - } + struct YamlDMO; + static void mapping(IO &io, dsymutil::DebugMapObject &DMO); }; template <> struct ScalarTraits { - - static void output(const Triple &val, void *, llvm::raw_ostream &out) { - out << val.str(); - } - - static StringRef input(StringRef scalar, void *, Triple &value) { - value = Triple(scalar); - return StringRef(); - } - + static void output(const Triple &val, void *, llvm::raw_ostream &out); + static StringRef input(StringRef scalar, void *, Triple &value); static bool mustQuote(StringRef) { return true; } }; template <> struct SequenceTraits>> { - static size_t - size(IO &io, std::vector> &seq) { - return seq.size(); - } - + size(IO &io, std::vector> &seq); static dsymutil::DebugMapObject & element(IO &, std::vector> &seq, - size_t index) { - if (index >= seq.size()) { - seq.resize(index + 1); - seq[index].reset(new dsymutil::DebugMapObject); - } - return *seq[index]; - } + size_t index); }; template <> struct MappingTraits { - static void mapping(IO &io, dsymutil::DebugMap &DM) { - io.mapRequired("triple", DM.BinaryTriple); - io.mapOptional("objects", DM.Objects); - } + static void mapping(IO &io, dsymutil::DebugMap &DM); }; - template <> struct MappingTraits> { - static void mapping(IO &io, std::unique_ptr &DM) { - if (!DM) - DM.reset(new DebugMap()); - io.mapRequired("triple", DM->BinaryTriple); - io.mapOptional("objects", DM->Objects); - } +template <> struct MappingTraits> { + static void mapping(IO &io, std::unique_ptr &DM); }; } } diff --git a/llvm/tools/dsymutil/MachODebugMapParser.cpp b/llvm/tools/dsymutil/MachODebugMapParser.cpp index 14dafb4..ad2bf5f 100644 --- a/llvm/tools/dsymutil/MachODebugMapParser.cpp +++ b/llvm/tools/dsymutil/MachODebugMapParser.cpp @@ -242,31 +242,18 @@ void MachODebugMapParser::loadMainBinarySymbols() { } } -ErrorOr> -parseYAMLDebugMap(StringRef InputFile, StringRef PrependPath, bool Verbose) { - auto ErrOrFile = MemoryBuffer::getFileOrSTDIN(InputFile); - if (auto Err =ErrOrFile.getError()) - return Err; - - std::unique_ptr Res; - yaml::Input yin((*ErrOrFile)->getBuffer(), &PrependPath); - yin >> Res; - - if (auto EC = yin.error()) - return EC; - - return std::move(Res); -} - namespace llvm { namespace dsymutil { -llvm::ErrorOr> -parseDebugMap(StringRef InputFile, StringRef PrependPath, bool Verbose, bool InputIsYAML) { + +llvm::ErrorOr> parseDebugMap(StringRef InputFile, + StringRef PrependPath, + bool Verbose, + bool InputIsYAML) { if (!InputIsYAML) { MachODebugMapParser Parser(InputFile, PrependPath, Verbose); return Parser.parse(); } else { - return parseYAMLDebugMap(InputFile, PrependPath, Verbose); + return DebugMap::parseYAMLDebugMap(InputFile, PrependPath, Verbose); } } } -- 2.7.4