<div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jun 23, 2016 at 3:01 PM, Chris Bieneman <span dir="ltr"><<a href="mailto:beanz@apple.com" target="_blank">beanz@apple.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><div style="word-wrap:break-word"><br><div><span class=""><blockquote type="cite"><div>On Jun 23, 2016, at 2:40 PM, Sean Silva <<a href="mailto:chisophugis@gmail.com" target="_blank">chisophugis@gmail.com</a>> wrote:</div><br><div><div dir="ltr"><div>It seems like this commit violates strict aliasing (which is UB).</div><div><br></div><div><div>/home/sean/pg/llvm-project/llvm-project/llvm/lib/ObjectYAML/MachOYAML.cpp:184:75: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing]</div><div> "cmd", (MachO::LoadCommandType &)LoadCommand.Data.load_command_data.cmd);</div><div> ^</div><div>Can you fix it? A safe fix is to have a local variable of MachO::LoadCommandType and memcpy'ing the data in/out of it as needed.</div></div></div></div></blockquote><div><br></div></span><div>I’m pretty sure this is actually a gcc bug. LoadCommandType is a uint32_t</div></div></div></blockquote><div><br></div><div>Not quite; it is an enum (albeit one with explicit underlying type). I'm not sure about the rules for enums with explicit underlying type. This post gives a pretty convincing argument that in fact it is treated as a different type from an aliasing perspective: <a href="http://stackoverflow.com/a/24634262">http://stackoverflow.com/a/24634262</a></div><div><br></div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><div style="word-wrap:break-word"><div><div>, so the cast is from uint32_t to uint32_t, which shouldn’t violate aliasing rules.</div><div><br></div><div>When I build with -Wstrict-aliasing and ubsan using clang I don’t see any issues.</div></div></div></blockquote><div><br></div><div>Regardless, this causes us to have a non-warning-free build. Could you fix it?</div><div><br></div><div>-- Sean Silva</div><div> </div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex"><div style="word-wrap:break-word"><div><span class=""><font color="#888888"><div><br></div><div>-Chris</div></font></span><div><div class="h5"><br><blockquote type="cite"><div><div dir="ltr"><div><br></div><div>-- Sean Silva</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 17, 2016 at 12:44 PM, 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:0px 0px 0px 0.8ex;border-left-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);padding-left:1ex">Author: cbieneman<br>
Date: Tue May 17 14:44:06 2016<br>
New Revision: 269808<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=269808&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=269808&view=rev</a><br>
Log:<br>
Reapply r269782 "[obj2yaml] [yaml2obj] Support for MachO load command structures""<br>
<br>
This adds support for all the MachO *_command structures. The load_command payloads still are not represented, but that will come next.<br>
<br>
Modified:<br>
llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h<br>
llvm/trunk/include/llvm/Support/MachO.def<br>
llvm/trunk/include/llvm/Support/MachO.h<br>
llvm/trunk/lib/ObjectYAML/MachOYAML.cpp<br>
llvm/trunk/test/ObjectYAML/MachO/load_commands.yaml<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=269808&r1=269807&r2=269808&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h?rev=269808&r1=269807&r2=269808&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h (original)<br>
+++ llvm/trunk/include/llvm/ObjectYAML/MachOYAML.h Tue May 17 14:44:06 2016<br>
@@ -35,19 +35,18 @@ struct FileHeader {<br>
<br>
struct LoadCommand {<br>
virtual ~LoadCommand();<br>
- MachO::LoadCommandType cmd;<br>
- uint32_t cmdsize;<br>
+ llvm::MachO::macho_load_command Data;<br>
};<br>
<br>
struct Object {<br>
FileHeader Header;<br>
- std::vector<std::unique_ptr<LoadCommand>> LoadCommands;<br>
+ std::vector<LoadCommand> LoadCommands;<br>
};<br>
<br>
} // namespace llvm::MachOYAML<br>
} // namespace llvm<br>
<br>
-LLVM_YAML_IS_SEQUENCE_VECTOR(std::unique_ptr<llvm::MachOYAML::LoadCommand>)<br>
+LLVM_YAML_IS_SEQUENCE_VECTOR(llvm::MachOYAML::LoadCommand)<br>
<br>
namespace llvm {<br>
namespace yaml {<br>
@@ -60,12 +59,11 @@ template <> struct MappingTraits<MachOYA<br>
static void mapping(IO &IO, MachOYAML::Object &Object);<br>
};<br>
<br>
-template <> struct MappingTraits<std::unique_ptr<MachOYAML::LoadCommand>> {<br>
- static void mapping(IO &IO,<br>
- std::unique_ptr<MachOYAML::LoadCommand> &LoadCommand);<br>
+template <> struct MappingTraits<MachOYAML::LoadCommand> {<br>
+ static void mapping(IO &IO, MachOYAML::LoadCommand &LoadCommand);<br>
};<br>
<br>
-#define HANDLE_LOAD_COMMAND(LCName, LCValue, LCStruct) \<br>
+#define HANDLE_LOAD_COMMAND(LCName, LCValue, LCStruct) \<br>
io.enumCase(value, #LCName, MachO::LCName);<br>
<br>
template <> struct ScalarEnumerationTraits<MachO::LoadCommandType> {<br>
@@ -74,7 +72,52 @@ template <> struct ScalarEnumerationTrai<br>
}<br>
};<br>
<br>
-#undef HANDLE_LOAD_COMMAND<br>
+// This trait is used for 16-byte chars in Mach structures used for strings<br>
+typedef char char_16[16];<br>
+<br>
+template <> struct ScalarTraits<char_16> {<br>
+ static void output(const char_16 &Val, void *, llvm::raw_ostream &Out);<br>
+<br>
+ static StringRef input(StringRef Scalar, void *, char_16 &Val);<br>
+ static bool mustQuote(StringRef S);<br>
+};<br>
+<br>
+// This trait is used for UUIDs. It reads and writes them matching otool's<br>
+// formatting style.<br>
+typedef uint8_t uuid_t[16];<br>
+<br>
+template <> struct ScalarTraits<uuid_t> {<br>
+ static void output(const uuid_t &Val, void *, llvm::raw_ostream &Out);<br>
+<br>
+ static StringRef input(StringRef Scalar, void *, uuid_t &Val);<br>
+ static bool mustQuote(StringRef S);<br>
+};<br>
+<br>
+// Load Command struct mapping traits<br>
+<br>
+#define LOAD_COMMAND_STRUCT(LCStruct) \<br>
+ template <> struct MappingTraits<MachO::LCStruct> { \<br>
+ static void mapping(IO &IO, MachO::LCStruct &LoadCommand); \<br>
+ };<br>
+<br>
+#include "llvm/Support/MachO.def"<br>
+<br>
+// Extra structures used by load commands<br>
+template <> struct MappingTraits<MachO::dylib> {<br>
+ static void mapping(IO &IO, MachO::dylib &LoadCommand);<br>
+};<br>
+<br>
+template <> struct MappingTraits<MachO::fvmlib> {<br>
+ static void mapping(IO &IO, MachO::fvmlib &LoadCommand);<br>
+};<br>
+<br>
+template <> struct MappingTraits<MachO::section> {<br>
+ static void mapping(IO &IO, MachO::section &LoadCommand);<br>
+};<br>
+<br>
+template <> struct MappingTraits<MachO::section_64> {<br>
+ static void mapping(IO &IO, MachO::section_64 &LoadCommand);<br>
+};<br>
<br>
} // namespace llvm::yaml<br>
<br>
<br>
Modified: llvm/trunk/include/llvm/Support/MachO.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MachO.def?rev=269808&r1=269807&r2=269808&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MachO.def?rev=269808&r1=269807&r2=269808&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Support/MachO.def (original)<br>
+++ llvm/trunk/include/llvm/Support/MachO.def Tue May 17 14:44:06 2016<br>
@@ -11,9 +11,7 @@<br>
//<br>
//,,,----------------------------------------------------------------------,,,//<br>
<br>
-#ifndef HANDLE_LOAD_COMMAND<br>
-#define HANDLE_LOAD_COMMAND(LCName, LCValue, LCStruct)<br>
-#endif<br>
+#ifdef HANDLE_LOAD_COMMAND<br>
<br>
HANDLE_LOAD_COMMAND(LC_SEGMENT, 0x00000001u, segment_command)<br>
HANDLE_LOAD_COMMAND(LC_SYMTAB, 0x00000002u, symtab_command)<br>
@@ -65,3 +63,44 @@ HANDLE_LOAD_COMMAND(LC_LINKER_OPTION, 0x<br>
HANDLE_LOAD_COMMAND(LC_LINKER_OPTIMIZATION_HINT, 0x0000002Eu, linkedit_data_command)<br>
HANDLE_LOAD_COMMAND(LC_VERSION_MIN_TVOS, 0x0000002Fu, version_min_command)<br>
HANDLE_LOAD_COMMAND(LC_VERSION_MIN_WATCHOS, 0x00000030u, version_min_command)<br>
+<br>
+#endif<br>
+<br>
+#ifdef LOAD_COMMAND_STRUCT<br>
+<br>
+LOAD_COMMAND_STRUCT(dyld_info_command)<br>
+LOAD_COMMAND_STRUCT(dylib_command)<br>
+LOAD_COMMAND_STRUCT(dylinker_command)<br>
+LOAD_COMMAND_STRUCT(dysymtab_command)<br>
+LOAD_COMMAND_STRUCT(encryption_info_command)<br>
+LOAD_COMMAND_STRUCT(encryption_info_command_64)<br>
+LOAD_COMMAND_STRUCT(entry_point_command)<br>
+LOAD_COMMAND_STRUCT(fvmfile_command)<br>
+LOAD_COMMAND_STRUCT(fvmlib_command)<br>
+LOAD_COMMAND_STRUCT(ident_command)<br>
+LOAD_COMMAND_STRUCT(linkedit_data_command)<br>
+LOAD_COMMAND_STRUCT(linker_option_command)<br>
+LOAD_COMMAND_STRUCT(load_command)<br>
+LOAD_COMMAND_STRUCT(prebind_cksum_command)<br>
+LOAD_COMMAND_STRUCT(prebound_dylib_command)<br>
+LOAD_COMMAND_STRUCT(routines_command)<br>
+LOAD_COMMAND_STRUCT(routines_command_64)<br>
+LOAD_COMMAND_STRUCT(rpath_command)<br>
+LOAD_COMMAND_STRUCT(segment_command)<br>
+LOAD_COMMAND_STRUCT(segment_command_64)<br>
+LOAD_COMMAND_STRUCT(source_version_command)<br>
+LOAD_COMMAND_STRUCT(sub_client_command)<br>
+LOAD_COMMAND_STRUCT(sub_framework_command)<br>
+LOAD_COMMAND_STRUCT(sub_library_command)<br>
+LOAD_COMMAND_STRUCT(sub_umbrella_command)<br>
+LOAD_COMMAND_STRUCT(symseg_command)<br>
+LOAD_COMMAND_STRUCT(symtab_command)<br>
+LOAD_COMMAND_STRUCT(thread_command)<br>
+LOAD_COMMAND_STRUCT(twolevel_hints_command)<br>
+LOAD_COMMAND_STRUCT(uuid_command)<br>
+LOAD_COMMAND_STRUCT(version_min_command)<br>
+<br>
+#endif<br>
+<br>
+#undef HANDLE_LOAD_COMMAND<br>
+#undef LOAD_COMMAND_STRUCT<br>
<br>
Modified: llvm/trunk/include/llvm/Support/MachO.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MachO.h?rev=269808&r1=269807&r2=269808&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/Support/MachO.h?rev=269808&r1=269807&r2=269808&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/include/llvm/Support/MachO.h (original)<br>
+++ llvm/trunk/include/llvm/Support/MachO.h Tue May 17 14:44:06 2016<br>
@@ -1677,6 +1677,13 @@ namespace llvm {<br>
const uint32_t x86_EXCEPTION_STATE_COUNT =<br>
sizeof(x86_exception_state_t) / sizeof(uint32_t);<br>
<br>
+ // Define a union of all load command structs<br>
+ #define LOAD_COMMAND_STRUCT(LCStruct) LCStruct LCStruct##_data;<br>
+<br>
+ union macho_load_command {<br>
+ #include "llvm/Support/MachO.def"<br>
+ };<br>
+<br>
} // end namespace MachO<br>
} // end namespace llvm<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=269808&r1=269807&r2=269808&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ObjectYAML/MachOYAML.cpp?rev=269808&r1=269807&r2=269808&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/lib/ObjectYAML/MachOYAML.cpp (original)<br>
+++ llvm/trunk/lib/ObjectYAML/MachOYAML.cpp Tue May 17 14:44:06 2016<br>
@@ -13,6 +13,9 @@<br>
<br>
#include "llvm/ObjectYAML/MachOYAML.h"<br>
#include "llvm/Support/Casting.h"<br>
+#include "llvm/Support/Format.h"<br>
+<br>
+#include <string.h> // For memcpy and memset.<br>
<br>
namespace llvm {<br>
<br>
@@ -20,6 +23,52 @@ MachOYAML::LoadCommand::~LoadCommand() {<br>
<br>
namespace yaml {<br>
<br>
+void ScalarTraits<char_16>::output(const char_16 &Val, void *,<br>
+ llvm::raw_ostream &Out) {<br>
+ Out << Val;<br>
+}<br>
+<br>
+StringRef ScalarTraits<char_16>::input(StringRef Scalar, void *, char_16 &Val) {<br>
+ size_t CopySize = 16 >= Scalar.size() ? 16 : Scalar.size();<br>
+ memcpy((void *)Val, Scalar.data(), CopySize);<br>
+<br>
+ if (Scalar.size() < 16) {<br>
+ memset((void *)&Val[Scalar.size()], 0, 16 - Scalar.size());<br>
+ }<br>
+<br>
+ return StringRef();<br>
+}<br>
+<br>
+bool ScalarTraits<char_16>::mustQuote(StringRef S) { return needsQuotes(S); }<br>
+<br>
+void ScalarTraits<uuid_t>::output(const uuid_t &Val, void *,<br>
+ llvm::raw_ostream &Out) {<br>
+ for (int Idx = 0; Idx < 16; ++Idx) {<br>
+ Out << format("%02" PRIX32, Val[Idx]);<br>
+ if (Idx == 3 || Idx == 5 || Idx == 7 || Idx == 9)<br>
+ Out << "-";<br>
+ }<br>
+}<br>
+<br>
+StringRef ScalarTraits<uuid_t>::input(StringRef Scalar, void *, uuid_t &Val) {<br>
+ size_t OutIdx = 0;<br>
+ for (size_t Idx = 0; Idx < Scalar.size(); ++Idx) {<br>
+ if (Scalar[Idx] == '-' || OutIdx >= 16)<br>
+ continue;<br>
+ unsigned long long TempInt;<br>
+ if (getAsUnsignedInteger(Scalar.slice(Idx, Idx + 2), 16, TempInt))<br>
+ return "invalid number";<br>
+ if (TempInt > 0xFF)<br>
+ return "out of range number";<br>
+ Val[OutIdx] = static_cast<uint8_t>(TempInt);<br>
+ ++Idx; // increment idx an extra time because we're consuming 2 chars<br>
+ ++OutIdx;<br>
+ }<br>
+ return StringRef();<br>
+}<br>
+<br>
+bool ScalarTraits<uuid_t>::mustQuote(StringRef S) { return needsQuotes(S); }<br>
+<br>
void MappingTraits<MachOYAML::FileHeader>::mapping(<br>
IO &IO, MachOYAML::FileHeader &FileHdr) {<br>
IO.mapRequired("magic", FileHdr.magic);<br>
@@ -46,12 +95,310 @@ void MappingTraits<MachOYAML::Object>::m<br>
IO.setContext(nullptr);<br>
}<br>
<br>
-void MappingTraits<std::unique_ptr<MachOYAML::LoadCommand>>::mapping(<br>
- IO &IO, std::unique_ptr<MachOYAML::LoadCommand> &LoadCommand) {<br>
- if (!IO.outputting())<br>
- LoadCommand.reset(new MachOYAML::LoadCommand());<br>
- IO.mapRequired("cmd", LoadCommand->cmd);<br>
- IO.mapRequired("cmdsize", LoadCommand->cmdsize);<br>
+void MappingTraits<MachOYAML::LoadCommand>::mapping(<br>
+ IO &IO, MachOYAML::LoadCommand &LoadCommand) {<br>
+ IO.mapRequired(<br>
+ "cmd", (MachO::LoadCommandType &)LoadCommand.Data.load_command_data.cmd);<br>
+ IO.mapRequired("cmdsize", LoadCommand.Data.load_command_data.cmdsize);<br>
+<br>
+#define HANDLE_LOAD_COMMAND(LCName, LCValue, LCStruct) \<br>
+ case MachO::LCName: \<br>
+ MappingTraits<MachO::LCStruct>::mapping(IO, \<br>
+ LoadCommand.Data.LCStruct##_data); \<br>
+ break;<br>
+<br>
+ switch (LoadCommand.Data.load_command_data.cmd) {<br>
+#include "llvm/Support/MachO.def"<br>
+ }<br>
+}<br>
+<br>
+void MappingTraits<MachO::dyld_info_command>::mapping(<br>
+ IO &IO, MachO::dyld_info_command &LoadCommand) {<br>
+ IO.mapRequired("rebase_off", LoadCommand.rebase_off);<br>
+ IO.mapRequired("rebase_size", LoadCommand.rebase_size);<br>
+ IO.mapRequired("bind_off", LoadCommand.bind_size);<br>
+ IO.mapRequired("weak_bind_off", LoadCommand.weak_bind_off);<br>
+ IO.mapRequired("weak_bind_size", LoadCommand.weak_bind_size);<br>
+ IO.mapRequired("lazy_bind_off", LoadCommand.lazy_bind_size);<br>
+ IO.mapRequired("export_off", LoadCommand.export_off);<br>
+ IO.mapRequired("export_size", LoadCommand.export_size);<br>
+}<br>
+<br>
+void MappingTraits<MachO::dylib>::mapping(IO &IO, MachO::dylib &DylibStruct) {<br>
+ IO.mapRequired("name", DylibStruct.name);<br>
+ IO.mapRequired("timestamp", DylibStruct.timestamp);<br>
+ IO.mapRequired("current_version", DylibStruct.current_version);<br>
+ IO.mapRequired("compatibility_version", DylibStruct.compatibility_version);<br>
+}<br>
+<br>
+void MappingTraits<MachO::dylib_command>::mapping(<br>
+ IO &IO, MachO::dylib_command &LoadCommand) {<br>
+ IO.mapRequired("dylib", LoadCommand.dylib);<br>
+}<br>
+<br>
+void MappingTraits<MachO::dylinker_command>::mapping(<br>
+ IO &IO, MachO::dylinker_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("name", LoadCommand.name);<br>
+}<br>
+<br>
+void MappingTraits<MachO::dysymtab_command>::mapping(<br>
+ IO &IO, MachO::dysymtab_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("ilocalsym", LoadCommand.ilocalsym);<br>
+ IO.mapRequired("nlocalsym", LoadCommand.nlocalsym);<br>
+ IO.mapRequired("iextdefsym", LoadCommand.iextdefsym);<br>
+ IO.mapRequired("nextdefsym", LoadCommand.nextdefsym);<br>
+ IO.mapRequired("iundefsym", LoadCommand.iundefsym);<br>
+ IO.mapRequired("nundefsym", LoadCommand.nundefsym);<br>
+ IO.mapRequired("tocoff", LoadCommand.tocoff);<br>
+ IO.mapRequired("ntoc", LoadCommand.ntoc);<br>
+ IO.mapRequired("modtaboff", LoadCommand.modtaboff);<br>
+ IO.mapRequired("nmodtab", LoadCommand.nmodtab);<br>
+ IO.mapRequired("extrefsymoff", LoadCommand.extrefsymoff);<br>
+ IO.mapRequired("nextrefsyms", LoadCommand.nextrefsyms);<br>
+ IO.mapRequired("indirectsymoff", LoadCommand.indirectsymoff);<br>
+ IO.mapRequired("nindirectsyms", LoadCommand.nindirectsyms);<br>
+ IO.mapRequired("extreloff", LoadCommand.extreloff);<br>
+ IO.mapRequired("nextrel", LoadCommand.nextrel);<br>
+ IO.mapRequired("locreloff", LoadCommand.locreloff);<br>
+ IO.mapRequired("nlocrel", LoadCommand.nlocrel);<br>
+}<br>
+<br>
+void MappingTraits<MachO::encryption_info_command>::mapping(<br>
+ IO &IO, MachO::encryption_info_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("cryptoff", LoadCommand.cryptoff);<br>
+ IO.mapRequired("cryptsize", LoadCommand.cryptsize);<br>
+ IO.mapRequired("cryptid", LoadCommand.cryptid);<br>
+}<br>
+<br>
+void MappingTraits<MachO::encryption_info_command_64>::mapping(<br>
+ IO &IO, MachO::encryption_info_command_64 &LoadCommand) {<br>
+<br>
+ IO.mapRequired("cryptoff", LoadCommand.cryptoff);<br>
+ IO.mapRequired("cryptsize", LoadCommand.cryptsize);<br>
+ IO.mapRequired("cryptid", LoadCommand.cryptid);<br>
+ IO.mapRequired("pad", LoadCommand.pad);<br>
+}<br>
+<br>
+void MappingTraits<MachO::entry_point_command>::mapping(<br>
+ IO &IO, MachO::entry_point_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("entryoff", LoadCommand.entryoff);<br>
+ IO.mapRequired("stacksize", LoadCommand.stacksize);<br>
+}<br>
+<br>
+void MappingTraits<MachO::fvmfile_command>::mapping(<br>
+ IO &IO, MachO::fvmfile_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("name", LoadCommand.name);<br>
+ IO.mapRequired("header_addr", LoadCommand.header_addr);<br>
+}<br>
+<br>
+void MappingTraits<MachO::fvmlib>::mapping(IO &IO, MachO::fvmlib &FVMLib) {<br>
+ IO.mapRequired("name", FVMLib.name);<br>
+ IO.mapRequired("minor_version", FVMLib.minor_version);<br>
+ IO.mapRequired("header_addr", FVMLib.header_addr);<br>
+}<br>
+<br>
+void MappingTraits<MachO::fvmlib_command>::mapping(<br>
+ IO &IO, MachO::fvmlib_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("fvmlib", LoadCommand.fvmlib);<br>
+}<br>
+<br>
+void MappingTraits<MachO::ident_command>::mapping(<br>
+ IO &IO, MachO::ident_command &LoadCommand) {}<br>
+<br>
+void MappingTraits<MachO::linkedit_data_command>::mapping(<br>
+ IO &IO, MachO::linkedit_data_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("dataoff", LoadCommand.dataoff);<br>
+ IO.mapRequired("datasize", LoadCommand.datasize);<br>
+}<br>
+<br>
+void MappingTraits<MachO::linker_option_command>::mapping(<br>
+ IO &IO, MachO::linker_option_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("count", LoadCommand.count);<br>
+}<br>
+<br>
+void MappingTraits<MachO::prebind_cksum_command>::mapping(<br>
+ IO &IO, MachO::prebind_cksum_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("cksum", LoadCommand.cksum);<br>
+}<br>
+<br>
+void MappingTraits<MachO::load_command>::mapping(<br>
+ IO &IO, MachO::load_command &LoadCommand) {}<br>
+<br>
+void MappingTraits<MachO::prebound_dylib_command>::mapping(<br>
+ IO &IO, MachO::prebound_dylib_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("name", LoadCommand.name);<br>
+ IO.mapRequired("nmodules", LoadCommand.nmodules);<br>
+ IO.mapRequired("linked_modules", LoadCommand.linked_modules);<br>
+}<br>
+<br>
+void MappingTraits<MachO::routines_command>::mapping(<br>
+ IO &IO, MachO::routines_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("init_address", LoadCommand.init_address);<br>
+ IO.mapRequired("init_module", LoadCommand.init_module);<br>
+ IO.mapRequired("reserved1", LoadCommand.reserved1);<br>
+ IO.mapRequired("reserved2", LoadCommand.reserved2);<br>
+ IO.mapRequired("reserved3", LoadCommand.reserved3);<br>
+ IO.mapRequired("reserved4", LoadCommand.reserved4);<br>
+ IO.mapRequired("reserved5", LoadCommand.reserved5);<br>
+ IO.mapRequired("reserved6", LoadCommand.reserved6);<br>
+}<br>
+<br>
+void MappingTraits<MachO::routines_command_64>::mapping(<br>
+ IO &IO, MachO::routines_command_64 &LoadCommand) {<br>
+<br>
+ IO.mapRequired("init_address", LoadCommand.init_address);<br>
+ IO.mapRequired("init_module", LoadCommand.init_module);<br>
+ IO.mapRequired("reserved1", LoadCommand.reserved1);<br>
+ IO.mapRequired("reserved2", LoadCommand.reserved2);<br>
+ IO.mapRequired("reserved3", LoadCommand.reserved3);<br>
+ IO.mapRequired("reserved4", LoadCommand.reserved4);<br>
+ IO.mapRequired("reserved5", LoadCommand.reserved5);<br>
+ IO.mapRequired("reserved6", LoadCommand.reserved6);<br>
+}<br>
+<br>
+void MappingTraits<MachO::rpath_command>::mapping(<br>
+ IO &IO, MachO::rpath_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("path", LoadCommand.path);<br>
+}<br>
+<br>
+void MappingTraits<MachO::section>::mapping(IO &IO, MachO::section &Section) {<br>
+ IO.mapRequired("sectname", Section.sectname);<br>
+ IO.mapRequired("segname", Section.segname);<br>
+ IO.mapRequired("addr", Section.addr);<br>
+ IO.mapRequired("size", Section.size);<br>
+ IO.mapRequired("offset", Section.offset);<br>
+ IO.mapRequired("align", Section.align);<br>
+ IO.mapRequired("reloff", Section.reloff);<br>
+ IO.mapRequired("nreloc", Section.nreloc);<br>
+ IO.mapRequired("flags", Section.flags);<br>
+ IO.mapRequired("reserved1", Section.reserved1);<br>
+ IO.mapRequired("reserved2", Section.reserved2);<br>
+}<br>
+<br>
+void MappingTraits<MachO::section_64>::mapping(IO &IO,<br>
+ MachO::section_64 &Section) {<br>
+ IO.mapRequired("sectname", Section.sectname);<br>
+ IO.mapRequired("segname", Section.segname);<br>
+ IO.mapRequired("addr", Section.addr);<br>
+ IO.mapRequired("size", Section.size);<br>
+ IO.mapRequired("offset", Section.offset);<br>
+ IO.mapRequired("align", Section.align);<br>
+ IO.mapRequired("reloff", Section.reloff);<br>
+ IO.mapRequired("nreloc", Section.nreloc);<br>
+ IO.mapRequired("flags", Section.flags);<br>
+ IO.mapRequired("reserved1", Section.reserved1);<br>
+ IO.mapRequired("reserved2", Section.reserved2);<br>
+ IO.mapRequired("reserved3", Section.reserved3);<br>
+}<br>
+<br>
+void MappingTraits<MachO::segment_command>::mapping(<br>
+ IO &IO, MachO::segment_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("segname", LoadCommand.segname);<br>
+ IO.mapRequired("vmaddr", LoadCommand.vmaddr);<br>
+ IO.mapRequired("vmsize", LoadCommand.vmsize);<br>
+ IO.mapRequired("fileoff", LoadCommand.fileoff);<br>
+ IO.mapRequired("filesize", LoadCommand.filesize);<br>
+ IO.mapRequired("maxprot", LoadCommand.maxprot);<br>
+ IO.mapRequired("initprot", LoadCommand.initprot);<br>
+ IO.mapRequired("nsects", LoadCommand.nsects);<br>
+ IO.mapRequired("flags", LoadCommand.flags);<br>
+}<br>
+<br>
+void MappingTraits<MachO::segment_command_64>::mapping(<br>
+ IO &IO, MachO::segment_command_64 &LoadCommand) {<br>
+<br>
+ IO.mapRequired("segname", LoadCommand.segname);<br>
+ IO.mapRequired("vmaddr", LoadCommand.vmaddr);<br>
+ IO.mapRequired("vmsize", LoadCommand.vmsize);<br>
+ IO.mapRequired("fileoff", LoadCommand.fileoff);<br>
+ IO.mapRequired("filesize", LoadCommand.filesize);<br>
+ IO.mapRequired("maxprot", LoadCommand.maxprot);<br>
+ IO.mapRequired("initprot", LoadCommand.initprot);<br>
+ IO.mapRequired("nsects", LoadCommand.nsects);<br>
+ IO.mapRequired("flags", LoadCommand.flags);<br>
+}<br>
+<br>
+void MappingTraits<MachO::source_version_command>::mapping(<br>
+ IO &IO, MachO::source_version_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("version", LoadCommand.version);<br>
+}<br>
+<br>
+void MappingTraits<MachO::sub_client_command>::mapping(<br>
+ IO &IO, MachO::sub_client_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("client", LoadCommand.client);<br>
+}<br>
+<br>
+void MappingTraits<MachO::sub_framework_command>::mapping(<br>
+ IO &IO, MachO::sub_framework_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("umbrella", LoadCommand.umbrella);<br>
+}<br>
+<br>
+void MappingTraits<MachO::sub_library_command>::mapping(<br>
+ IO &IO, MachO::sub_library_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("sub_library", LoadCommand.sub_library);<br>
+}<br>
+<br>
+void MappingTraits<MachO::sub_umbrella_command>::mapping(<br>
+ IO &IO, MachO::sub_umbrella_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("sub_umbrella", LoadCommand.sub_umbrella);<br>
+}<br>
+<br>
+void MappingTraits<MachO::symseg_command>::mapping(<br>
+ IO &IO, MachO::symseg_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("offset", LoadCommand.offset);<br>
+ IO.mapRequired("size", LoadCommand.size);<br>
+}<br>
+<br>
+void MappingTraits<MachO::symtab_command>::mapping(<br>
+ IO &IO, MachO::symtab_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("symoff", LoadCommand.symoff);<br>
+ IO.mapRequired("nsyms", LoadCommand.nsyms);<br>
+ IO.mapRequired("stroff", LoadCommand.stroff);<br>
+ IO.mapRequired("strsize", LoadCommand.strsize);<br>
+}<br>
+<br>
+void MappingTraits<MachO::thread_command>::mapping(<br>
+ IO &IO, MachO::thread_command &LoadCommand) {}<br>
+<br>
+void MappingTraits<MachO::twolevel_hints_command>::mapping(<br>
+ IO &IO, MachO::twolevel_hints_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("offset", LoadCommand.offset);<br>
+ IO.mapRequired("nhints", LoadCommand.nhints);<br>
+}<br>
+<br>
+void MappingTraits<MachO::uuid_command>::mapping(<br>
+ IO &IO, MachO::uuid_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("cmdsize", LoadCommand.cmdsize);<br>
+ IO.mapRequired("uuid", LoadCommand.uuid);<br>
+}<br>
+<br>
+void MappingTraits<MachO::version_min_command>::mapping(<br>
+ IO &IO, MachO::version_min_command &LoadCommand) {<br>
+<br>
+ IO.mapRequired("version", LoadCommand.version);<br>
+ IO.mapRequired("sdk", LoadCommand.sdk);<br>
}<br>
<br>
} // namespace llvm::yaml<br>
<br>
Modified: llvm/trunk/test/ObjectYAML/MachO/load_commands.yaml<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ObjectYAML/MachO/load_commands.yaml?rev=269808&r1=269807&r2=269808&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/test/ObjectYAML/MachO/load_commands.yaml?rev=269808&r1=269807&r2=269808&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/test/ObjectYAML/MachO/load_commands.yaml (original)<br>
+++ llvm/trunk/test/ObjectYAML/MachO/load_commands.yaml Tue May 17 14:44:06 2016<br>
@@ -13,69 +13,246 @@ FileHeader:<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: 96<br>
+ weak_bind_off: 0<br>
+ weak_bind_size: 0<br>
+ lazy_bind_off: 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>
- cmd: LC_UUID<br>
cmdsize: 24<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>
- cmd: LC_LOAD_DYLIB<br>
cmdsize: 56<br>
+ dylib:<br>
+ name: 24<br>
+ timestamp: 2<br>
+ current_version: 80349697<br>
+ compatibility_version: 65536<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>
...<br>
<br>
<br>
-# CHECK: LoadCommands:<br>
-# CHECK: - cmd: LC_SEGMENT_64<br>
-# CHECK: cmdsize: 72<br>
-# CHECK: - cmd: LC_SEGMENT_64<br>
-# CHECK: cmdsize: 552<br>
-# CHECK: - cmd: LC_SEGMENT_64<br>
-# CHECK: cmdsize: 312<br>
-# CHECK: - cmd: LC_SEGMENT_64<br>
-# CHECK: cmdsize: 72<br>
-# CHECK: - cmd: LC_DYLD_INFO_ONLY<br>
-# CHECK: cmdsize: 48<br>
-# CHECK: - cmd: LC_SYMTAB<br>
-# CHECK: cmdsize: 24<br>
-# CHECK: - cmd: LC_DYSYMTAB<br>
-# CHECK: cmdsize: 80<br>
-# CHECK: - cmd: LC_LOAD_DYLINKER<br>
-# CHECK: cmdsize: 32<br>
-# CHECK: - cmd: LC_UUID<br>
-# CHECK: cmdsize: 24<br>
-# CHECK: - cmd: LC_VERSION_MIN_MACOSX<br>
-# CHECK: cmdsize: 16<br>
-# CHECK: - cmd: LC_SOURCE_VERSION<br>
-# CHECK: cmdsize: 16<br>
-# CHECK: - cmd: LC_MAIN<br>
-# CHECK: cmdsize: 24<br>
-# CHECK: - cmd: LC_LOAD_DYLIB<br>
-# CHECK: cmdsize: 48<br>
-# CHECK: - cmd: LC_LOAD_DYLIB<br>
-# CHECK: cmdsize: 56<br>
-# CHECK: - cmd: LC_FUNCTION_STARTS<br>
-# CHECK: cmdsize: 16<br>
-# CHECK: - cmd: LC_DATA_IN_CODE<br>
-# CHECK: cmdsize: 16<br>
+<br>
+#CHECK: LoadCommands:<br>
+#CHECK: - cmd: LC_SEGMENT_64<br>
+#CHECK: cmdsize: 72<br>
+#CHECK: segname: __PAGEZERO<br>
+#CHECK: vmaddr: 0<br>
+#CHECK: vmsize: 4294967296<br>
+#CHECK: fileoff: 0<br>
+#CHECK: filesize: 0<br>
+#CHECK: maxprot: 0<br>
+#CHECK: initprot: 0<br>
+#CHECK: nsects: 0<br>
+#CHECK: flags: 0<br>
+#CHECK: - cmd: LC_SEGMENT_64<br>
+#CHECK: cmdsize: 552<br>
+#CHECK: segname: __TEXT<br>
+#CHECK: vmaddr: 4294967296<br>
+#CHECK: vmsize: 8192<br>
+#CHECK: fileoff: 0<br>
+#CHECK: filesize: 8192<br>
+#CHECK: maxprot: 7<br>
+#CHECK: initprot: 5<br>
+#CHECK: nsects: 6<br>
+#CHECK: flags: 0<br>
+#CHECK: - cmd: LC_SEGMENT_64<br>
+#CHECK: cmdsize: 312<br>
+#CHECK: segname: __DATA<br>
+#CHECK: vmaddr: 4294975488<br>
+#CHECK: vmsize: 4096<br>
+#CHECK: fileoff: 8192<br>
+#CHECK: filesize: 4096<br>
+#CHECK: maxprot: 7<br>
+#CHECK: initprot: 3<br>
+#CHECK: nsects: 3<br>
+#CHECK: flags: 0<br>
+#CHECK: - cmd: LC_SEGMENT_64<br>
+#CHECK: cmdsize: 72<br>
+#CHECK: segname: __LINKEDIT<br>
+#CHECK: vmaddr: 4294979584<br>
+#CHECK: vmsize: 4096<br>
+#CHECK: fileoff: 12288<br>
+#CHECK: filesize: 2508<br>
+#CHECK: maxprot: 7<br>
+#CHECK: initprot: 1<br>
+#CHECK: nsects: 0<br>
+#CHECK: flags: 0<br>
+#CHECK: - cmd: LC_DYLD_INFO_ONLY<br>
+#CHECK: cmdsize: 48<br>
+#CHECK: rebase_off: 12288<br>
+#CHECK: rebase_size: 8<br>
+#CHECK: bind_off: 96<br>
+#CHECK: weak_bind_off: 0<br>
+#CHECK: weak_bind_size: 0<br>
+#CHECK: lazy_bind_off: 624<br>
+#CHECK: export_off: 13016<br>
+#CHECK: export_size: 48<br>
+#CHECK: - cmd: LC_SYMTAB<br>
+#CHECK: cmdsize: 24<br>
+#CHECK: symoff: 13080<br>
+#CHECK: nsyms: 30<br>
+#CHECK: stroff: 13700<br>
+#CHECK: strsize: 1096<br>
+#CHECK: - cmd: LC_DYSYMTAB<br>
+#CHECK: cmdsize: 80<br>
+#CHECK: ilocalsym: 0<br>
+#CHECK: nlocalsym: 9<br>
+#CHECK: iextdefsym: 9<br>
+#CHECK: nextdefsym: 2<br>
+#CHECK: iundefsym: 11<br>
+#CHECK: nundefsym: 19<br>
+#CHECK: tocoff: 0<br>
+#CHECK: ntoc: 0<br>
+#CHECK: modtaboff: 0<br>
+#CHECK: nmodtab: 0<br>
+#CHECK: extrefsymoff: 0<br>
+#CHECK: nextrefsyms: 0<br>
+#CHECK: indirectsymoff: 13560<br>
+#CHECK: nindirectsyms: 35<br>
+#CHECK: extreloff: 0<br>
+#CHECK: nextrel: 0<br>
+#CHECK: locreloff: 0<br>
+#CHECK: nlocrel: 0<br>
+#CHECK: - cmd: LC_LOAD_DYLINKER<br>
+#CHECK: cmdsize: 32<br>
+#CHECK: name: 12<br>
+#CHECK: - cmd: LC_UUID<br>
+#CHECK: cmdsize: 24<br>
+#CHECK: cmdsize: 24<br>
+#CHECK: uuid: 461A1B28-822F-3F38-B670-645419E636F5<br>
+#CHECK: - cmd: LC_VERSION_MIN_MACOSX<br>
+#CHECK: cmdsize: 16<br>
+#CHECK: version: 658176<br>
+#CHECK: sdk: 658176<br>
+#CHECK: - cmd: LC_SOURCE_VERSION<br>
+#CHECK: cmdsize: 16<br>
+#CHECK: version: 0<br>
+#CHECK: - cmd: LC_MAIN<br>
+#CHECK: cmdsize: 24<br>
+#CHECK: entryoff: 4448<br>
+#CHECK: stacksize: 0<br>
+#CHECK: - cmd: LC_LOAD_DYLIB<br>
+#CHECK: cmdsize: 48<br>
+#CHECK: dylib:<br>
+#CHECK: name: 24<br>
+#CHECK: timestamp: 2<br>
+#CHECK: current_version: 7864576<br>
+#CHECK: compatibility_version: 65536<br>
+#CHECK: - cmd: LC_LOAD_DYLIB<br>
+#CHECK: cmdsize: 56<br>
+#CHECK: dylib:<br>
+#CHECK: name: 24<br>
+#CHECK: timestamp: 2<br>
+#CHECK: current_version: 80349697<br>
+#CHECK: compatibility_version: 65536<br>
+#CHECK: - cmd: LC_FUNCTION_STARTS<br>
+#CHECK: cmdsize: 16<br>
+#CHECK: dataoff: 13064<br>
+#CHECK: datasize: 16<br>
+#CHECK: - cmd: LC_DATA_IN_CODE<br>
+#CHECK: cmdsize: 16<br>
+#CHECK: dataoff: 13080<br>
+#CHECK: datasize: 0<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=269808&r1=269807&r2=269808&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/obj2yaml/macho2yaml.cpp?rev=269808&r1=269807&r2=269808&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/obj2yaml/macho2yaml.cpp (original)<br>
+++ llvm/trunk/tools/obj2yaml/macho2yaml.cpp Tue May 17 14:44:06 2016<br>
@@ -9,9 +9,9 @@<br>
<br>
#include "Error.h"<br>
#include "obj2yaml.h"<br>
-#include "llvm/Support/ErrorHandling.h"<br>
#include "llvm/Object/MachOUniversal.h"<br>
#include "llvm/ObjectYAML/MachOYAML.h"<br>
+#include "llvm/Support/ErrorHandling.h"<br>
<br>
using namespace llvm;<br>
<br>
@@ -24,6 +24,14 @@ public:<br>
Expected<std::unique_ptr<MachOYAML::Object>> dump();<br>
};<br>
<br>
+#define HANDLE_LOAD_COMMAND(LCName, LCValue, LCStruct) \<br>
+ case MachO::LCName: \<br>
+ memcpy((void *) & (LC.Data.LCStruct##_data), LoadCmd.Ptr, \<br>
+ sizeof(MachO::LCStruct)); \<br>
+ if (Obj.isLittleEndian() != sys::IsLittleEndianHost) \<br>
+ MachO::swapStruct(LC.Data.LCStruct##_data); \<br>
+ break;<br>
+<br>
Expected<std::unique_ptr<MachOYAML::Object>> MachODumper::dump() {<br>
auto Y = make_unique<MachOYAML::Object>();<br>
Y->Header.magic = Obj.getHeader().magic;<br>
@@ -35,10 +43,17 @@ Expected<std::unique_ptr<MachOYAML::Obje<br>
Y->Header.flags = Obj.getHeader().flags;<br>
Y->Header.reserved = 0;<br>
<br>
- for (auto load_command : Obj.load_commands()) {<br>
- auto LC = make_unique<MachOYAML::LoadCommand>();<br>
- LC->cmd = static_cast<MachO::LoadCommandType>(load_command.C.cmd);<br>
- LC->cmdsize = load_command.C.cmdsize;<br>
+ for (auto LoadCmd : Obj.load_commands()) {<br>
+ MachOYAML::LoadCommand LC;<br>
+ switch (LoadCmd.C.cmd) {<br>
+ default:<br>
+ memcpy((void *)&(LC.Data.load_command_data), LoadCmd.Ptr,<br>
+ sizeof(MachO::load_command));<br>
+ if (Obj.isLittleEndian() != sys::IsLittleEndianHost)<br>
+ MachO::swapStruct(LC.Data.load_command_data);<br>
+ break;<br>
+#include "llvm/Support/MachO.def"<br>
+ }<br>
Y->LoadCommands.push_back(std::move(LC));<br>
}<br>
<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=269808&r1=269807&r2=269808&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/yaml2obj/yaml2macho.cpp?rev=269808&r1=269807&r2=269808&view=diff</a><br>
==============================================================================<br>
--- llvm/trunk/tools/yaml2obj/yaml2macho.cpp (original)<br>
+++ llvm/trunk/tools/yaml2obj/yaml2macho.cpp Tue May 17 14:44:06 2016<br>
@@ -79,17 +79,32 @@ Error MachOWriter::writeHeader(raw_ostre<br>
<br>
Error MachOWriter::writeLoadCommands(raw_ostream &OS) {<br>
for (auto &LC : Obj.LoadCommands) {<br>
- MachO::load_command LCTemp;<br>
- LCTemp.cmd = LC->cmd;<br>
- LCTemp.cmdsize = LC->cmdsize;<br>
- OS.write(reinterpret_cast<const char *>(&LCTemp),<br>
- sizeof(MachO::load_command));<br>
- auto remaining_size = LC->cmdsize - sizeof(MachO::load_command);<br>
- if (remaining_size > 0) {<br>
+ size_t BytesWritten = 0;<br>
+#define HANDLE_LOAD_COMMAND(LCName, LCValue, LCStruct) \<br>
+ case MachO::LCName: \<br>
+ OS.write(reinterpret_cast<const char *>(&(LC.Data.LCStruct##_data)), \<br>
+ sizeof(MachO::LCStruct)); \<br>
+ BytesWritten = sizeof(MachO::LCStruct); \<br>
+ break;<br>
+<br>
+ switch (LC.Data.load_command_data.cmd) {<br>
+ default:<br>
+ OS.write(reinterpret_cast<const char *>(&(LC.Data.load_command_data)),<br>
+ sizeof(MachO::load_command));<br>
+ BytesWritten = sizeof(MachO::load_command);<br>
+ break;<br>
+#include "llvm/Support/MachO.def"<br>
+ }<br>
+<br>
+ auto BytesRemaining =<br>
+ LC.Data.load_command_data.cmdsize - BytesWritten;<br>
+ if (BytesRemaining > 0) {<br>
// TODO: Replace all this once the load command data is present in yaml.<br>
- std::vector<char> fill_data;<br>
- fill_data.insert(fill_data.begin(), remaining_size, 0);<br>
- OS.write(fill_data.data(), remaining_size);<br>
+ // For now I fill with 0xDEADBEEF because it is easy to spot on a hex<br>
+ // viewer.<br>
+ std::vector<uint32_t> FillData;<br>
+ FillData.insert(FillData.begin(), BytesRemaining / 4 + 1, 0xDEADBEEFu);<br>
+ OS.write(reinterpret_cast<char *>(FillData.data()), BytesRemaining);<br>
}<br>
}<br>
return Error::success();<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">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>
</div></blockquote></div></div></div><br></div></blockquote></div><br></div></div>