summaryrefslogtreecommitdiffstats
path: root/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
diff options
context:
space:
mode:
authorNick Kledzik <kledzik@apple.com>2013-12-19 21:58:00 +0000
committerNick Kledzik <kledzik@apple.com>2013-12-19 21:58:00 +0000
commite555277780fc1bfd3c1fccf6b6ab905cc89c993a (patch)
tree88b653613f4cbd836edb0d36dfb28187e917a729 /lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
parent61a57138c281ecc7ed40e9c9068b3fb5ee8c4b11 (diff)
downloadbcm5719-llvm-e555277780fc1bfd3c1fccf6b6ab905cc89c993a.tar.gz
bcm5719-llvm-e555277780fc1bfd3c1fccf6b6ab905cc89c993a.zip
[lld] Introduce registry and Reference kind tuple
The main changes are in: include/lld/Core/Reference.h include/lld/ReaderWriter/Reader.h Everything else is details to support the main change. 1) Registration based Readers Previously, lld had a tangled interdependency with all the Readers. It would have been impossible to make a streamlined linker (say for a JIT) which just supported one file format and one architecture (no yaml, no archives, etc). The old model also required a LinkingContext to read an object file, which would have made .o inspection tools awkward. The new model is that there is a global Registry object. You programmatically register the Readers you want with the registry object. Whenever you need to read/parse a file, you ask the registry to do it, and the registry tries each registered reader. For ease of use with the existing lld code base, there is one Registry object inside the LinkingContext object. 2) Changing kind value to be a tuple Beside Readers, the registry also keeps track of the mapping for Reference Kind values to and from strings. Along with that, this patch also fixes an ambiguity with the previous Reference::Kind values. The problem was that we wanted to reuse existing relocation type values as Reference::Kind values. But then how can the YAML write know how to convert a value to a string? The fix is to change the 32-bit Reference::Kind into a tuple with an 8-bit namespace (e.g. ELF, COFFF, etc), an 8-bit architecture (e.g. x86_64, PowerPC, etc), and a 16-bit value. This tuple system allows conversion to and from strings with no ambiguities. llvm-svn: 197727
Diffstat (limited to 'lld/lib/ReaderWriter/MachO/MachONormalizedFile.h')
-rw-r--r--lld/lib/ReaderWriter/MachO/MachONormalizedFile.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
index d5131147524..211f3374115 100644
--- a/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
+++ b/lld/lib/ReaderWriter/MachO/MachONormalizedFile.h
@@ -260,7 +260,7 @@ writeYaml(const NormalizedFile &file, raw_ostream &out);
/// Takes in-memory normalized dylib or object and parses it into lld::File
ErrorOr<std::unique_ptr<lld::File>>
-normalizedToAtoms(const NormalizedFile &normalizedFile);
+normalizedToAtoms(const NormalizedFile &normalizedFile, StringRef path);
/// Takes atoms and generates a normalized macho-o view.
ErrorOr<std::unique_ptr<NormalizedFile>>
OpenPOWER on IntegriCloud