Support for Mach-O univeral-binary reading

DO NOT USE THIS COMMIT. Shortly the many
debugging printf lines will be removed.
	modified:   src/lib/libdwarf/CMakeLists.txt
	modified:   src/lib/libdwarf/Makefile.am
	modified:   src/lib/libdwarf/dwarf_abbrev.h
	modified:   src/lib/libdwarf/dwarf_alloc.h
	modified:   src/lib/libdwarf/dwarf_errmsg_list.h
	modified:   src/lib/libdwarf/dwarf_generic_init.c
	modified:   src/lib/libdwarf/dwarf_macho_loader.h
	modified:   src/lib/libdwarf/dwarf_machoread.c
	modified:   src/lib/libdwarf/dwarf_machoread.h
	modified:   src/lib/libdwarf/dwarf_object_detector.c
	modified:   src/lib/libdwarf/dwarf_object_detector.h
	modified:   src/lib/libdwarf/dwarf_opaque.h

Author: davea42

src/lib/libdwarf/CMakeLists.txt

@@ -61,6 +61,7 @@ dwarf_tied_decls.h
 dwarf_tsearch.h 
 dwarf_setup_sections.h
 dwarf_str_offsets.h
+dwarf_universal.h 
 dwarf_util.h 
 dwarf_xu_index.h libdwarf_private.h
 dwarf_macho_loader.h

src/lib/libdwarf/Makefile.am

@@ -109,6 +109,7 @@ dwarf_tied.c \
 dwarf_tied_decls.h \
 dwarf_tsearchhash.c \
 dwarf_tsearch.h \
+dwarf_universal.h \
 dwarf_util.c \
 dwarf_util.h \
 dwarf_xu_index.c \

src/lib/libdwarf/dwarf_abbrev.h

@@ -27,6 +27,13 @@
 
 */
 
+#ifndef DWARF_ABBREV_H
+#define DWARF_ABBREV_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /*  In a given CU, one of these is (eventually) set up
     for every abbreviation we need to find (and for all
     those earlier in the abbreviations for that CU).
@@ -67,3 +74,9 @@ int _dwarf_count_abbrev_entries(Dwarf_Debug dbg,
     Dwarf_Unsigned *abbrev_implicit_const_count_out,
     Dwarf_Byte_Ptr *abbrev_ptr_out,
     Dwarf_Error *error);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* DWARF_ABBREV_H */

src/lib/libdwarf/dwarf_alloc.h

@@ -26,6 +26,13 @@
    Fifth Floor, Boston MA 02110-1301, USA.
 */
 
+#ifndef DWARF_ALLOC_H
+#define DWARF_ALLOC_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
 /* #define DWARF_SIMPLE_MALLOC 1  */
 
 char * _dwarf_get_alloc(Dwarf_Debug, Dwarf_Small, Dwarf_Unsigned);
@@ -43,3 +50,9 @@ void _dwarf_error_destructor(void *);
 void _dwarf_add_to_static_err_list(Dwarf_Error err);
 void _dwarf_flush_static_error_list(void);
 void _dwarf_free_static_errlist(void);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* DWARF_ALLOC_H */

src/lib/libdwarf/dwarf_errmsg_list.h

@@ -682,6 +682,8 @@ static const char _dwarf_errmsgs[DW_DLE_LAST+1][DW_MAX_MSG_LEN] = {
 {"DW_DLE_LINE_COUNT_WRONG(500) A count in a line table is "
     "not valid. Corrupt data."},
 {"DW_DLE_ARITHMETIC_OVERFLOW(501) Arithmetic overflow. "
-    " Corrupt Dwarf." }
+    " Corrupt Dwarf." },
+{" DW_DLE_UNIVERSAL_BINARY_ERROR(502) Error reading Mach-O "
+    "uninversal binary head. Corrupt Mach-O object." }
 };
 #endif /* DWARF_ERRMSG_LIST_H */

src/lib/libdwarf/dwarf_generic_init.c

@@ -125,6 +125,24 @@ set_global_paths_init(Dwarf_Debug dbg, Dwarf_Error* error)
 }
 
 /* New in December 2018. */
+int dwarf_init_path_a(const char *path,
+    char            * true_path_out_buffer,
+    unsigned          true_path_bufferlen,
+    unsigned          groupnumber,
+    unsigned          universalnumber,
+    Dwarf_Handler     errhand,
+    Dwarf_Ptr         errarg,
+    Dwarf_Debug     * ret_dbg,
+    Dwarf_Error     * error)
+{
+    return dwarf_init_path_dl_a(path,
+        true_path_out_buffer,true_path_bufferlen,
+        groupnumber,universalnumber,
+        errhand,errarg,ret_dbg,
+        0,0,0,
+        error);
+}
+
 int dwarf_init_path(const char *path,
     char            * true_path_out_buffer,
     unsigned          true_path_bufferlen,
@@ -134,9 +152,11 @@ int dwarf_init_path(const char *path,
     Dwarf_Debug     * ret_dbg,
     Dwarf_Error     * error)
 {
-    return dwarf_init_path_dl(path,
+    unsigned int universalnumber = 0;
+    return dwarf_init_path_dl_a(path,
         true_path_out_buffer,true_path_bufferlen,
-        groupnumber,errhand,errarg,ret_dbg,
+        groupnumber,universalnumber,
+        errhand,errarg,ret_dbg,
         0,0,0,
         error);
 }
@@ -192,6 +212,30 @@ dwarf_init_path_dl(const char *path,
     unsigned int    dl_path_count,
     unsigned char   * path_source,
     Dwarf_Error     * error)
+{
+    unsigned int universalnumber = 0;
+    int res = 0;
+
+    res = dwarf_init_path_dl_a(path,
+        true_path_out_buffer, true_path_bufferlen,
+        groupnumber,universalnumber,
+        errhand,errarg,ret_dbg, dl_path_array,
+        dl_path_count,path_source,error);
+    return res;
+}
+int
+dwarf_init_path_dl_a(const char *path,
+    char            * true_path_out_buffer,
+    unsigned        true_path_bufferlen,
+    unsigned        groupnumber,
+    unsigned        universalnumber,
+    Dwarf_Handler   errhand,
+    Dwarf_Ptr       errarg,
+    Dwarf_Debug     * ret_dbg,
+    char            ** dl_path_array,
+    unsigned int    dl_path_count,
+    unsigned char   * path_source,
+    Dwarf_Error     * error)
 {
     unsigned       ftype = 0;
     unsigned       endian = 0;
@@ -302,9 +346,11 @@ dwarf_init_path_dl(const char *path,
         *ret_dbg = dbg;
         return res;
     }
+    case DW_FTYPE_APPLEUNIVERSAL:
     case DW_FTYPE_MACH_O: {
         res = _dwarf_macho_setup(fd,
             file_path,
+            universalnumber,
             ftype,endian,offsetsize,filesize,
             groupnumber,errhand,errarg,&dbg,error);
         if (res != DW_DLV_OK) {
@@ -355,6 +401,7 @@ dwarf_init_b(int fd,
     unsigned ftype = 0;
     unsigned endian = 0;
     unsigned offsetsize = 0;
+    unsigned universalnumber = 0;
     Dwarf_Unsigned   filesize = 0;
     int res = 0;
     int errcode = 0;
@@ -387,10 +434,12 @@ dwarf_init_b(int fd,
         set_global_paths_init(*ret_dbg,error);
         return res2;
         }
+    case DW_FTYPE_APPLEUNIVERSAL:
     case DW_FTYPE_MACH_O: {
         int resm = 0;
 
         resm = _dwarf_macho_setup(fd,"",
+            universalnumber,
             ftype,endian,offsetsize,filesize,
             group_number,errhand,errarg,ret_dbg,error);
         if (resm != DW_DLV_OK) {

src/lib/libdwarf/dwarf_macho_loader.h

@@ -76,18 +76,20 @@ extern "C" {
 #define TYP(n,l) char (n)[(l)]
 #endif /* TYP */
 
+/*  This is Apple internal naming for Universal Binaries
+    and is not 'Inclusive Terminology" !! */
 #define FAT_MAGIC   0xcafebabe
-#define FAT_CIGAM   0xbebafeca  /* NXSwapLong(FAT_MAGIC) */
+#define FAT_CIGAM   0xbebafeca
 #define FAT_MAGIC_64    0xcafebabf
-#define FAT_CIGAM_64    0xbfbafeca  /* NXSwapLong(FAT_MAGIC_64) */
+#define FAT_CIGAM_64    0xbfbafeca
 
 struct fat_header {
     TYP(magic,4);    /* FAT_MAGIC or FAT_MAGIC_64 */
     TYP(nfat_arch,4); /* number of structs that follow */
 };
 
 struct fat_arch {
-    TYP(cputype,4);    /* cpu specifier (int) */
+    TYP(cputype ,4);  /* cpu specifier (int) */
     TYP(cpusubtype,4); /* machine specifier (int) */
     TYP(offset,4);     /* file offset to this object file */
     TYP(size,4);       /* size of this object file */