6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-07-05 13:29:22 +00:00
Code Issues Projects Releases Wiki Activity

Revert "[dsymutil] Accept a YAML debug map as input instead of a binary."

Browse Source 
This reverts commit r238941 while I figure out the bot issues.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238943 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Frederic Riss 2015-06-03 17:08:42 +00:00
parent 001b032fea
commit 57c68eeefe
6 changed files with 24 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/tools/dsymutil/X86/basic-linking-x86.test
View File

@ -6,8 +6,6 @@ RUN: llvm-dsymutil -o %t2 -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_6
RUN: llvm-dwarfdump %t2 | FileCheck %s
RUN: llvm-dsymutil -o - -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-dwarfdump - | FileCheck %s --check-prefix=CHECK --check-prefix=BASIC
RUN: llvm-dsymutil -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-archive.macho.x86_64 | llvm-dwarfdump - | FileCheck %s --check-prefix=CHECK --check-prefix=ARCHIVE
RUN: llvm-dsymutil -dump-debug-map -oso-prepend-path=%p/.. %p/../Inputs/basic.macho.x86_64 | llvm-dsymutil -y -o - - | llvm-dwarfdump - | FileCheck %s --check-prefix=CHECK --check-prefix=BASIC
RUN: llvm-dsymutil -dump-debug-map -oso-prepend-path=%p/.. %p/../Inputs/basic-archive.macho.x86_64 | llvm-dsymutil -o - -oso-prepend-path=%p/.. -y - | llvm-dwarfdump - | FileCheck %s --check-prefix=CHECK --check-prefix=ARCHIVE
CHECK: file format Mach-O 64-bit x86-64

1
test/tools/dsymutil/X86/basic-lto-linking-x86.test
View File

@ -1,6 +1,5 @@
REQUIRES: shell
RUN: llvm-dsymutil -o - -oso-prepend-path=%p/.. %p/../Inputs/basic-lto.macho.x86_64 | llvm-dwarfdump - | FileCheck %s
RUN: llvm-dsymutil -oso-prepend-path=%p/.. -dump-debug-map %p/../Inputs/basic-lto.macho.x86_64 | llvm-dsymutil -o - -oso-prepend-path=%p/.. -y - | llvm-dwarfdump - | FileCheck %s
CHECK: file format Mach-O 64-bit x86-64

48
tools/dsymutil/DebugMap.h
View File

@ -69,7 +69,6 @@ class DebugMap {
/// For YAML IO support.
///@{
friend yaml::MappingTraits<std::unique_ptr<DebugMap>>;
friend yaml::MappingTraits<DebugMap>;
DebugMap() = default;
///@}
@ -185,35 +184,33 @@ struct MappingTraits<std::pair<std::string, DebugMapObject::SymbolMapping>> {
};
template <> struct MappingTraits<dsymutil::DebugMapObject> {
// Normalize/Denormalize between YAML and a DebugMapObject.
struct YamlDMO {
YamlDMO(IO &io) {}
typedef StringMap<dsymutil::DebugMapObject::SymbolMapping> SymbolMap;
YamlDMO(IO &io, dsymutil::DebugMapObject &Obj) {
Filename = Obj.Filename;
Entries.reserve(Obj.Symbols.size());
for (auto &Entry : Obj.Symbols)
struct SequencedStringMap {
SequencedStringMap(IO &io) {}
SequencedStringMap(IO &io, SymbolMap &Map) {
Entries.reserve(Map.size());
for (auto &Entry : Map)
Entries.push_back(std::make_pair(Entry.getKey(), Entry.getValue()));
}
dsymutil::DebugMapObject denormalize(IO &) {
dsymutil::DebugMapObject Res(Filename);
for (auto &Entry : Entries) {
auto &Mapping = Entry.second;
Res.addSymbol(Entry.first, Mapping.ObjectAddress, Mapping.BinaryAddress,
Mapping.Size);
}
SymbolMap denormalize(IO &) {
SymbolMap Res;
for (auto &Entry : Entries)
Res[Entry.first] = Entry.second;
return Res;
}
std::string Filename;
std::vector<dsymutil::DebugMapObject::YAMLSymbolMapping> Entries;
};
static void mapping(IO &io, dsymutil::DebugMapObject &DMO) {
MappingNormalization<YamlDMO, dsymutil::DebugMapObject> Norm(io, DMO);
io.mapRequired("filename", Norm->Filename);
io.mapRequired("symbols", Norm->Entries);
static void mapping(IO &io, dsymutil::DebugMapObject &s) {
MappingNormalization<SequencedStringMap, SymbolMap> seq(io, s.Symbols);
io.mapRequired("filename", s.Filename);
io.mapRequired("symbols", seq->Entries);
}
};
@ -225,7 +222,7 @@ template <> struct ScalarTraits<Triple> {
static StringRef input(StringRef scalar, void *, Triple &value) {
value = Triple(scalar);
return StringRef();
return value.str();
}
static bool mustQuote(StringRef) { return true; }
@ -256,15 +253,6 @@ template <> struct MappingTraits<dsymutil::DebugMap> {
io.mapOptional("objects", DM.Objects);
}
};
template <> struct MappingTraits<std::unique_ptr<dsymutil::DebugMap>> {
static void mapping(IO &io, std::unique_ptr<dsymutil::DebugMap> &DM) {
if (!DM)
DM.reset(new DebugMap());
io.mapRequired("triple", DM->BinaryTriple);
io.mapOptional("objects", DM->Objects);
}
};
}
}

26
tools/dsymutil/MachODebugMapParser.cpp
View File

@ -242,32 +242,12 @@ void MachODebugMapParser::loadMainBinarySymbols() {
}
}
ErrorOr<std::unique_ptr<DebugMap>>
parseYAMLDebugMap(StringRef InputFile, bool Verbose) {
auto ErrOrFile = MemoryBuffer::getFileOrSTDIN(InputFile);
if (auto Err =ErrOrFile.getError())
return Err;
std::unique_ptr<DebugMap> Res;
yaml::Input yin((*ErrOrFile)->getBuffer());
yin >> Res;
if (auto EC = yin.error())
return EC;
return std::move(Res);
}
namespace llvm {
namespace dsymutil {
llvm::ErrorOr<std::unique_ptr<DebugMap>>
parseDebugMap(StringRef InputFile, StringRef PrependPath, bool Verbose, bool InputIsYAML) {
if (!InputIsYAML) {
MachODebugMapParser Parser(InputFile, PrependPath, Verbose);
return Parser.parse();
} else {
return parseYAMLDebugMap(InputFile, Verbose);
}
parseDebugMap(StringRef InputFile, StringRef PrependPath, bool Verbose) {
MachODebugMapParser Parser(InputFile, PrependPath, Verbose);
return Parser.parse();
}
}
}

8
tools/dsymutil/dsymutil.cpp
View File

@ -52,10 +52,6 @@ static opt<bool> DumpDebugMap(
desc("Parse and dump the debug map to standard output. Not DWARF link "
"will take place."),
init(false));
static opt<bool> InputIsYAMLDebugMap(
"y", desc("Treat the input file is a YAML debug map rather than a binary."),
init(false));
}
int main(int argc, char **argv) {
@ -65,9 +61,7 @@ int main(int argc, char **argv) {
LinkOptions Options;
llvm::cl::ParseCommandLineOptions(argc, argv, "llvm dsymutil\n");
auto DebugMapPtrOrErr =
parseDebugMap(InputFile, OsoPrependPath, Verbose, InputIsYAMLDebugMap);
auto DebugMapPtrOrErr = parseDebugMap(InputFile, OsoPrependPath, Verbose);
Options.Verbose = Verbose;
Options.NoOutput = NoOutput;

4
tools/dsymutil/dsymutil.h
View File

@ -34,8 +34,8 @@ struct LinkOptions {
/// \brief Extract the DebugMap from the given file.
/// The file has to be a MachO object file.
llvm::ErrorOr<std::unique_ptr<DebugMap>>
parseDebugMap(StringRef InputFile, StringRef PrependPath,
bool Verbose, bool InputIsYAML);
parseDebugMap(StringRef InputFile, StringRef PrependPath = "",
bool Verbose = false);
/// \brief Link the Dwarf debuginfo as directed by the passed DebugMap
/// \p DM into a DwarfFile named \p OutputFilename.