<div dir="ltr">MSan doesn't like your change:<div><a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/13302/steps/check-llvm%20msan/logs/stdio">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-fast/builds/13302/steps/check-llvm%20msan/logs/stdio</a><br></div><div><br></div><div>Try adding a default member initializer for these fields:</div><div><span style="font-size:12.8px">+struct ExportEntry {</span><br style="font-size:12.8px"><span style="font-size:12.8px">+ uint64_t TerminalSize;</span><br style="font-size:12.8px"><span style="font-size:12.8px">+ uint64_t NodeOffset;</span><br></div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 31, 2016 at 10:26 AM, Chris Bieneman via llvm-commits <span dir="ltr"><<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: cbieneman<br>
Date: Tue May 31 12:26:36 2016<br>
New Revision: 271300<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=271300&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=271300&view=rev</a><br>
Log:<br>
[obj2yaml][yaml2obj] Support for reading and dumping the MachO export trie<br>
<br>
The MachO export trie is a serially encoded trie keyed by symbol name. This code parses the trie and preserves the structure so that it can be dumped again.<br>
<br>
Added:<br>
llvm/trunk/test/ObjectYAML/MachO/export_trie.yaml<br>
Modified:<br>
llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h<br>
llvm/trunk/lib/ObjectYAML/MachOYAML.cpp<br>
llvm/trunk/tools/obj2yaml/macho2yaml.cpp<br>
llvm/trunk/tools/yaml2obj/yaml2macho.cpp<br>
<br>
Modified: llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h?rev=271300&r1=271299&r2=271300&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h?rev=271300&r1=271299&r2=271300&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h (original)<br>
+++ llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h Tue May 31 12:26:36 2016<br>
@@ -71,11 +71,23 @@ struct BindOpcode {<br>
StringRef Symbol;<br>
};<br>
<br>
+struct ExportEntry {<br>
+ uint64_t TerminalSize;<br>
+ uint64_t NodeOffset;<br>
+ std::string Name;<br>
+ llvm::yaml::Hex64 Flags;<br>
+ llvm::yaml::Hex64 Address;<br>
+ llvm::yaml::Hex64 Other;<br>
+ std::string ImportName;<br>
+ std::vector<MachOYAML::ExportEntry> Children;<br>
+};<br>
+<br>
struct LinkEditData {<br>
std::vector<MachOYAML::RebaseOpcode> RebaseOpcodes;<br>
std::vector<MachOYAML::BindOpcode> BindOpcodes;<br>
std::vector<MachOYAML::BindOpcode> WeakBindOpcodes;<br>
std::vector<MachOYAML::BindOpcode> LazyBindOpcodes;<br>
+ MachOYAML::ExportEntry ExportTrie;<br>
};<br>
<br>
struct Object {<br>
@@ -95,6 +107,7 @@ LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::yaml:<br>
LLVM_YAML_IS_SEQUENCE_VECTOR(int64_t)<br>
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::RebaseOpcode)<br>
LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::BindOpcode)<br>
+LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::ExportEntry)<br>
<br>
namespace llvm {<br>
namespace yaml {<br>
@@ -123,6 +136,10 @@ template <> struct MappingTraits<MachOYA<br>
static void mapping(IO &IO, MachOYAML::BindOpcode &BindOpcode);<br>
};<br>
<br>
+template <> struct MappingTraits<MachOYAML::ExportEntry> {<br>
+ static void mapping(IO &IO, MachOYAML::ExportEntry &ExportEntry);<br>
+};<br>
+<br>
template <> struct MappingTraits<MachOYAML::Section> {<br>
static void mapping(IO &IO, MachOYAML::Section &Section);<br>
};<br>
<br>
Modified: llvm/trunk/lib/ObjectYAML/MachOYAML.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/MachOYAML.cpp?rev=271300&r1=271299&r2=271300&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/MachOYAML.cpp?rev=271300&r1=271299&r2=271300&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/ObjectYAML/MachOYAML.cpp (original)<br>
+++ llvm/trunk/lib/ObjectYAML/MachOYAML.cpp Tue May 31 12:26:36 2016<br>
@@ -103,6 +103,7 @@ void MappingTraits<MachOYAML::LinkEditDa<br>
IO.mapOptional("BindOpcodes", LinkEditData.BindOpcodes);<br>
IO.mapOptional("WeakBindOpcodes", LinkEditData.WeakBindOpcodes);<br>
IO.mapOptional("LazyBindOpcodes", LinkEditData.LazyBindOpcodes);<br>
+ IO.mapOptional("ExportTrie", LinkEditData.ExportTrie);<br>
}<br>
<br>
void MappingTraits<MachOYAML::RebaseOpcode>::mapping(<br>
@@ -121,6 +122,18 @@ void MappingTraits<MachOYAML::BindOpcode<br>
IO.mapOptional("Symbol", BindOpcode.Symbol);<br>
}<br>
<br>
+void MappingTraits<MachOYAML::ExportEntry>::mapping(<br>
+ IO &IO, MachOYAML::ExportEntry &ExportEntry) {<br>
+ IO.mapRequired("TerminalSize", ExportEntry.TerminalSize);<br>
+ IO.mapOptional("NodeOffset", ExportEntry.NodeOffset);<br>
+ IO.mapOptional("Name", ExportEntry.Name);<br>
+ IO.mapOptional("Flags", ExportEntry.Flags);<br>
+ IO.mapOptional("Address", ExportEntry.Address);<br>
+ IO.mapOptional("Other", ExportEntry.Other);<br>
+ IO.mapOptional("ImportName", ExportEntry.ImportName);<br>
+ IO.mapOptional("Children", ExportEntry.Children);<br>
+}<br>
+<br>
template <typename StructType><br>
void mapLoadCommandData(IO &IO, MachOYAML::LoadCommand &LoadCommand) {}<br>
<br>
@@ -141,6 +154,12 @@ void mapLoadCommandData<MachO::dylib_com<br>
IO &IO, MachOYAML::LoadCommand &LoadCommand) {<br>
IO.mapOptional("PayloadString", LoadCommand.PayloadString);<br>
}<br>
+<br>
+template <><br>
+void mapLoadCommandData<MachO::rpath_command>(<br>
+ IO &IO, MachOYAML::LoadCommand &LoadCommand) {<br>
+ IO.mapOptional("PayloadString", LoadCommand.PayloadString);<br>
+}<br>
<br>
template <><br>
void mapLoadCommandData<MachO::dylinker_command>(<br>
<br>
Added: llvm/trunk/test/ObjectYAML/MachO/export_trie.yaml<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ObjectYAML/MachO/export_trie.yaml?rev=271300&view=auto" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ObjectYAML/MachO/export_trie.yaml?rev=271300&view=auto</a><br>
==============================================================================<br>
--- llvm/trunk/test/ObjectYAML/MachO/export_trie.yaml (added)<br>
+++ llvm/trunk/test/ObjectYAML/MachO/export_trie.yaml Tue May 31 12:26:36 2016<br>
@@ -0,0 +1,191 @@<br>
+# RUN: yaml2obj -format=macho %s | obj2yaml | FileCheck %s<br>
+<br>
+--- !mach-o<br>
+FileHeader:<br>
+ magic: 0xFEEDFACF<br>
+ cputype: 0x01000007<br>
+ cpusubtype: 0x80000003<br>
+ filetype: 0x00000002<br>
+ ncmds: 16<br>
+ sizeofcmds: 1408<br>
+ flags: 0x00218085<br>
+ reserved: 0x00000000<br>
+LoadCommands:<br>
+ - cmd: LC_SEGMENT_64<br>
+ cmdsize: 72<br>
+ segname: __PAGEZERO<br>
+ vmaddr: 0<br>
+ vmsize: 4294967296<br>
+ fileoff: 0<br>
+ filesize: 0<br>
+ maxprot: 0<br>
+ initprot: 0<br>
+ nsects: 0<br>
+ flags: 0<br>
+ - cmd: LC_SEGMENT_64<br>
+ cmdsize: 552<br>
+ segname: __TEXT<br>
+ vmaddr: 4294967296<br>
+ vmsize: 8192<br>
+ fileoff: 0<br>
+ filesize: 8192<br>
+ maxprot: 7<br>
+ initprot: 5<br>
+ nsects: 6<br>
+ flags: 0<br>
+ - cmd: LC_SEGMENT_64<br>
+ cmdsize: 312<br>
+ segname: __DATA<br>
+ vmaddr: 4294975488<br>
+ vmsize: 4096<br>
+ fileoff: 8192<br>
+ filesize: 4096<br>
+ maxprot: 7<br>
+ initprot: 3<br>
+ nsects: 3<br>
+ flags: 0<br>
+ - cmd: LC_SEGMENT_64<br>
+ cmdsize: 72<br>
+ segname: __LINKEDIT<br>
+ vmaddr: 4294979584<br>
+ vmsize: 4096<br>
+ fileoff: 12288<br>
+ filesize: 2508<br>
+ maxprot: 7<br>
+ initprot: 1<br>
+ nsects: 0<br>
+ flags: 0<br>
+ - cmd: LC_DYLD_INFO_ONLY<br>
+ cmdsize: 48<br>
+ rebase_off: 12288<br>
+ rebase_size: 8<br>
+ bind_off: 12296<br>
+ bind_size: 96<br>
+ weak_bind_off: 0<br>
+ weak_bind_size: 0<br>
+ lazy_bind_off: 12392<br>
+ lazy_bind_size: 624<br>
+ export_off: 13016<br>
+ export_size: 48<br>
+ - cmd: LC_SYMTAB<br>
+ cmdsize: 24<br>
+ symoff: 13080<br>
+ nsyms: 30<br>
+ stroff: 13700<br>
+ strsize: 1096<br>
+ - cmd: LC_DYSYMTAB<br>
+ cmdsize: 80<br>
+ ilocalsym: 0<br>
+ nlocalsym: 9<br>
+ iextdefsym: 9<br>
+ nextdefsym: 2<br>
+ iundefsym: 11<br>
+ nundefsym: 19<br>
+ tocoff: 0<br>
+ ntoc: 0<br>
+ modtaboff: 0<br>
+ nmodtab: 0<br>
+ extrefsymoff: 0<br>
+ nextrefsyms: 0<br>
+ indirectsymoff: 13560<br>
+ nindirectsyms: 35<br>
+ extreloff: 0<br>
+ nextrel: 0<br>
+ locreloff: 0<br>
+ nlocrel: 0<br>
+ - cmd: LC_LOAD_DYLINKER<br>
+ cmdsize: 32<br>
+ name: 12<br>
+ PayloadString: /usr/lib/dyld<br>
+ ZeroPadBytes: 7<br>
+ - cmd: LC_UUID<br>
+ cmdsize: 24<br>
+ uuid: 461A1B28-822F-3F38-B670-645419E636F5<br>
+ - cmd: LC_VERSION_MIN_MACOSX<br>
+ cmdsize: 16<br>
+ version: 658176<br>
+ sdk: 658176<br>
+ - cmd: LC_SOURCE_VERSION<br>
+ cmdsize: 16<br>
+ version: 0<br>
+ - cmd: LC_MAIN<br>
+ cmdsize: 24<br>
+ entryoff: 4448<br>
+ stacksize: 0<br>
+ - cmd: LC_LOAD_DYLIB<br>
+ cmdsize: 48<br>
+ dylib:<br>
+ name: 24<br>
+ timestamp: 2<br>
+ current_version: 7864576<br>
+ compatibility_version: 65536<br>
+ PayloadString: '/usr/lib/libc++.1.dylib'<br>
+ ZeroPadBytes: 1<br>
+ - cmd: LC_LOAD_DYLIB<br>
+ cmdsize: 56<br>
+ dylib:<br>
+ name: 24<br>
+ timestamp: 2<br>
+ current_version: 80349697<br>
+ compatibility_version: 65536<br>
+ PayloadString: /usr/lib/libSystem.B.dylib<br>
+ ZeroPadBytes: 6<br>
+ - cmd: LC_FUNCTION_STARTS<br>
+ cmdsize: 16<br>
+ dataoff: 13064<br>
+ datasize: 16<br>
+ - cmd: LC_DATA_IN_CODE<br>
+ cmdsize: 16<br>
+ dataoff: 13080<br>
+ datasize: 0<br>
+LinkEditData:<br>
+ ExportTrie:<br>
+ TerminalSize: 0<br>
+ NodeOffset: 0<br>
+ Name: ''<br>
+ Flags: 0x0000000000000000<br>
+ Address: 0x0000000000000000<br>
+ Other: 0x0000000000000000<br>
+ ImportName: ''<br>
+ Children:<br>
+ - TerminalSize: 0<br>
+ NodeOffset: 5<br>
+ Name: _<br>
+ Flags: 0x0000000000000000<br>
+ Address: 0x0000000000000000<br>
+ Other: 0x0000000000000000<br>
+ ImportName: ''<br>
+ Children:<br>
+ - TerminalSize: 2<br>
+ NodeOffset: 33<br>
+ Name: _mh_execute_header<br>
+ Flags: 0x0000000000000000<br>
+ Address: 0x0000000000000000<br>
+ Other: 0x0000000000000000<br>
+ ImportName: ''<br>
+ - TerminalSize: 3<br>
+ NodeOffset: 37<br>
+ Name: main<br>
+ Flags: 0x0000000000000000<br>
+ Address: 0x0000000000001160<br>
+ Other: 0x0000000000000000<br>
+ ImportName: ''<br>
+...<br>
+<br>
+#CHECK: ExportTrie:<br>
+#CHECK: TerminalSize: 0<br>
+#CHECK: NodeOffset: 0<br>
+#CHECK: Name: ''<br>
+#CHECK: Children:<br>
+#CHECK: - TerminalSize: 0<br>
+#CHECK: NodeOffset: 5<br>
+#CHECK: Name: _<br>
+#CHECK: Children:<br>
+#CHECK: - TerminalSize: 2<br>
+#CHECK: NodeOffset: 33<br>
+#CHECK: Name: _mh_execute_header<br>
+#CHECK: Address: 0x0000000000000000<br>
+#CHECK: - TerminalSize: 3<br>
+#CHECK: NodeOffset: 37<br>
+#CHECK: Name: main<br>
+#CHECK: Address: 0x0000000000001160<br>
<br>
Modified: llvm/trunk/tools/obj2yaml/macho2yaml.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/macho2yaml.cpp?rev=271300&r1=271299&r2=271300&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/macho2yaml.cpp?rev=271300&r1=271299&r2=271300&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/obj2yaml/macho2yaml.cpp (original)<br>
+++ llvm/trunk/tools/obj2yaml/macho2yaml.cpp Tue May 31 12:26:36 2016<br>
@@ -32,6 +32,7 @@ class MachODumper {<br>
void dumpRebaseOpcodes(std::unique_ptr<MachOYAML::Object> &Y);<br>
void dumpBindOpcodes(std::vector<MachOYAML::BindOpcode> &BindOpcodes,<br>
ArrayRef<uint8_t> OpcodeBuffer, bool Lazy = false);<br>
+ void dumpExportTrie(std::unique_ptr<MachOYAML::Object> &Y);<br>
<br>
public:<br>
MachODumper(const object::MachOObjectFile &O) : Obj(O) {}<br>
@@ -149,6 +150,13 @@ const char *MachODumper::processLoadComm<br>
return readString<MachO::dylinker_command>(LC, LoadCmd);<br>
}<br>
<br>
+template <><br>
+const char *MachODumper::processLoadCommandData<MachO::rpath_command>(<br>
+ MachOYAML::LoadCommand &LC,<br>
+ const llvm::object::MachOObjectFile::LoadCommandInfo &LoadCmd) {<br>
+ return readString<MachO::rpath_command>(LC, LoadCmd);<br>
+}<br>
+<br>
Expected<std::unique_ptr<MachOYAML::Object>> MachODumper::dump() {<br>
auto Y = make_unique<MachOYAML::Object>();<br>
dumpHeader(Y);<br>
@@ -199,8 +207,9 @@ void MachODumper::dumpLinkEdit(std::uniq<br>
dumpBindOpcodes(Y->LinkEdit.BindOpcodes, Obj.getDyldInfoBindOpcodes());<br>
dumpBindOpcodes(Y->LinkEdit.WeakBindOpcodes,<br>
Obj.getDyldInfoWeakBindOpcodes());<br>
- dumpBindOpcodes(Y->LinkEdit.LazyBindOpcodes,<br>
- Obj.getDyldInfoLazyBindOpcodes(), true);<br>
+ dumpBindOpcodes(Y->LinkEdit.LazyBindOpcodes, Obj.getDyldInfoLazyBindOpcodes(),<br>
+ true);<br>
+ dumpExportTrie(Y);<br>
}<br>
<br>
void MachODumper::dumpRebaseOpcodes(std::unique_ptr<MachOYAML::Object> &Y) {<br>
@@ -244,6 +253,13 @@ void MachODumper::dumpRebaseOpcodes(std:<br>
}<br>
}<br>
<br>
+StringRef ReadStringRef(const uint8_t *Start) {<br>
+ const uint8_t *Itr = Start;<br>
+ for (; *Itr; ++Itr)<br>
+ ;<br>
+ return StringRef(reinterpret_cast<const char *>(Start), Itr - Start);<br>
+}<br>
+<br>
void MachODumper::dumpBindOpcodes(<br>
std::vector<MachOYAML::BindOpcode> &BindOpcodes,<br>
ArrayRef<uint8_t> OpcodeBuffer, bool Lazy) {<br>
@@ -257,7 +273,6 @@ void MachODumper::dumpBindOpcodes(<br>
unsigned Count;<br>
uint64_t ULEB = 0;<br>
int64_t SLEB = 0;<br>
- const uint8_t *SymStart;<br>
<br>
switch (BindOp.Opcode) {<br>
case MachO::BIND_OPCODE_DO_BIND_ULEB_TIMES_SKIPPING_ULEB:<br>
@@ -282,12 +297,8 @@ void MachODumper::dumpBindOpcodes(<br>
break;<br>
<br>
case MachO::BIND_OPCODE_SET_SYMBOL_TRAILING_FLAGS_IMM:<br>
- SymStart = ++OpCode;<br>
- while (*OpCode) {<br>
- ++OpCode;<br>
- }<br>
- BindOp.Symbol = StringRef(reinterpret_cast<const char *>(SymStart),<br>
- OpCode - SymStart);<br>
+ BindOp.Symbol = ReadStringRef(OpCode + 1);<br>
+ OpCode += BindOp.Symbol.size() + 1;<br>
break;<br>
default:<br>
break;<br>
@@ -302,6 +313,117 @@ void MachODumper::dumpBindOpcodes(<br>
}<br>
}<br>
<br>
+/*!<br>
+ * /brief processes a node from the export trie, and its children.<br>
+ *<br>
+ * To my knowledge there is no documentation of the encoded format of this data<br>
+ * other than in the heads of the Apple linker engineers. To that end hopefully<br>
+ * this comment and the implementation below can serve to light the way for<br>
+ * anyone crazy enough to come down this path in the future.<br>
+ *<br>
+ * This function reads and preserves the trie structure of the export trie. To<br>
+ * my knowledge there is no code anywhere else that reads the data and preserves<br>
+ * the Trie. LD64 (sources available at <a href="http://opensource.apple.com" rel="noreferrer" target="_blank">opensource.apple.com</a>) has a similar<br>
+ * implementation that parses the export trie into a vector. That code as well<br>
+ * as LLVM's libObject MachO implementation were the basis for this.<br>
+ *<br>
+ * The export trie is an encoded trie. The node serialization is a bit awkward.<br>
+ * The below pseudo-code is the best description I've come up with for it.<br>
+ *<br>
+ * struct SerializedNode {<br>
+ * ULEB128 TerminalSize;<br>
+ * struct TerminalData { <-- This is only present if TerminalSize > 0<br>
+ * ULEB128 Flags;<br>
+ * ULEB128 Address; <-- Present if (! Flags & REEXPORT )<br>
+ * ULEB128 Other; <-- Present if ( Flags & REEXPORT ||<br>
+ * Flags & STUB_AND_RESOLVER )<br>
+ * char[] ImportName; <-- Present if ( Flags & REEXPORT )<br>
+ * }<br>
+ * uint8_t ChildrenCount;<br>
+ * Pair<char[], ULEB128> ChildNameOffsetPair[ChildrenCount];<br>
+ * SerializedNode Children[ChildrenCount]<br>
+ * }<br>
+ *<br>
+ * Terminal nodes are nodes that represent actual exports. They can appear<br>
+ * anywhere in the tree other than at the root; they do not need to be leaf<br>
+ * nodes. When reading the data out of the trie this routine reads it in-order,<br>
+ * but it puts the child names and offsets directly into the child nodes. This<br>
+ * results in looping over the children twice during serialization and<br>
+ * de-serialization, but it makes the YAML representation more human readable.<br>
+ *<br>
+ * Below is an example of the graph from a "Hello World" executable:<br>
+ *<br>
+ * -------<br>
+ * | '' |<br>
+ * -------<br>
+ * |<br>
+ * -------<br>
+ * | '_' |<br>
+ * -------<br>
+ * |<br>
+ * |----------------------------------------|<br>
+ * | |<br>
+ * ------------------------ ---------------------<br>
+ * | '_mh_execute_header' | | 'main' |<br>
+ * | Flags: 0x00000000 | | Flags: 0x00000000 |<br>
+ * | Addr: 0x00000000 | | Addr: 0x00001160 |<br>
+ * ------------------------ ---------------------<br>
+ *<br>
+ * This graph represents the trie for the exports "__mh_execute_header" and<br>
+ * "_main". In the graph only the "_main" and "__mh_execute_header" nodes are<br>
+ * terminal.<br>
+*/<br>
+<br>
+const uint8_t *processExportNode(const uint8_t *CurrPtr,<br>
+ const uint8_t *const End,<br>
+ MachOYAML::ExportEntry &Entry) {<br>
+ if (CurrPtr >= End)<br>
+ return CurrPtr;<br>
+ unsigned Count = 0;<br>
+ Entry.TerminalSize = decodeULEB128(CurrPtr, &Count);<br>
+ CurrPtr += Count;<br>
+ if (Entry.TerminalSize != 0) {<br>
+ Entry.Flags = decodeULEB128(CurrPtr, &Count);<br>
+ CurrPtr += Count;<br>
+ if (Entry.Flags & MachO::EXPORT_SYMBOL_FLAGS_REEXPORT) {<br>
+ Entry.Address = 0;<br>
+ Entry.Other = decodeULEB128(CurrPtr, &Count);<br>
+ CurrPtr += Count;<br>
+ Entry.ImportName = std::string(reinterpret_cast<const char *>(CurrPtr));<br>
+ } else {<br>
+ Entry.Address = decodeULEB128(CurrPtr, &Count);<br>
+ CurrPtr += Count;<br>
+ if (Entry.Flags & MachO::EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER) {<br>
+ Entry.Other = decodeULEB128(CurrPtr, &Count);<br>
+ CurrPtr += Count;<br>
+ } else<br>
+ Entry.Other = 0;<br>
+ }<br>
+ }<br>
+ uint8_t childrenCount = *CurrPtr++;<br>
+ if (childrenCount == 0)<br>
+ return CurrPtr;<br>
+<br>
+ Entry.Children.insert(Entry.Children.begin(), (size_t)childrenCount,<br>
+ MachOYAML::ExportEntry());<br>
+ for (auto &Child : Entry.Children) {<br>
+ Child.Name = std::string(reinterpret_cast<const char *>(CurrPtr));<br>
+ CurrPtr += Child.Name.length() + 1;<br>
+ Child.NodeOffset = decodeULEB128(CurrPtr, &Count);<br>
+ CurrPtr += Count;<br>
+ }<br>
+ for (auto &Child : Entry.Children) {<br>
+ CurrPtr = processExportNode(CurrPtr, End, Child);<br>
+ }<br>
+ return CurrPtr;<br>
+}<br>
+<br>
+void MachODumper::dumpExportTrie(std::unique_ptr<MachOYAML::Object> &Y) {<br>
+ MachOYAML::LinkEditData &LEData = Y->LinkEdit;<br>
+ auto ExportsTrie = Obj.getDyldInfoExportsTrie();<br>
+ processExportNode(ExportsTrie.begin(), ExportsTrie.end(), LEData.ExportTrie);<br>
+}<br>
+<br>
Error macho2yaml(raw_ostream &Out, const object::MachOObjectFile &Obj) {<br>
MachODumper Dumper(Obj);<br>
Expected<std::unique_ptr<MachOYAML::Object>> YAML = Dumper.dump();<br>
<br>
Modified: llvm/trunk/tools/yaml2obj/yaml2macho.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2macho.cpp?rev=271300&r1=271299&r2=271300&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2macho.cpp?rev=271300&r1=271299&r2=271300&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/yaml2obj/yaml2macho.cpp (original)<br>
+++ llvm/trunk/tools/yaml2obj/yaml2macho.cpp Tue May 31 12:26:36 2016<br>
@@ -48,7 +48,9 @@ private:<br>
Error writeLinkEditData(raw_ostream &OS);<br>
void writeBindOpcodes(raw_ostream &OS, uint64_t offset,<br>
std::vector<MachOYAML::BindOpcode> &BindOpcodes);<br>
+ Error writeExportTrie(raw_ostream &OS);<br>
<br>
+ void dumpExportEntry(raw_ostream &OS, MachOYAML::ExportEntry &Entry);<br>
void ZeroToOffset(raw_ostream &OS, size_t offset);<br>
<br>
MachOYAML::Object &Obj;<br>
@@ -161,6 +163,12 @@ size_t writeLoadCommandData<MachO::dylin<br>
return writePayloadString(LC, OS);<br>
}<br>
<br>
+template <><br>
+size_t writeLoadCommandData<MachO::rpath_command>(MachOYAML::LoadCommand &LC,<br>
+ raw_ostream &OS) {<br>
+ return writePayloadString(LC, OS);<br>
+}<br>
+<br>
void ZeroFillBytes(raw_ostream &OS, size_t Size) {<br>
std::vector<uint8_t> FillData;<br>
FillData.insert(FillData.begin(), Size, 0);<br>
@@ -282,9 +290,39 @@ void MachOWriter::writeBindOpcodes(<br>
}<br>
if (!Opcode.Symbol.empty()) {<br>
OS.write(Opcode.Symbol.data(), Opcode.Symbol.size());<br>
- OS.write("\0", 1);<br>
+ OS.write('\0');<br>
+ }<br>
+ }<br>
+}<br>
+<br>
+void MachOWriter::dumpExportEntry(raw_ostream &OS, MachOYAML::ExportEntry &Entry) {<br>
+ encodeSLEB128(Entry.TerminalSize, OS);<br>
+ if (Entry.TerminalSize > 0) {<br>
+ encodeSLEB128(Entry.Flags, OS);<br>
+ if ( Entry.Flags & MachO::EXPORT_SYMBOL_FLAGS_REEXPORT ) {<br>
+ encodeSLEB128(Entry.Other, OS);<br>
+ OS << Entry.ImportName;<br>
+ OS.write('\0');<br>
+ }<br>
+ else {<br>
+ encodeSLEB128(Entry.Address, OS);<br>
+ if (Entry.Flags & MachO::EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER)<br>
+ encodeSLEB128(Entry.Other, OS);<br>
}<br>
}<br>
+ OS.write(static_cast<uint8_t>(Entry.Children.size()));<br>
+ for (auto EE : Entry.Children){<br>
+ OS << EE.Name;<br>
+ OS.write('\0');<br>
+ encodeSLEB128(EE.NodeOffset, OS);<br>
+ }<br>
+ for (auto EE : Entry.Children)<br>
+ dumpExportEntry(OS, EE);<br>
+}<br>
+<br>
+Error MachOWriter::writeExportTrie(raw_ostream &OS) {<br>
+ dumpExportEntry(OS, Obj.LinkEdit.ExportTrie);<br>
+ return Error::success();<br>
}<br>
<br>
Error MachOWriter::writeLinkEditData(raw_ostream &OS) {<br>
@@ -318,6 +356,10 @@ Error MachOWriter::writeLinkEditData(raw<br>
writeBindOpcodes(OS, DyldInfoOnlyCmd->lazy_bind_off,<br>
LinkEdit.LazyBindOpcodes);<br>
<br>
+ ZeroToOffset(OS, DyldInfoOnlyCmd->export_off);<br>
+ if(auto Err = writeExportTrie(OS))<br>
+ return Err;<br>
+<br>
// Fill to the end of the string table<br>
ZeroToOffset(OS, SymtabCmd->stroff + SymtabCmd->strsize);<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div>