Loading...
launch-cache/dyld_shared_cache_util.cpp dyld-640.2 dyld-733.8
--- dyld/dyld-640.2/launch-cache/dyld_shared_cache_util.cpp
+++ dyld/dyld-733.8/launch-cache/dyld_shared_cache_util.cpp
@@ -1,16 +1,16 @@
-/* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*- 
+/* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*-
  *
  * Copyright (c) 2009-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
- * 
+ *
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * compliance with the License. Please obtain a copy of the License at
  * http://www.opensource.apple.com/apsl/ and read it before using this
  * file.
- * 
+ *
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
@@ -18,7 +18,7 @@
  * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
  * Please see the License for the specific language governing rights and
  * limitations under the License.
- * 
+ *
  * @APPLE_LICENSE_HEADER_END@
  */
 
@@ -34,73 +34,30 @@
 #include <sys/syslimits.h>
 #include <mach-o/arch.h>
 #include <mach-o/loader.h>
-#include <mach-o/dyld.h>
 #include <mach-o/dyld_priv.h>
+#include <bootstrap.h>
 #include <mach/mach.h>
+#include <dispatch/dispatch.h>
+
+#include <TargetConditionals.h>
 
 #include <map>
 #include <vector>
+#include <iostream>
 
 #include "DyldSharedCache.h"
-
-#include "dsc_iterator.h"
-#include "dsc_extractor.h"
-#include "dyld_cache_format.h"
-#include "Architectures.hpp"
-#include "MachOFileAbstraction.hpp"
-#include "CacheFileAbstraction.hpp"
 #include "Trie.hpp"
-#include "SupportedArchs.h"
-
-enum Mode {
-	modeNone,
-	modeList,
-	modeMap,
-	modeDependencies,
-	modeSlideInfo,
-    modeVerboseSlideInfo,
-	modeAcceleratorInfo,
-	modeTextInfo,
-	modeLinkEdit,
-	modeLocalSymbols,
-    modeStrings,
-	modeInfo,
-	modeSize,
-	modeExtract
-};
-
-struct Options {
-	Mode		mode;
-	const char*	dependentsOfPath;
-	const void*	mappedCache;
-	const char*	extractionDir;
-	bool		printUUIDs;
-	bool		printVMAddrs;
-    bool		printDylibVersions;
-	bool		printInodes;
-};
-
-struct TextInfo {
-	uint64_t		textSize;
-	const char*		path;
-};
-
-struct TextInfoSorter {
-	bool operator()(const TextInfo& left, const TextInfo& right) {
-		return (left.textSize > right.textSize);
-	}
-};
-
-struct Results {
-	std::map<uint32_t, const char*>	pageToContent;
-	uint64_t						linkeditBase;
-	bool							dependentTargetFound;
-	std::vector<TextInfo>			textSegments;
-};
-
+
+#include "objc-shared-cache.h"
+
+#if TARGET_OS_OSX
+#define DSC_BUNDLE_REL_PATH "../../lib/dsc_extractor.bundle"
+#else
+#define DSC_BUNDLE_REL_PATH "../lib/dsc_extractor.bundle"
+#endif
 
 // mmap() an shared cache file read/only but laid out like it would be at runtime
-static const DyldSharedCache* mapCacheFile(const char* path, size_t& cacheLength)
+static const DyldSharedCache* mapCacheFile(const char* path)
 {
     struct stat statbuf;
     if ( ::stat(path, &statbuf) ) {
@@ -139,278 +96,71 @@
     }
     ::close(cache_fd);
     
-    cacheLength = statbuf.st_size;
-    
     return (DyldSharedCache*)result;
 }
 
+enum Mode {
+    modeNone,
+    modeList,
+    modeMap,
+    modeDependencies,
+    modeSlideInfo,
+    modeVerboseSlideInfo,
+    modeAcceleratorInfo,
+    modeTextInfo,
+    modeLinkEdit,
+    modeLocalSymbols,
+    modeJSONMap,
+    modeJSONDependents,
+    modeSectionSizes,
+    modeStrings,
+    modeInfo,
+    modeSize,
+    modeObjCProtocols,
+    modeExtract
+};
+
+struct Options {
+    Mode            mode;
+    const char*     dependentsOfPath;
+    const char*     extractionDir;
+    bool            printUUIDs;
+    bool            printVMAddrs;
+    bool            printDylibVersions;
+    bool            printInodes;
+};
 
 
 void usage() {
-	fprintf(stderr, "Usage: dyld_shared_cache_util -list [ -uuid ] [-vmaddr] | -dependents <dylib-path> [ -versions ] | -linkedit | -map | -slide_info | -verbose_slide_info | -info | -extract <dylib-dir>  [ shared-cache-file ] \n");
+    fprintf(stderr, "Usage: dyld_shared_cache_util -list [ -uuid ] [-vmaddr] | -dependents <dylib-path> [ -versions ] | -linkedit | -map | -slide_info | -verbose_slide_info | -info | -extract <dylib-dir>  [ shared-cache-file ] \n");
 }
 
-#if __x86_64__
-static bool isHaswell()
-{
-	// check system is capable of running x86_64h code
-	struct host_basic_info info;
-	mach_msg_type_number_t count = HOST_BASIC_INFO_COUNT;
-	mach_port_t hostPort = mach_host_self();
-	kern_return_t result = host_info(hostPort, HOST_BASIC_INFO, (host_info_t)&info, &count);
-	mach_port_deallocate(mach_task_self(), hostPort);
-	if ( result != KERN_SUCCESS )
-		return false;
-	return ( info.cpu_subtype == CPU_SUBTYPE_X86_64_H );
+static void checkMode(Mode mode) {
+    if ( mode != modeNone ) {
+        fprintf(stderr, "Error: select one of: -list, -dependents, -info, -slide_info, -verbose_slide_info, -linkedit, -map, -extract, or -size\n");
+        usage();
+        exit(1);
+    }
 }
-#endif
-
-/*
- * Get the path to the native shared cache for this host
- */
-static const char* default_shared_cache_path() {
-#if __i386__
-	return MACOSX_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "i386";
-#elif __x86_64__ 
-	if ( isHaswell() )
-		return MACOSX_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "x86_64h";
-	else
-		return MACOSX_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "x86_64";
-#elif __ARM_ARCH_5TEJ__ 
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "armv5";
-#elif __ARM_ARCH_6K__ 
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "armv6";
-#elif __ARM_ARCH_7K__ 
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "armv7k";
-#elif __ARM_ARCH_7A__ 
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "armv7";
-#elif __ARM_ARCH_7F__ 
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "armv7f";
-#elif __ARM_ARCH_7S__ 
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "armv7s";
-#elif __ARM64_ARCH_8_32__
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "arm64_32";
-#elif __arm64e__
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "arm64e";
-#elif __arm64__
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "arm64";
-#else
-	#error unsupported architecture
-#endif
+
+static bool isAlias(const char* path, const DyldSharedCache* dyldCache) {
+    const dyld_cache_header* header = &dyldCache->header;
+    const dyld_cache_mapping_info* mappings = (const dyld_cache_mapping_info*)((char*)dyldCache + header->mappingOffset);
+    const dyld_cache_mapping_info* textMapping = &mappings[0];
+    // paths for aliases are store between cache header and first segment
+    return path < (char*)textMapping;
 }
 
-typedef void (*segment_callback_t)(const dyld_shared_cache_dylib_info* dylibInfo, const dyld_shared_cache_segment_info* segInfo,
-									const Options& options, Results& results);
-
-
-
-/*
- * List dependencies from the mach-o header at headerAddr
- * in the same format as 'otool -L'
- */
-template <typename A>
-void print_dependencies(const dyld_shared_cache_dylib_info* dylibInfo, const dyld_shared_cache_segment_info* segInfo, 
-																	const Options& options, Results& results) {
-	typedef typename A::P		P;
-	typedef typename A::P::E	E;
-	
-	if ( strcmp(options.dependentsOfPath, dylibInfo->path) != 0 ) 
-		return;
-	if ( strcmp(segInfo->name, "__TEXT") != 0 )
-		return;
-
-	const macho_dylib_command<P>* dylib_cmd;
-	const macho_header<P>* mh = (const macho_header<P>*)dylibInfo->machHeader;
-	const macho_load_command<P>* const cmds = (macho_load_command<P>*)((uintptr_t)dylibInfo->machHeader + sizeof(macho_header<P>));
-	const uint32_t cmd_count = mh->ncmds();
-	const macho_load_command<P>* cmd = cmds;
-	for (uint32_t i = 0; i < cmd_count; ++i) {
-		switch ( cmd->cmd() ) {
-			case LC_LOAD_DYLIB:
-			case LC_ID_DYLIB:
-			case LC_REEXPORT_DYLIB:
-			case LC_LOAD_WEAK_DYLIB:
-			case LC_LOAD_UPWARD_DYLIB:
-				dylib_cmd = (macho_dylib_command<P>*)cmd;
-				if ( options.printDylibVersions ) {
-					uint32_t compat_vers = dylib_cmd->compatibility_version();
-					uint32_t current_vers = dylib_cmd->current_version();
-					printf("\t%s", dylib_cmd->name());
-					if ( compat_vers != 0xFFFFFFFF ) {
-						printf("(compatibility version %u.%u.%u, current version %u.%u.%u)\n", 
-						   (compat_vers >> 16),
-						   (compat_vers >> 8) & 0xff,
-						   (compat_vers) & 0xff,
-						   (current_vers >> 16),
-						   (current_vers >> 8) & 0xff,
-						   (current_vers) & 0xff);
-					}
-					else {
-						printf("\n");
-					}
-				} 
-				else {
-					printf("\t%s\n", dylib_cmd->name());
-				}
-				break;
-		}
-		cmd = (const macho_load_command<P>*)(((uint8_t*)cmd)+cmd->cmdsize());
-	}
-	results.dependentTargetFound = true;
-}
-
-/*
- * Print out a dylib from the shared cache, optionally including the UUID or unslid load address
- */
-template <typename A>
-void print_list(const dyld_shared_cache_dylib_info* dylibInfo, const dyld_shared_cache_segment_info* segInfo, 
-																		const Options& options, Results& results) 
-{
-	if ( strcmp(segInfo->name, "__TEXT") != 0 )
-		return;
-
-	if ( options.printVMAddrs )
-		printf("0x%08llX ", segInfo->address);
-	if ( options.printInodes )
-		printf("0x%08llX 0x%08llX ", dylibInfo->inode, dylibInfo->modTime);
-	if ( options.printUUIDs ) {
-		if ( dylibInfo->uuid != NULL ) {
-			const uint8_t* uuid = (uint8_t*)dylibInfo->uuid;;
-			printf("<%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X> ",
-    				uuid[0],  uuid[1],  uuid[2],  uuid[3],  
-					uuid[4],  uuid[5],  uuid[6],  uuid[7], 
-    				uuid[8],  uuid[9],  uuid[10], uuid[11], 
-					uuid[12], uuid[13], uuid[14], uuid[15]);
-		}
-	    else
-			printf("<     no uuid in dylib               > ");
-    }
-	if ( dylibInfo->isAlias )
-		printf("[alias] %s\n", dylibInfo->path);
-	else
-		printf("%s\n", dylibInfo->path);
-}
-
-
-template <typename A>
-void collect_size(const dyld_shared_cache_dylib_info* dylibInfo, const dyld_shared_cache_segment_info* segInfo, 
-																		const Options& options, Results& results) 
-{
-	if ( strcmp(segInfo->name, "__TEXT") != 0 )
-		return;
-	if ( dylibInfo->isAlias )
-		return;
-		
-	TextInfo info;
-	info.textSize = segInfo->fileSize;
-	info.path = dylibInfo->path;
-	results.textSegments.push_back(info);
-}
-
-
-
-
-static void add_linkedit(uint32_t pageStart, uint32_t pageEnd, const char* message, Results& results) 
-{	
-	for (uint32_t p = pageStart; p <= pageEnd; p += 4096) {
-		std::map<uint32_t, const char*>::iterator pos = results.pageToContent.find(p);
-		if ( pos == results.pageToContent.end() ) {
-			results.pageToContent[p] = strdup(message);
-		}
-		else {
-			const char* oldMessage = pos->second;
-			char* newMesssage;
-			asprintf(&newMesssage, "%s, %s", oldMessage, message);
-			results.pageToContent[p] = newMesssage;
-			::free((void*)oldMessage);
-		}
-	}
-}
-
-
-/*
- * get LINKEDIT info for dylib
- */
-template <typename A>
-void process_linkedit(const dyld_shared_cache_dylib_info* dylibInfo, const dyld_shared_cache_segment_info* segInfo, 
-																			const Options& options, Results& results) {
-	typedef typename A::P		P;
-	typedef typename A::P::E	E;
-	// filter out symlinks 
-	if ( dylibInfo->isAlias )
-		return;
-	const macho_header<P>* mh = (const macho_header<P>*)dylibInfo->machHeader;
-	uint32_t ncmds = mh->ncmds();
-	const macho_load_command<P>* const cmds = (macho_load_command<P>*)((long)mh + sizeof(macho_header<P>));
-	const macho_load_command<P>* cmd = cmds;
-	for (uint32_t i = 0; i < ncmds; i++) {
-		if ( cmd->cmd() == LC_DYLD_INFO_ONLY ) {
-			macho_dyld_info_command<P>* dyldInfo = (macho_dyld_info_command<P>*)cmd;
-			char message[1000];
-			const char* shortName = strrchr(dylibInfo->path, '/') + 1;
-			// add export trie info
-			if ( dyldInfo->export_size() != 0 ) {
-				//printf("export_off=0x%X\n", dyldInfo->export_off());
-				uint32_t exportPageOffsetStart = dyldInfo->export_off() & (-4096);
-				uint32_t exportPageOffsetEnd = (dyldInfo->export_off() + dyldInfo->export_size()) & (-4096);
-				sprintf(message, "exports from %s", shortName);
-				add_linkedit(exportPageOffsetStart, exportPageOffsetEnd, message, results);
-			}
-			// add binding info
-			if ( dyldInfo->bind_size() != 0 ) {
-				uint32_t bindPageOffsetStart = dyldInfo->bind_off() & (-4096);
-				uint32_t bindPageOffsetEnd = (dyldInfo->bind_off() + dyldInfo->bind_size()) & (-4096);
-				sprintf(message, "bindings from %s", shortName);
-				add_linkedit(bindPageOffsetStart, bindPageOffsetEnd, message, results);
-			}
-			// add lazy binding info
-			if ( dyldInfo->lazy_bind_size() != 0 ) {
-				uint32_t lazybindPageOffsetStart = dyldInfo->lazy_bind_off() & (-4096);
-				uint32_t lazybindPageOffsetEnd = (dyldInfo->lazy_bind_off() + dyldInfo->lazy_bind_size()) & (-4096);
-				sprintf(message, "lazy bindings from %s", shortName);
-				add_linkedit(lazybindPageOffsetStart, lazybindPageOffsetEnd, message, results);
-			}
-			// add weak binding info
-			if ( dyldInfo->weak_bind_size() != 0 ) {
-				uint32_t weakbindPageOffsetStart = dyldInfo->weak_bind_off() & (-4096);
-				uint32_t weakbindPageOffsetEnd = (dyldInfo->weak_bind_off() + dyldInfo->weak_bind_size()) & (-4096);
-				sprintf(message, "weak bindings from %s", shortName);
-				add_linkedit(weakbindPageOffsetStart, weakbindPageOffsetEnd, message, results);
-			}
-		}
-		cmd = (const macho_load_command<P>*)(((uint8_t*)cmd)+cmd->cmdsize());
-	}
-}
-
-
-/*
- * Print out a .map file similar to what update_dyld_shared_cache created when the cache file was built
- */
-template <typename A>
-void print_map(const dyld_shared_cache_dylib_info* dylibInfo, const dyld_shared_cache_segment_info* segInfo, const Options& options, Results& results) {
-	if ( !dylibInfo->isAlias )
-		printf("0x%08llX - 0x%08llX %s %s\n", segInfo->address, segInfo->address + segInfo->fileSize, segInfo->name, dylibInfo->path);
-}
-
-
-static void checkMode(Mode mode) {
-	if ( mode != modeNone ) {
-		fprintf(stderr, "Error: select one of: -list, -dependents, -info, -slide_info, -verbose_slide_info, -linkedit, -map, -extract, or -size\n");
-		usage();
-		exit(1);
-	}
-}
-
 int main (int argc, const char* argv[]) {
 
-	const char* sharedCachePath = default_shared_cache_path();
-
- 	Options options;
-	options.mode = modeNone;
+    const char* sharedCachePath = nullptr;
+
+    Options options;
+    options.mode = modeNone;
     options.printUUIDs = false;
-	options.printVMAddrs = false;
+    options.printVMAddrs = false;
     options.printDylibVersions = false;
-	options.printInodes = false;
+    options.printInodes = false;
     options.dependentsOfPath = NULL;
     options.extractionDir = NULL;
 
@@ -421,43 +171,43 @@
         const char* opt = argv[i];
         if (opt[0] == '-') {
             if (strcmp(opt, "-list") == 0) {
-				checkMode(options.mode);
-				options.mode = modeList;
-            } 
-			else if (strcmp(opt, "-dependents") == 0) {
-				checkMode(options.mode);
-				options.mode = modeDependencies;
-				options.dependentsOfPath = argv[++i];
+                checkMode(options.mode);
+                options.mode = modeList;
+            }
+            else if (strcmp(opt, "-dependents") == 0) {
+                checkMode(options.mode);
+                options.mode = modeDependencies;
+                options.dependentsOfPath = argv[++i];
                 if ( i >= argc ) {
                     fprintf(stderr, "Error: option -depdendents requires an argument\n");
                     usage();
                     exit(1);
                 }
-            } 
-			else if (strcmp(opt, "-linkedit") == 0) {
-				checkMode(options.mode);
-				options.mode = modeLinkEdit;
-			} 
-			else if (strcmp(opt, "-info") == 0) {
-				checkMode(options.mode);
-				options.mode = modeInfo;
-			}
-			else if (strcmp(opt, "-slide_info") == 0) {
-				checkMode(options.mode);
-				options.mode = modeSlideInfo;
-			}
+            }
+            else if (strcmp(opt, "-linkedit") == 0) {
+                checkMode(options.mode);
+                options.mode = modeLinkEdit;
+            }
+            else if (strcmp(opt, "-info") == 0) {
+                checkMode(options.mode);
+                options.mode = modeInfo;
+            }
+            else if (strcmp(opt, "-slide_info") == 0) {
+                checkMode(options.mode);
+                options.mode = modeSlideInfo;
+            }
             else if (strcmp(opt, "-verbose_slide_info") == 0) {
                 checkMode(options.mode);
                 options.mode = modeVerboseSlideInfo;
             }
-			else if (strcmp(opt, "-accelerator_info") == 0) {
-				checkMode(options.mode);
-				options.mode = modeAcceleratorInfo;
-			}
-			else if (strcmp(opt, "-text_info") == 0) {
-				checkMode(options.mode);
-				options.mode = modeTextInfo;
-			}
+            else if (strcmp(opt, "-accelerator_info") == 0) {
+                checkMode(options.mode);
+                options.mode = modeAcceleratorInfo;
+            }
+            else if (strcmp(opt, "-text_info") == 0) {
+                checkMode(options.mode);
+                options.mode = modeTextInfo;
+            }
             else if (strcmp(opt, "-local_symbols") == 0) {
                 checkMode(options.mode);
                 options.mode = modeLocalSymbols;
@@ -468,136 +218,151 @@
                 options.mode = modeStrings;
                 printStrings = true;
             }
+            else if (strcmp(opt, "-sections") == 0) {
+                checkMode(options.mode);
+                options.mode = modeSectionSizes;
+            }
             else if (strcmp(opt, "-exports") == 0) {
                 if (options.mode != modeStrings)
                     checkMode(options.mode);
                 options.mode = modeStrings;
                 printExports = true;
             }
-			else if (strcmp(opt, "-map") == 0) {
-				checkMode(options.mode);
-				options.mode = modeMap;
-            } 
-			else if (strcmp(opt, "-size") == 0) {
-				checkMode(options.mode);
-				options.mode = modeSize;
-            }
-			else if (strcmp(opt, "-extract") == 0) {
-				checkMode(options.mode);
-				options.mode = modeExtract;
- 				options.extractionDir = argv[++i];
+            else if (strcmp(opt, "-map") == 0) {
+                checkMode(options.mode);
+                options.mode = modeMap;
+            }
+            else if (strcmp(opt, "-json-map") == 0) {
+                checkMode(options.mode);
+                options.mode = modeJSONMap;
+            }
+            else if (strcmp(opt, "-json-dependents") == 0) {
+                checkMode(options.mode);
+                options.mode = modeJSONDependents;
+            }
+            else if (strcmp(opt, "-size") == 0) {
+                checkMode(options.mode);
+                options.mode = modeSize;
+            }
+            else if (strcmp(opt, "-objc-protocols") == 0) {
+                checkMode(options.mode);
+                options.mode = modeObjCProtocols;
+            }
+            else if (strcmp(opt, "-extract") == 0) {
+                checkMode(options.mode);
+                options.mode = modeExtract;
+                options.extractionDir = argv[++i];
                 if ( i >= argc ) {
                     fprintf(stderr, "Error: option -extract requires a directory argument\n");
                     usage();
                     exit(1);
                 }
-           }
-			else if (strcmp(opt, "-uuid") == 0) {
+            }
+            else if (strcmp(opt, "-uuid") == 0) {
                 options.printUUIDs = true;
-            } 
-			else if (strcmp(opt, "-inode") == 0) {
+            }
+            else if (strcmp(opt, "-inode") == 0) {
                 options.printInodes = true;
-            } 
-			else if (strcmp(opt, "-versions") == 0) {
+            }
+            else if (strcmp(opt, "-versions") == 0) {
                 options.printDylibVersions = true;
-            } 
-			else if (strcmp(opt, "-vmaddr") == 0) {
-				options.printVMAddrs = true;
-		    } 
-			else {
+            }
+            else if (strcmp(opt, "-vmaddr") == 0) {
+                options.printVMAddrs = true;
+            }
+            else {
                 fprintf(stderr, "Error: unrecognized option %s\n", opt);
                 usage();
                 exit(1);
             }
-        } 
-		else {
+        }
+        else {
             sharedCachePath = opt;
         }
     }
-    
-	if ( options.mode == modeNone ) {
-		fprintf(stderr, "Error: select one of -list, -dependents, -info, -linkedit, or -map\n");
-		usage();
-		exit(1);
-	}
-		
-	if ( options.mode != modeSlideInfo &&  options.mode != modeVerboseSlideInfo ) {
-		if ( options.printUUIDs && (options.mode != modeList) )
-			fprintf(stderr, "Warning: -uuid option ignored outside of -list mode\n");
-			
-		if ( options.printVMAddrs && (options.mode != modeList) )
-			fprintf(stderr, "Warning: -vmaddr option ignored outside of -list mode\n");
-			
-		if ( options.printDylibVersions && (options.mode != modeDependencies) )
-			fprintf(stderr, "Warning: -versions option ignored outside of -dependents mode\n");
-		
-		if ( (options.mode == modeDependencies) && (options.dependentsOfPath == NULL) ) {
-			fprintf(stderr, "Error: -dependents given, but no dylib path specified\n");
-			usage();
-			exit(1);
-		}
-	}
-    
+
+    if ( options.mode == modeNone ) {
+        fprintf(stderr, "Error: select one of -list, -dependents, -info, -linkedit, or -map\n");
+        usage();
+        exit(1);
+    }
+
+    if ( options.mode != modeSlideInfo && options.mode != modeVerboseSlideInfo ) {
+        if ( options.printUUIDs && (options.mode != modeList) )
+            fprintf(stderr, "Warning: -uuid option ignored outside of -list mode\n");
+
+        if ( options.printVMAddrs && (options.mode != modeList) )
+            fprintf(stderr, "Warning: -vmaddr option ignored outside of -list mode\n");
+
+        if ( options.printDylibVersions && (options.mode != modeDependencies) )
+            fprintf(stderr, "Warning: -versions option ignored outside of -dependents mode\n");
+
+        if ( (options.mode == modeDependencies) && (options.dependentsOfPath == NULL) ) {
+            fprintf(stderr, "Error: -dependents given, but no dylib path specified\n");
+            usage();
+            exit(1);
+        }
+    }
+
     const DyldSharedCache* dyldCache = nullptr;
-    bool dyldCacheIsLive = true;
-    size_t cacheLength = 0;
     if ( sharedCachePath != nullptr ) {
-        dyldCache = mapCacheFile(sharedCachePath, cacheLength);
-        dyldCacheIsLive = false;
+        dyldCache = mapCacheFile(sharedCachePath);
+        // mapCacheFile prints an error if something goes wrong, so just return in that case.
+        if ( dyldCache == nullptr )
+            return 1;
     }
     else {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED && (__MAC_OS_X_VERSION_MIN_REQUIRED < 101300)
-        fprintf(stderr, "this tool needs to run on macOS 10.13 or later\n");
-        return 1;
-#else
+#if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || (__MAC_OS_X_VERSION_MIN_REQUIRED >= 101300)
+        size_t cacheLength;
         dyldCache = (DyldSharedCache*)_dyld_get_shared_cache_range(&cacheLength);
 #endif
-    }
-
-    options.mappedCache = dyldCache;
-	
-	if ( options.mode == modeSlideInfo || options.mode == modeVerboseSlideInfo ) {
-		const dyldCacheHeader<LittleEndian>* header = (dyldCacheHeader<LittleEndian>*)options.mappedCache;
-		if ( header->slideInfoOffset() == 0 ) {
-			fprintf(stderr, "Error: dyld shared cache does not contain slide info\n");
-			exit(1);
-		}
-		const dyldCacheFileMapping<LittleEndian>* mappings = (dyldCacheFileMapping<LittleEndian>*)((char*)options.mappedCache + header->mappingOffset());
-        const dyldCacheFileMapping<LittleEndian>* textMapping = &mappings[0];
-		const dyldCacheFileMapping<LittleEndian>* dataMapping = &mappings[1];
-        const dyldCacheFileMapping<LittleEndian>* linkEditMapping = &mappings[2];
-		uint64_t dataStartAddress = dataMapping->address();
-		uint64_t dataSize = dataMapping->size();
-        uint64_t slideInfoMappedOffset = (header->slideInfoOffset()-linkEditMapping->file_offset()) + (linkEditMapping->address() - textMapping->address());
-		const dyldCacheSlideInfo<LittleEndian>* slideInfoHeader = (dyldCacheSlideInfo<LittleEndian>*)((char*)options.mappedCache+slideInfoMappedOffset);
-		printf("slide info version=%d\n", slideInfoHeader->version());
-		if ( slideInfoHeader->version() == 1 ) {
-			printf("toc_count=%d, data page count=%lld\n", slideInfoHeader->toc_count(), dataSize/4096);
-			const dyldCacheSlideInfoEntry* entries = (dyldCacheSlideInfoEntry*)((char*)slideInfoHeader + slideInfoHeader->entries_offset());
-			for(int i=0; i < slideInfoHeader->toc_count(); ++i) {
-				printf("0x%08llX: [% 5d,% 5d] ", dataStartAddress + i*4096, i, slideInfoHeader->toc(i));
-				const dyldCacheSlideInfoEntry* entry = &entries[slideInfoHeader->toc(i)];
-				for(int j=0; j < slideInfoHeader->entries_size(); ++j)
-					printf("%02X", entry->bits[j]);
-				printf("\n");
-			}
-		}
-		else if ( slideInfoHeader->version() == 2 ) {
-			const dyldCacheSlideInfo2<LittleEndian>* slideInfo = (dyldCacheSlideInfo2<LittleEndian>*)(slideInfoHeader);
-			printf("page_size=%d\n", slideInfo->page_size());
-			printf("delta_mask=0x%016llX\n", slideInfo->delta_mask());
-			printf("value_add=0x%016llX\n", slideInfo->value_add());
-			printf("page_starts_count=%d, page_extras_count=%d\n", slideInfo->page_starts_count(), slideInfo->page_extras_count());
-			const uint16_t* starts = (uint16_t* )((char*)slideInfo + slideInfo->page_starts_offset());
-			const uint16_t* extras = (uint16_t* )((char*)slideInfo + slideInfo->page_extras_offset());
-			for (int i=0; i < slideInfo->page_starts_count(); ++i) {
-				const uint16_t start = starts[i];
+        if (dyldCache == nullptr) {
+            fprintf(stderr, "Could not get in-memory shared cache\n");
+            return 1;
+        }
+    }
+
+    if ( options.mode == modeSlideInfo || options.mode == modeVerboseSlideInfo ) {
+        const dyld_cache_header* header = &dyldCache->header;
+        if ( header->slideInfoOffset == 0 ) {
+            fprintf(stderr, "Error: dyld shared cache does not contain slide info\n");
+            exit(1);
+        }
+        const dyld_cache_mapping_info* mappings = (const dyld_cache_mapping_info*)((char*)dyldCache + header->mappingOffset);
+        const dyld_cache_mapping_info* dataMapping = &mappings[1];
+        uint64_t dataStartAddress = dataMapping->address;
+        uint64_t dataSize = dataMapping->size;
+
+        const dyld_cache_slide_info* slideInfoHeader = dyldCache->slideInfo();
+        printf("slide info version=%d\n", slideInfoHeader->version);
+        if ( slideInfoHeader->version == 1 ) {
+            printf("toc_count=%d, data page count=%lld\n", slideInfoHeader->toc_count, dataSize/4096);
+            const dyld_cache_slide_info_entry* entries = (dyld_cache_slide_info_entry*)((char*)slideInfoHeader + slideInfoHeader->entries_offset);
+            const uint16_t* tocs = (uint16_t*)((char*)slideInfoHeader + slideInfoHeader->toc_offset);
+            for(int i=0; i < slideInfoHeader->toc_count; ++i) {
+                printf("0x%08llX: [% 5d,% 5d] ", dataStartAddress + i*4096, i, tocs[i]);
+                const dyld_cache_slide_info_entry* entry = &entries[tocs[i]];
+                for(int j=0; j < slideInfoHeader->entries_size; ++j)
+                    printf("%02X", entry->bits[j]);
+                printf("\n");
+            }
+        }
+        else if ( slideInfoHeader->version == 2 ) {
+            const dyld_cache_slide_info2* slideInfo = (dyld_cache_slide_info2*)(slideInfoHeader);
+            printf("page_size=%d\n", slideInfo->page_size);
+            printf("delta_mask=0x%016llX\n", slideInfo->delta_mask);
+            printf("value_add=0x%016llX\n", slideInfo->value_add);
+            printf("page_starts_count=%d, page_extras_count=%d\n", slideInfo->page_starts_count, slideInfo->page_extras_count);
+            const uint16_t* starts = (uint16_t* )((char*)slideInfo + slideInfo->page_starts_offset);
+            const uint16_t* extras = (uint16_t* )((char*)slideInfo + slideInfo->page_extras_offset);
+            for (int i=0; i < slideInfo->page_starts_count; ++i) {
+                const uint16_t start = starts[i];
                 auto rebaseChain = [&](uint8_t* pageContent, uint16_t startOffset)
                 {
                     uintptr_t slideAmount = 0;
-                    const uintptr_t   deltaMask    = (uintptr_t)(slideInfo->delta_mask());
+                    const uintptr_t   deltaMask    = (uintptr_t)(slideInfo->delta_mask);
                     const uintptr_t   valueMask    = ~deltaMask;
-                    const uintptr_t   valueAdd     = (uintptr_t)(slideInfo->value_add());
+                    const uintptr_t   valueAdd     = (uintptr_t)(slideInfo->value_add);
                     const unsigned    deltaShift   = __builtin_ctzll(deltaMask) - 2;
 
                     uint32_t pageOffset = startOffset;
@@ -611,78 +376,83 @@
                             value += valueAdd;
                             value += slideAmount;
                         }
-                        printf("    [% 5d + 0x%04llX]: 0x%016llX\n", i, (uint64_t)(pageOffset), (uint64_t)rawValue);
+                        printf("    [% 5d + 0x%04llX]: 0x%016llX = 0x%016llX\n", i, (uint64_t)(pageOffset), (uint64_t)rawValue, (uint64_t)value);
                         pageOffset += delta;
                     }
                 };
-                const uint8_t* dataPagesStart = (uint8_t*)((char*)options.mappedCache + dataMapping->file_offset());
-				if ( start == DYLD_CACHE_SLIDE_PAGE_ATTR_NO_REBASE ) {
-					printf("page[% 5d]: no rebasing\n", i);
-				}
-				else if ( start & DYLD_CACHE_SLIDE_PAGE_ATTR_EXTRA ) {
-					printf("page[% 5d]: ", i);
-					int j=(start & 0x3FFF);
-					bool done = false;
-					do {
-						uint16_t aStart = extras[j];
-						printf("start=0x%04X ", aStart & 0x3FFF);
+                const uint8_t* dataPagesStart = dyldCache->dataRegionStart();
+                if ( start == DYLD_CACHE_SLIDE_PAGE_ATTR_NO_REBASE ) {
+                    printf("page[% 5d]: no rebasing\n", i);
+                }
+                else if ( start & DYLD_CACHE_SLIDE_PAGE_ATTR_EXTRA ) {
+                    printf("page[% 5d]: ", i);
+                    int j=(start & 0x3FFF);
+                    bool done = false;
+                    do {
+                        uint16_t aStart = extras[j];
+                        printf("start=0x%04X ", aStart & 0x3FFF);
                         if ( options.mode == modeVerboseSlideInfo ) {
-                            uint8_t* page = (uint8_t*)(long)(dataPagesStart + (slideInfo->page_size()*i));
+                            uint8_t* page = (uint8_t*)(long)(dataPagesStart + (slideInfo->page_size*i));
                             uint16_t pageStartOffset = (aStart & 0x3FFF)*4;
                             rebaseChain(page, pageStartOffset);
                         }
-						done = (extras[j] & DYLD_CACHE_SLIDE_PAGE_ATTR_END);
-						++j;
-					} while ( !done );
-					printf("\n");
-				}
-				else {
-					printf("page[% 5d]: start=0x%04X\n", i, starts[i]);
+                        done = (extras[j] & DYLD_CACHE_SLIDE_PAGE_ATTR_END);
+                        ++j;
+                    } while ( !done );
+                    printf("\n");
+                }
+                else {
+                    printf("page[% 5d]: start=0x%04X\n", i, starts[i]);
                     if ( options.mode == modeVerboseSlideInfo ) {
-                        uint8_t* page = (uint8_t*)(long)(dataPagesStart + (slideInfo->page_size()*i));
+                        uint8_t* page = (uint8_t*)(long)(dataPagesStart + (slideInfo->page_size*i));
                         uint16_t pageStartOffset = start*4;
                         rebaseChain(page, pageStartOffset);
                     }
-				}
-			}
-		}
-        else if ( slideInfoHeader->version() == 3 ) {
-            const dyldCacheSlideInfo3<LittleEndian>* slideInfo = (dyldCacheSlideInfo3<LittleEndian>*)(slideInfoHeader);
-            printf("page_size=%d\n", slideInfo->page_size());
-            printf("page_starts_count=%d\n", slideInfo->page_starts_count());
-            printf("auth_value_add=0x%016llX\n", slideInfo->auth_value_add());
-            const uint8_t* dataSegmentStart = (uint8_t*)((char*)options.mappedCache + dataMapping->file_offset());
-            for (int i=0; i < slideInfo->page_starts_count(); ++i) {
-                const uint16_t start = slideInfo->page_starts(i);
-                if ( start == 0xFFFF ) {
+                }
+            }
+        }
+        else if ( slideInfoHeader->version == 3 ) {
+            const dyld_cache_slide_info3* slideInfo = (dyld_cache_slide_info3*)(slideInfoHeader);
+            printf("page_size=%d\n", slideInfo->page_size);
+            printf("page_starts_count=%d\n", slideInfo->page_starts_count);
+            printf("auth_value_add=0x%016llX\n", slideInfo->auth_value_add);
+            const uintptr_t authValueAdd = (uintptr_t)(slideInfo->auth_value_add);
+            const uint8_t* dataSegmentStart = dyldCache->dataRegionStart();
+            for (int i=0; i < slideInfo->page_starts_count; ++i) {
+                uint16_t delta = slideInfo->page_starts[i];
+                if ( delta == DYLD_CACHE_SLIDE_V3_PAGE_ATTR_NO_REBASE ) {
                     printf("page[% 5d]: no rebasing\n", i);
-                }
-                else {
-                    printf("page[% 5d]: start=0x%04X\n", i, start);
-                    if ( options.mode == modeVerboseSlideInfo ) {
-                        typedef Pointer64<LittleEndian> P;
-                        typedef typename P::uint_t      pint_t;
-                        const uint8_t* pageStart = dataSegmentStart + (i * slideInfo->page_size());
-                        pint_t delta = start;
-                        const uint8_t* rebaseLocation = pageStart;
-                        do {
-                            rebaseLocation += delta;
-                            pint_t value = (pint_t)P::getP(*(uint64_t*)rebaseLocation);
-                            delta = ( (value & 0x3FF8000000000000) >> 51) * sizeof(pint_t);
-
-                            // Regular pointer which needs to fit in 51-bits of value.
-                            // C++ RTTI uses the top bit, so we'll allow the whole top-byte
-                            // and the signed-extended bottom 43-bits to be fit in to 51-bits.
-                            uint64_t top8Bits = value & 0x007F80000000000ULL;
-                            uint64_t bottom43Bits = value & 0x000007FFFFFFFFFFULL;
-                            uint64_t targetValue = ( top8Bits << 13 ) | (((intptr_t)(bottom43Bits << 21) >> 21) & 0x00FFFFFFFFFFFFFF);
-                            printf("    [% 5d + 0x%04llX]: 0x%016llX\n", i, (uint64_t)(rebaseLocation - pageStart), targetValue);
-                        } while (delta != 0);
-                    }
-                }
-            }
-        }
-        else if ( slideInfoHeader->version() == 4 ) {
+                    continue;
+                }
+
+                printf("page[% 5d]: start=0x%04X\n", i, delta);
+                if ( options.mode != modeVerboseSlideInfo )
+                    continue;
+
+                delta = delta/sizeof(uint64_t); // initial offset is byte based
+                const uint8_t* pageStart = dataSegmentStart + (i * slideInfo->page_size);
+                const dyld_cache_slide_pointer3* loc = (dyld_cache_slide_pointer3*)pageStart;
+                do {
+                    loc += delta;
+                    delta = loc->plain.offsetToNextPointer;
+                    dyld3::MachOLoaded::ChainedFixupPointerOnDisk ptr;
+                    ptr.raw64 = *((uint64_t*)loc);
+                    if ( loc->auth.authenticated ) {
+                        uint64_t target = authValueAdd + loc->auth.offsetFromSharedCacheBase;
+                        uint64_t targetValue = ptr.arm64e.signPointer((void*)loc, target);
+                        printf("    [% 5d + 0x%04llX]: 0x%016llX (JOP: diversity %d, address %s, %s)\n",
+                               i, (uint64_t)((const uint8_t*)loc - pageStart), targetValue,
+                               ptr.arm64e.authBind.diversity, ptr.arm64e.authBind.addrDiv ? "true" : "false",
+                               ptr.arm64e.keyName());
+                    }
+                    else {
+                        uint64_t targetValue = ptr.arm64e.unpackTarget();
+                        printf("    [% 5d + 0x%04llX]: 0x%016llX\n", i, (uint64_t)((const uint8_t*)loc - pageStart), targetValue);
+                    }
+                } while (delta != 0);
+            }
+        }
+        else if ( slideInfoHeader->version == 4 ) {
             const dyld_cache_slide_info4* slideInfo = (dyld_cache_slide_info4*)(slideInfoHeader);
             printf("page_size=%d\n", slideInfo->page_size);
             printf("delta_mask=0x%016llX\n", slideInfo->delta_mask);
@@ -722,7 +492,7 @@
                         pageOffset += delta;
                     }
                 };
-                const uint8_t* dataPagesStart = (uint8_t*)((char*)options.mappedCache + dataMapping->file_offset());
+                const uint8_t* dataPagesStart = dyldCache->dataRegionStart();
                 if ( start == DYLD_CACHE_SLIDE4_PAGE_NO_REBASE ) {
                     printf("page[% 5d]: no rebasing\n", i);
                 }
@@ -753,24 +523,22 @@
                 }
             }
         }
-        return 0;
-	}
-	
-    if ( options.mode == modeInfo ) {
-		const dyldCacheHeader<LittleEndian>* header = (dyldCacheHeader<LittleEndian>*)options.mappedCache;
-		printf("uuid: ");
-		if ( header->mappingOffset() >= 0x68 ) {
-			const uint8_t* uuid = header->uuid();
-			printf("%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X\n",
-				   uuid[0],  uuid[1],  uuid[2],  uuid[3],
-				   uuid[4],  uuid[5],  uuid[6],  uuid[7],
-				   uuid[8],  uuid[9],  uuid[10], uuid[11],
-				   uuid[12], uuid[13], uuid[14], uuid[15]);
-		}
-		else {
-			printf("n/a\n");
-		}
-		if ( header->mappingOffset() >= 0xE0 ) {
+    }
+    else if ( options.mode == modeInfo ) {
+        const dyld_cache_header* header = &dyldCache->header;
+        printf("uuid: ");
+        if ( header->mappingOffset >= 0x68 ) {
+            const uint8_t* uuid = header->uuid;
+            printf("%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X\n",
+                   uuid[0],  uuid[1],  uuid[2],  uuid[3],
+                   uuid[4],  uuid[5],  uuid[6],  uuid[7],
+                   uuid[8],  uuid[9],  uuid[10], uuid[11],
+                   uuid[12], uuid[13], uuid[14], uuid[15]);
+        }
+        else {
+            printf("n/a\n");
+        }
+        if ( header->mappingOffset >= 0xE0 ) {
             // HACK until this uses new header
             uint32_t platform = *((uint32_t*)(((char*)header) + 0xD8));
             uint32_t bitfield = *((uint32_t*)(((char*)header) + 0xDC));
@@ -806,185 +574,199 @@
             }
             printf("built by: %s\n", locallyBuiltCache ? "local machine" : "B&I");
         }
-		printf("image count: %u\n", header->imagesCount());
-		if ( (header->mappingOffset() >= 0x78) && (header->branchPoolsOffset() != 0) ) {
-			printf("branch pool count:  %u\n", header->branchPoolsCount());
-		}
-		printf("mappings:\n");
-		const dyldCacheFileMapping<LittleEndian>* mappings = (dyldCacheFileMapping<LittleEndian>*)((char*)options.mappedCache + header->mappingOffset());
-		for (uint32_t i=0; i < header->mappingCount(); ++i) {
-			if ( mappings[i].init_prot() & VM_PROT_EXECUTE )
-				printf("    __TEXT      %3lluMB,  file offset: 0x%08llX -> 0x%08llX,  address: 0x%08llX -> 0x%08llX\n",
-						mappings[i].size()/(1024*1024), mappings[i].file_offset(), mappings[i].file_offset() + mappings[i].size(),
-													    mappings[i].address(), mappings[i].address() + mappings[i].size());
-			else if ( mappings[i]. init_prot() & VM_PROT_WRITE )
-				printf("    __DATA      %3lluMB,  file offset: 0x%08llX -> 0x%08llX,  address: 0x%08llX -> 0x%08llX\n",
-						mappings[i].size()/(1024*1024), mappings[i].file_offset(), mappings[i].file_offset() + mappings[i].size(),
-													    mappings[i].address(), mappings[i].address() + mappings[i].size());
-			else if ( mappings[i].init_prot() & VM_PROT_READ )
-				printf("    __LINKEDIT  %3lluMB,  file offset: 0x%08llX -> 0x%08llX,  address: 0x%08llX -> 0x%08llX\n",
-						mappings[i].size()/(1024*1024), mappings[i].file_offset(), mappings[i].file_offset() + mappings[i].size(),
-													    mappings[i].address(), mappings[i].address() + mappings[i].size());
-		}
-		if ( header->codeSignatureOffset() != 0 ) {
-			uint64_t size = cacheLength - header->codeSignatureOffset();
-			uint64_t csAddr = mappings[header->mappingCount()-1].address() + mappings[header->mappingCount()-1].size();
-			if ( size != 0 )
-				printf("    code sign   %3lluMB,  file offset: 0x%08llX -> 0x%08llX,  address: 0x%08llX -> 0x%08llX\n",
-					size/(1024*1024), header->codeSignatureOffset(), header->codeSignatureOffset() + size, csAddr, csAddr + size);
-		}
-				printf("slide info:    %4lluKB,  file offset: 0x%08llX -> 0x%08llX\n",
-						header->slideInfoSize()/1024, header->slideInfoOffset(), header->slideInfoOffset() + header->slideInfoSize());
-		if ( header->localSymbolsOffset() != 0 )
-			printf("local symbols:  %3lluMB,  file offset: 0x%08llX -> 0x%08llX\n",
-						header->localSymbolsSize()/(1024*1024), header->localSymbolsOffset(), header->localSymbolsOffset() + header->localSymbolsSize());
-		if ( (header->mappingOffset() >= 0x78) && (header->accelerateInfoSize() != 0) )
-				printf("accelerate tab: %3lluKB,                                          address: 0x%08llX -> 0x%08llX\n",
-						header->accelerateInfoSize()/1024, header->accelerateInfoAddr(), header->accelerateInfoAddr() + header->accelerateInfoSize());
-	}
-	else if ( options.mode == modeAcceleratorInfo ) {
-		const dyldCacheHeader<LittleEndian>* header = (dyldCacheHeader<LittleEndian>*)options.mappedCache;
-		if ( (header->mappingOffset() < sizeof(dyldCacheHeader<LittleEndian>)) || (header->accelerateInfoSize() == 0) ) {
-			printf("no accelerator info\n");
-		}
-		else {
-			const dyldCacheFileMapping<LittleEndian>* mappings = (dyldCacheFileMapping<LittleEndian>*)((char*)options.mappedCache + header->mappingOffset());
-			uint64_t aiAddr = header->accelerateInfoAddr();
-			dyldCacheAcceleratorInfo<LittleEndian>* accelInfo = NULL;
-			for (uint32_t i=0; i < header->mappingCount(); ++i) {
-				if ( (mappings[i].address() <= aiAddr) && (aiAddr < mappings[i].address()+mappings[i].size()) ) {
-					uint64_t offset = aiAddr - mappings[i].address() + mappings[i].file_offset();
-					accelInfo = (dyldCacheAcceleratorInfo<LittleEndian>*)((uint8_t*)options.mappedCache + offset);
-				}
-			}
-			if ( accelInfo == NULL ) {
-				printf("accelerator info not in any mapped range\n");
-			}
-			else {
-				const dyldCacheImageInfo<LittleEndian>* images = (dyldCacheImageInfo<LittleEndian>*)((char*)options.mappedCache + header->imagesOffset());
-				const dyldCacheImageInfoExtra<LittleEndian>* imagesExtra = (dyldCacheImageInfoExtra<LittleEndian>*)((char*)accelInfo + accelInfo->imagesExtrasOffset());
-				const uint16_t* dependencyArray = (uint16_t*)((char*)accelInfo + accelInfo->depListOffset());
-				const uint16_t* reExportArray = (uint16_t*)((char*)accelInfo + accelInfo->reExportListOffset());
-				printf("extra image info (count=%u):\n", accelInfo->imageExtrasCount());
-				for (uint32_t i=0; i < accelInfo->imageExtrasCount(); ++i) {
-					printf("  image[%3u] %s:\n", i, (char*)options.mappedCache +images[i].pathFileOffset());
-					printf("     exports trie: addr=0x%llX, size=0x%08X\n", imagesExtra[i].exportsTrieAddr(), imagesExtra[i].exportsTrieSize());
-					if ( imagesExtra[i].weakBindingsSize() )
-						printf("     weak bind info: addr=0x%llX, size=0x%08X\n", imagesExtra[i].weakBindingsAddr(), imagesExtra[i].weakBindingsSize());
-					printf("     dependents: ");
-					for (uint32_t d=imagesExtra[i].dependentsStartArrayIndex(); dependencyArray[d] != 0xFFFF; ++d) {
-						uint16_t depIndex = dependencyArray[d];
-						if ( depIndex & 0x8000 )
-							printf(" up(%d) ", depIndex & 0x7FFF);
-						else
-							printf(" %d ", depIndex);
-					}
-					printf("\n");
-					printf("     re-exports: ");
-					for (uint32_t r=imagesExtra[i].reExportsStartArrayIndex(); reExportArray[r] != 0xFFFF; ++r)
-						printf(" %d ", reExportArray[r]);
-					printf("\n");
-				}
-				printf("libdyld.dylib:\n");
-				printf("   __dyld section address: 0x%llX\n", accelInfo->dyldSectionAddr());
-				printf("initializers (count=%u):\n", accelInfo->initializersCount());
-				const dyldCacheAcceleratorInitializer<LittleEndian>* initializers = (dyldCacheAcceleratorInitializer<LittleEndian>*)((char*)accelInfo + accelInfo->initializersOffset());
-				for (uint32_t i=0; i < accelInfo->initializersCount(); ++i) {
-					printf("  image[%3u] 0x%llX\n", initializers[i].imageIndex(), mappings[0].address() + initializers[i].functionOffset());
-				}
-				printf("DOF sections (count=%u):\n", accelInfo->dofSectionsCount());
-				const dyldCacheAcceleratorDOFEntry<LittleEndian>* dofs = (dyldCacheAcceleratorDOFEntry<LittleEndian>*)((char*)accelInfo + accelInfo->dofSectionsOffset());
-				for (uint32_t i=0; i < accelInfo->dofSectionsCount(); ++i) {
-					printf("  image[%3u] 0x%llX -> 0x%llX\n", dofs[i].imageIndex(), dofs[i].sectionAddress(), dofs[i].sectionAddress()+dofs[i].sectionSize());
-				}
-				printf("bottom up order (count=%u):\n", accelInfo->imageExtrasCount());
-				const uint16_t* bottomUpArray = (uint16_t*)((char*)accelInfo + accelInfo->bottomUpListOffset());
-				for (uint32_t i=0; i < accelInfo->imageExtrasCount(); ++i) {
-					unsigned imageIndex = bottomUpArray[i];
-					if ( imageIndex < accelInfo->imageExtrasCount() )
-						printf("  image[%3u] %s\n", imageIndex, (char*)options.mappedCache + images[imageIndex].pathFileOffset());
-					else
-						printf("  image[%3u] BAD INDEX\n", imageIndex);
-				}
-				printf("range table (count=%u):\n", accelInfo->rangeTableCount());
-				const dyldCacheAcceleratorRangeEntry<LittleEndian>* rangeTable = (dyldCacheAcceleratorRangeEntry<LittleEndian>*)((char*)accelInfo + accelInfo->rangeTableOffset());
-				for (uint32_t i=0; i < accelInfo->rangeTableCount(); ++i) {
-					const dyldCacheAcceleratorRangeEntry<LittleEndian>& entry = rangeTable[i];
-					printf("  0x%llX -> 0x%llX %s\n", entry.startAddress(), entry.startAddress() + entry.size(), (char*)options.mappedCache + images[entry.imageIndex()].pathFileOffset());
-				}
-				printf("dylib trie (size=%u):\n", accelInfo->dylibTrieSize());
-				const uint8_t* dylibTrieStart = (uint8_t*)accelInfo + accelInfo->dylibTrieOffset();
-				const uint8_t* dylibTrieEnd = dylibTrieStart + accelInfo->dylibTrieSize();
-				std::vector<DylibIndexTrie::Entry> dylibEntries;
-				if ( !Trie<DylibIndex>::parseTrie(dylibTrieStart, dylibTrieEnd, dylibEntries) )
-					printf("  malformed dylibs trie\n");
-				for (const DylibIndexTrie::Entry& x : dylibEntries) {
-					printf("  image[%3u] %s\n", x.info.index, x.name.c_str());
-				}
-			}
-		}
-	}
-	else if ( options.mode == modeTextInfo ) {
-		const dyldCacheHeader<LittleEndian>* header = (dyldCacheHeader<LittleEndian>*)options.mappedCache;
-		if ( (header->mappingOffset() < sizeof(dyldCacheHeader<LittleEndian>)) || (header->imagesTextCount() == 0) ) {
-			printf("no text info\n");
-		}
-		else {
-			const dyldCacheImageTextInfo<LittleEndian>* imagesText = (dyldCacheImageTextInfo<LittleEndian>*)((char*)options.mappedCache + header->imagesTextOffset());
-			const dyldCacheImageTextInfo<LittleEndian>* imagesTextEnd = &imagesText[header->imagesTextCount()];
-			printf("dylib text infos (count=%llu):\n", header->imagesTextCount());
-			for (const dyldCacheImageTextInfo<LittleEndian>* p=imagesText; p < imagesTextEnd; ++p) {
-				printf("   0x%09llX -> 0x%09llX  <", p->loadAddress(), p->loadAddress() + p->textSegmentSize());
-				for (int i=0; i<16; ++i) {
-					switch (i) {
-						case 4:
-						case 6:
-						case 8:
-						case 10:
-							printf("-");
-							break;
-					}
-					printf("%02X", p->uuid()[i]);
-				}
-				printf(">  %s\n", (char*)options.mappedCache + p->pathOffset());
-			}
-		}
-	}
-	else if ( options.mode == modeLocalSymbols ) {
-		const dyldCacheHeader<LittleEndian>* header = (dyldCacheHeader<LittleEndian>*)options.mappedCache;
-		if ( header->localSymbolsOffset() == 0 ) {
-			fprintf(stderr, "Error: dyld shared cache does not contain local symbols info\n");
-			exit(1);
-		}
-		const bool is64 = (strstr((char*)options.mappedCache, "64") != NULL);
-		const dyldCacheImageInfo<LittleEndian>* imageInfos = (dyldCacheImageInfo<LittleEndian>*)((char*)options.mappedCache + header->imagesOffset());
-		const dyldCacheLocalSymbolsInfo<LittleEndian>* localsInfo = (dyldCacheLocalSymbolsInfo<LittleEndian>*)((char*)options.mappedCache + header->localSymbolsOffset());
-		const uint32_t nlistFileOffset = (uint32_t)(header->localSymbolsOffset() + localsInfo->nlistOffset());
-		const uint32_t nlistCount = localsInfo->nlistCount();
-		const uint32_t nlistByteSize = is64 ? nlistCount*16 : nlistCount*12;
-		const uint32_t stringsFileOffset = (uint32_t)(header->localSymbolsOffset() + localsInfo->stringsOffset());
-		const uint32_t stringsSize = localsInfo->stringsSize();
-		const uint32_t entriesCount = localsInfo->entriesCount();
-		const dyldCacheLocalSymbolEntry<LittleEndian>* entries = (dyldCacheLocalSymbolEntry<LittleEndian>*)((char*)localsInfo + localsInfo->entriesOffset());
-		printf("local symbols nlist array:  %3uMB,  file offset: 0x%08X -> 0x%08X\n", nlistByteSize/(1024*1024), nlistFileOffset, nlistFileOffset+nlistByteSize);
-		printf("local symbols string pool:  %3uMB,  file offset: 0x%08X -> 0x%08X\n", stringsSize/(1024*1024), stringsFileOffset, stringsFileOffset+stringsSize);
-		printf("local symbols by dylib (count=%d):\n", entriesCount);
-		//const char* stringPool = (char*)options.mappedCache + stringsFileOffset;
-		for (int i=0; i < entriesCount; ++i) {
-			const char* imageName = (char*)options.mappedCache + imageInfos[i].pathFileOffset();
-			printf("   nlistStartIndex=%5d, nlistCount=%5d, image=%s\n", entries[i].nlistStartIndex(), entries[i].nlistCount(), imageName);
-		#if 0
-			if ( is64 ) {
-				const nlist_64* symTab = (nlist_64*)((char*)options.mappedCache + nlistFileOffset);
-				for (int e=0; e < entries[i].nlistCount(); ++e) {
-					const nlist_64* entry = &symTab[entries[i].nlistStartIndex()+e];
-					printf("     nlist[%d].str=%d, %s\n", e, entry->n_un.n_strx, &stringPool[entry->n_un.n_strx]);
-					printf("     nlist[%d].value=0x%0llX\n", e, entry->n_value);
-				}
-			}
-		#endif
-		}
-	}
+        printf("cache type: %s\n", header->cacheType ? "production" : "development");
+        printf("image count: %u\n", header->imagesCount);
+        if ( (header->mappingOffset >= 0x78) && (header->branchPoolsOffset != 0) ) {
+            printf("branch pool count:  %u\n", header->branchPoolsCount);
+        }
+        if ( header->slideInfoSize > 0 ) {
+            uint32_t pageSize            = 0x4000; // fix me for intel
+            uint32_t possibleSlideValues = (uint32_t)(header->maxSlide/pageSize);
+            uint32_t entropyBits         = 32 - __builtin_clz(possibleSlideValues - 1);
+            printf("ASLR entropy: %u-bits\n", entropyBits);
+        }
+        printf("mappings:\n");
+        const dyld_cache_mapping_info* mappings = (const dyld_cache_mapping_info*)((char*)dyldCache + header->mappingOffset);
+        for (uint32_t i=0; i < header->mappingCount; ++i) {
+            if ( mappings[i].initProt & VM_PROT_EXECUTE )
+                printf("    __TEXT      %3lluMB,  file offset: 0x%08llX -> 0x%08llX,  address: 0x%08llX -> 0x%08llX\n",
+                       mappings[i].size/(1024*1024), mappings[i].fileOffset, mappings[i].fileOffset + mappings[i].size,
+                       mappings[i].address, mappings[i].address + mappings[i].size);
+            else if ( mappings[i].initProt & VM_PROT_WRITE )
+                printf("    __DATA      %3lluMB,  file offset: 0x%08llX -> 0x%08llX,  address: 0x%08llX -> 0x%08llX\n",
+                       mappings[i].size/(1024*1024), mappings[i].fileOffset, mappings[i].fileOffset + mappings[i].size,
+                       mappings[i].address, mappings[i].address + mappings[i].size);
+            else if ( mappings[i].initProt & VM_PROT_READ )
+                printf("    __LINKEDIT  %3lluMB,  file offset: 0x%08llX -> 0x%08llX,  address: 0x%08llX -> 0x%08llX\n",
+                       mappings[i].size/(1024*1024), mappings[i].fileOffset, mappings[i].fileOffset + mappings[i].size,
+                       mappings[i].address, mappings[i].address + mappings[i].size);
+        }
+        if ( header->codeSignatureOffset != 0 ) {
+            uint64_t size = header->codeSignatureSize;
+            uint64_t csAddr = mappings[header->mappingCount-1].address + mappings[header->mappingCount-1].size;
+            if ( size != 0 )
+                printf("    code sign   %3lluMB,  file offset: 0x%08llX -> 0x%08llX,  address: 0x%08llX -> 0x%08llX\n",
+                       size/(1024*1024), header->codeSignatureOffset, header->codeSignatureOffset + size, csAddr, csAddr + size);
+        }
+        printf("slide info:    %4lluKB,  file offset: 0x%08llX -> 0x%08llX\n",
+               header->slideInfoSize/1024, header->slideInfoOffset, header->slideInfoOffset + header->slideInfoSize);
+        if ( header->localSymbolsOffset != 0 )
+            printf("local symbols:  %3lluMB,  file offset: 0x%08llX -> 0x%08llX\n",
+                   header->localSymbolsSize/(1024*1024), header->localSymbolsOffset, header->localSymbolsOffset + header->localSymbolsSize);
+        if ( (header->mappingOffset >= 0x78) && (header->accelerateInfoSize != 0) )
+            printf("accelerate tab: %3lluKB,                                          address: 0x%08llX -> 0x%08llX\n",
+                   header->accelerateInfoSize/1024, header->accelerateInfoAddr, header->accelerateInfoAddr + header->accelerateInfoSize);
+    }
+    else if ( options.mode == modeAcceleratorInfo ) {
+        const dyld_cache_header* header = &dyldCache->header;
+        if ( (header->mappingOffset < sizeof(dyld_cache_header)) || (header->accelerateInfoSize == 0) ) {
+            printf("no accelerator info\n");
+        }
+        else {
+            const dyld_cache_mapping_info* mappings = (const dyld_cache_mapping_info*)((char*)dyldCache + header->mappingOffset);
+            uint64_t aiAddr = header->accelerateInfoAddr;
+            const dyld_cache_accelerator_info* accelInfo = NULL;
+            for (uint32_t i=0; i < header->mappingCount; ++i) {
+                if ( (mappings[i].address <= aiAddr) && (aiAddr < mappings[i].address+mappings[i].size) ) {
+                    uint64_t offset = aiAddr - mappings[i].address + mappings[i].fileOffset;
+                    accelInfo = (dyld_cache_accelerator_info*)((uint8_t*)dyldCache + offset);
+                }
+            }
+            if ( accelInfo == NULL ) {
+                printf("accelerator info not in any mapped range\n");
+            }
+            else {
+                const dyld_cache_image_info* images = (dyld_cache_image_info*)((char*)dyldCache + header->imagesOffset);
+                const dyld_cache_image_info_extra* imagesExtra = (dyld_cache_image_info_extra*)((char*)accelInfo + accelInfo->imagesExtrasOffset);
+                const uint16_t* dependencyArray = (uint16_t*)((char*)accelInfo + accelInfo->depListOffset);
+                const uint16_t* reExportArray = (uint16_t*)((char*)accelInfo + accelInfo->reExportListOffset);
+                printf("extra image info (count=%u):\n", accelInfo->imageExtrasCount);
+                for (uint32_t i=0; i < accelInfo->imageExtrasCount; ++i) {
+                    printf("  image[%3u] %s:\n", i, (char*)dyldCache +images[i].pathFileOffset);
+                    printf("     exports trie: addr=0x%llX, size=0x%08X\n", imagesExtra[i].exportsTrieAddr, imagesExtra[i].exportsTrieSize);
+                    if ( imagesExtra[i].weakBindingsSize )
+                        printf("     weak bind info: addr=0x%llX, size=0x%08X\n", imagesExtra[i].weakBindingsAddr, imagesExtra[i].weakBindingsSize);
+                    printf("     dependents: ");
+                    for (uint32_t d=imagesExtra[i].dependentsStartArrayIndex; dependencyArray[d] != 0xFFFF; ++d) {
+                        uint16_t depIndex = dependencyArray[d];
+                        if ( depIndex & 0x8000 )
+                            printf(" up(%d) ", depIndex & 0x7FFF);
+                        else
+                            printf(" %d ", depIndex);
+                    }
+                    printf("\n");
+                    printf("     re-exports: ");
+                    for (uint32_t r=imagesExtra[i].reExportsStartArrayIndex; reExportArray[r] != 0xFFFF; ++r)
+                        printf(" %d ", reExportArray[r]);
+                    printf("\n");
+                }
+                printf("libdyld.dylib:\n");
+                printf("   __dyld section address: 0x%llX\n", accelInfo->dyldSectionAddr);
+                printf("initializers (count=%u):\n", accelInfo->initializersCount);
+                const dyld_cache_accelerator_initializer* initializers = (dyld_cache_accelerator_initializer*)((char*)accelInfo + accelInfo->initializersOffset);
+                for (uint32_t i=0; i < accelInfo->initializersCount; ++i) {
+                    printf("  image[%3u] 0x%llX\n", initializers[i].imageIndex, mappings[0].address + initializers[i].functionOffset);
+                }
+                printf("DOF sections (count=%u):\n", accelInfo->dofSectionsCount);
+                const dyld_cache_accelerator_dof* dofs = (dyld_cache_accelerator_dof*)((char*)accelInfo + accelInfo->dofSectionsOffset);
+                for (uint32_t i=0; i < accelInfo->dofSectionsCount; ++i) {
+                    printf("  image[%3u] 0x%llX -> 0x%llX\n", dofs[i].imageIndex, dofs[i].sectionAddress, dofs[i].sectionAddress+dofs[i].sectionSize);
+                }
+                printf("bottom up order (count=%u):\n", accelInfo->imageExtrasCount);
+                const uint16_t* bottomUpArray = (uint16_t*)((char*)accelInfo + accelInfo->bottomUpListOffset);
+                for (uint32_t i=0; i < accelInfo->imageExtrasCount; ++i) {
+                    unsigned imageIndex = bottomUpArray[i];
+                    if ( imageIndex < accelInfo->imageExtrasCount )
+                        printf("  image[%3u] %s\n", imageIndex, (char*)dyldCache + images[imageIndex].pathFileOffset);
+                    else
+                        printf("  image[%3u] BAD INDEX\n", imageIndex);
+                }
+                printf("range table (count=%u):\n", accelInfo->rangeTableCount);
+                const dyld_cache_range_entry* rangeTable = (dyld_cache_range_entry*)((char*)accelInfo + accelInfo->rangeTableOffset);
+                for (uint32_t i=0; i < accelInfo->rangeTableCount; ++i) {
+                    const dyld_cache_range_entry& entry = rangeTable[i];
+                    printf("  0x%llX -> 0x%llX %s\n", entry.startAddress, entry.startAddress + entry.size, (char*)dyldCache + images[entry.imageIndex].pathFileOffset);
+                }
+                printf("dylib trie (size=%u):\n", accelInfo->dylibTrieSize);
+                const uint8_t* dylibTrieStart = (uint8_t*)accelInfo + accelInfo->dylibTrieOffset;
+                const uint8_t* dylibTrieEnd = dylibTrieStart + accelInfo->dylibTrieSize;
+                std::vector<DylibIndexTrie::Entry> dylibEntries;
+                if ( !Trie<DylibIndex>::parseTrie(dylibTrieStart, dylibTrieEnd, dylibEntries) )
+                    printf("  malformed dylibs trie\n");
+                for (const DylibIndexTrie::Entry& x : dylibEntries) {
+                    printf("  image[%3u] %s\n", x.info.index, x.name.c_str());
+                }
+            }
+        }
+    }
+    else if ( options.mode == modeTextInfo ) {
+        const dyld_cache_header* header = &dyldCache->header;
+        if ( (header->mappingOffset < sizeof(dyld_cache_header)) || (header->imagesTextCount == 0) ) {
+            printf("no text info\n");
+        }
+        else {
+            const dyld_cache_image_text_info* imagesText = (dyld_cache_image_text_info*)((char*)dyldCache + header->imagesTextOffset);
+            const dyld_cache_image_text_info* imagesTextEnd = &imagesText[header->imagesTextCount];
+            printf("dylib text infos (count=%llu):\n", header->imagesTextCount);
+            for (const dyld_cache_image_text_info* p=imagesText; p < imagesTextEnd; ++p) {
+                printf("   0x%09llX -> 0x%09llX  <", p->loadAddress, p->loadAddress + p->textSegmentSize);
+                for (int i=0; i<16; ++i) {
+                    switch (i) {
+                        case 4:
+                        case 6:
+                        case 8:
+                        case 10:
+                            printf("-");
+                            break;
+                    }
+                    printf("%02X", p->uuid[i]);
+                }
+                printf(">  %s\n", (char*)dyldCache + p->pathOffset);
+            }
+        }
+    }
+    else if ( options.mode == modeLocalSymbols ) {
+        const dyld_cache_header* header = &dyldCache->header;
+        if ( header->localSymbolsOffset == 0 ) {
+            fprintf(stderr, "Error: dyld shared cache does not contain local symbols info\n");
+            exit(1);
+        }
+        const bool is64 = (strstr((char*)dyldCache, "64") != NULL);
+        const dyld_cache_image_info* imageInfos = (dyld_cache_image_info*)((char*)dyldCache + header->imagesOffset);
+        const dyld_cache_local_symbols_info* localsInfo = (dyld_cache_local_symbols_info*)((char*)dyldCache + header->localSymbolsOffset);
+        const uint32_t nlistFileOffset = (uint32_t)(header->localSymbolsOffset + localsInfo->nlistOffset);
+        const uint32_t nlistCount = localsInfo->nlistCount;
+        const uint32_t nlistByteSize = is64 ? nlistCount*16 : nlistCount*12;
+        const uint32_t stringsFileOffset = (uint32_t)(header->localSymbolsOffset + localsInfo->stringsOffset);
+        const uint32_t stringsSize = localsInfo->stringsSize;
+        const uint32_t entriesCount = localsInfo->entriesCount;
+        const dyld_cache_local_symbols_entry* entries = (dyld_cache_local_symbols_entry*)((char*)localsInfo + localsInfo->entriesOffset);
+        printf("local symbols nlist array:  %3uMB,  file offset: 0x%08X -> 0x%08X\n", nlistByteSize/(1024*1024), nlistFileOffset, nlistFileOffset+nlistByteSize);
+        printf("local symbols string pool:  %3uMB,  file offset: 0x%08X -> 0x%08X\n", stringsSize/(1024*1024), stringsFileOffset, stringsFileOffset+stringsSize);
+        printf("local symbols by dylib (count=%d):\n", entriesCount);
+        //const char* stringPool = (char*)dyldCache + stringsFileOffset;
+        for (int i=0; i < entriesCount; ++i) {
+            const char* imageName = (char*)dyldCache + imageInfos[i].pathFileOffset;
+            printf("   nlistStartIndex=%5d, nlistCount=%5d, image=%s\n", entries[i].nlistStartIndex, entries[i].nlistCount, imageName);
+#if 0
+            if ( is64 ) {
+                const nlist_64* symTab = (nlist_64*)((char*)dyldCache + nlistFileOffset);
+                for (int e=0; e < entries[i].nlistCount(); ++e) {
+                    const nlist_64* entry = &symTab[entries[i].nlistStartIndex()+e];
+                    printf("     nlist[%d].str=%d, %s\n", e, entry->n_un.n_strx, &stringPool[entry->n_un.n_strx]);
+                    printf("     nlist[%d].value=0x%0llX\n", e, entry->n_value);
+                }
+            }
+#endif
+        }
+    }
+    else if ( options.mode == modeJSONMap ) {
+        std::string buffer = dyldCache->generateJSONMap("unknown");
+        printf("%s\n", buffer.c_str());
+    }
+    else if ( options.mode == modeJSONDependents ) {
+        std::cout <<  dyldCache->generateJSONDependents();
+    }
     else if ( options.mode == modeStrings ) {
         if (printStrings) {
             dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
@@ -1030,225 +812,300 @@
             });
         }
     }
-	else if ( options.mode == modeExtract ) {
-		char pathBuffer[PATH_MAX];
-		uint32_t bufferSize = PATH_MAX;
-		if ( _NSGetExecutablePath(pathBuffer, &bufferSize) != 0 ) {
-			fprintf(stderr, "Error: could not get path of program\n");
-			return 1;
-		}
-		char* last = strrchr(pathBuffer, '/');
-		strcpy(last+1, "../../lib/dsc_extractor.bundle");
-		void* handle = dlopen(pathBuffer, RTLD_LAZY);
-		if ( handle == NULL ) {
-			fprintf(stderr, "Error: dsc_extractor.bundle could not be loaded at %s\n", pathBuffer);
-			return 1;
-		}
-
-		typedef int (*extractor_proc)(const char* shared_cache_file_path, const char* extraction_root_path,
-									  void (^progress)(unsigned current, unsigned total));
-
-		extractor_proc proc = (extractor_proc)dlsym(handle, "dyld_shared_cache_extract_dylibs_progress");
-		if ( proc == NULL ) {
-			fprintf(stderr, "Error: dsc_extractor.bundle did not have dyld_shared_cache_extract_dylibs_progress symbol\n");
-			return 1;
-		}
-		
-		int result = (*proc)(sharedCachePath, options.extractionDir, ^(unsigned c, unsigned total) { } );
-		return result;
-	}
-	else {
-		segment_callback_t callback = nullptr;
-		if ( strcmp((char*)options.mappedCache, "dyld_v1    i386") == 0 ) {
-			switch ( options.mode ) {
-				case modeList:
-					callback = print_list<x86>;
-					break;
-				case modeMap:
-					callback = print_map<x86>;
-					break;
-				case modeDependencies:
-					callback = print_dependencies<x86>;
-					break;
-				case modeLinkEdit:
-					callback = process_linkedit<x86>;
-					break;
-				case modeSize:
-					callback = collect_size<x86>;
-					break;
-				case modeNone:
-				case modeInfo:
-                case modeSlideInfo:
-                case modeVerboseSlideInfo:
-				case modeAcceleratorInfo:
-				case modeTextInfo:
-				case modeLocalSymbols:
-                case modeStrings:
-				case modeExtract:
-					break;
-			}
-		}		
-		else if (  (strcmp((char*)options.mappedCache, "dyld_v1  x86_64") == 0)
-				|| (strcmp((char*)options.mappedCache, "dyld_v1 x86_64h") == 0) ) {
-			switch ( options.mode ) {
-				case modeList:
-					callback = print_list<x86_64>;
-					break;
-				case modeMap:
-					callback = print_map<x86_64>;
-					break;
-				case modeDependencies:
-					callback = print_dependencies<x86_64>;
-					break;
-				case modeLinkEdit:
-					callback = process_linkedit<x86_64>;
-					break;
-				case modeSize:
-					callback = collect_size<x86_64>;
-					break;
-				case modeNone:
-				case modeInfo:
-                case modeSlideInfo:
-                case modeVerboseSlideInfo:
-				case modeAcceleratorInfo:
-				case modeTextInfo:
-                case modeLocalSymbols:
-                case modeStrings:
-				case modeExtract:
-					break;
-			}
-		}		
-		else if ( (strncmp((char*)options.mappedCache, "dyld_v1   armv", 14) == 0)
-				 || (strncmp((char*)options.mappedCache, "dyld_v1  armv", 13) == 0)
-#if SUPPORT_ARCH_arm64_32
-				 || (strcmp((char*)options.mappedCache, "dyld_v1arm64_32") == 0)
-#endif
-                 ) {
-			switch ( options.mode ) {
-				case modeList:
-					callback = print_list<arm>;
-					break;
-				case modeMap:
-					callback = print_map<arm>;
-					break;
-				case modeDependencies:
-					callback = print_dependencies<arm>;
-					break;
-				case modeLinkEdit:
-					callback = process_linkedit<arm>;
-					break;
-				case modeSize:
-					callback = collect_size<arm>;
-					break;
-				case modeNone:
-				case modeInfo:
-                case modeSlideInfo:
-                case modeVerboseSlideInfo:
-				case modeAcceleratorInfo:
-				case modeTextInfo:
-                case modeLocalSymbols:
-                case modeStrings:
-				case modeExtract:
-					break;
-			}
-		}		
-		else if ( (strcmp((char*)options.mappedCache, "dyld_v1   arm64") == 0)
-#if SUPPORT_ARCH_arm64e
-               || (strcmp((char*)options.mappedCache, "dyld_v1  arm64e") == 0)
-#endif
-                 ) {
-			switch ( options.mode ) {
-				case modeList:
-					callback = print_list<arm64>;
-					break;
-				case modeMap:
-					callback = print_map<arm64>;
-					break;
-				case modeDependencies:
-					callback = print_dependencies<arm64>;
-					break;
-				case modeLinkEdit:
-					callback = process_linkedit<arm64>;
-					break;
-				case modeSize:
-					callback = collect_size<arm64>;
-					break;
-				case modeNone:
-				case modeInfo:
-                case modeSlideInfo:
-                case modeVerboseSlideInfo:
-				case modeAcceleratorInfo:
-				case modeTextInfo:
-                case modeLocalSymbols:
-                case modeStrings:
-				case modeExtract:
-					break;
-			}
-		}
-#if SUPPORT_ARCH_arm64_32
-		else if ( (strcmp((char*)options.mappedCache, "dyld_v1arm64_32") == 0) ) {
-			switch ( options.mode ) {
-				case modeList:
-					callback = print_list<arm64_32>;
-					break;
-				case modeMap:
-					callback = print_map<arm64_32>;
-					break;
-				case modeDependencies:
-					callback = print_dependencies<arm64_32>;
-					break;
-				case modeLinkEdit:
-					callback = process_linkedit<arm64_32>;
-					break;
-				case modeSize:
-					callback = collect_size<arm64_32>;
-					break;
-				case modeNone:
-				case modeInfo:
-				case modeSlideInfo:
-                case modeVerboseSlideInfo:
-				case modeAcceleratorInfo:
-				case modeTextInfo:
-                case modeLocalSymbols:
-                case modeStrings:
-				case modeExtract:
-					break;
-			}
- 		}
-#endif
-        else {
-			fprintf(stderr, "Error: unrecognized dyld shared cache magic.\n");
-			exit(1);
-		}
-		
-		__block Results results;
-		results.dependentTargetFound = false;
-		int iterateResult = dyld_shared_cache_iterate(options.mappedCache, (uint32_t)cacheLength, 
-										   ^(const dyld_shared_cache_dylib_info* dylibInfo, const dyld_shared_cache_segment_info* segInfo ) {
-											   (callback)(dylibInfo, segInfo, options, results);
-										   });
-		if ( iterateResult != 0 ) {
-			fprintf(stderr, "Error: malformed shared cache file\n");
-			exit(1);
-		}
-		
-		if ( options.mode == modeLinkEdit ) {
-			// dump -linkedit information
-			for (std::map<uint32_t, const char*>::iterator it = results.pageToContent.begin(); it != results.pageToContent.end(); ++it) {
-				printf("0x%08X %s\n", it->first, it->second);
-			}
-		}
-		else if ( options.mode == modeSize ) {
-			std::sort(results.textSegments.begin(), results.textSegments.end(), TextInfoSorter()); 
-			for (std::vector<TextInfo>::iterator it = results.textSegments.begin(); it != results.textSegments.end(); ++it) {
-				printf(" 0x%08llX  %s\n", it->textSize, it->path);
-			}
-		}
-
-		if ( (options.mode == modeDependencies) && options.dependentsOfPath && !results.dependentTargetFound) {
-			fprintf(stderr, "Error: could not find '%s' in the shared cache at\n  %s\n", options.dependentsOfPath, sharedCachePath);
-			exit(1);
-		}
-	}
-	return 0;
+    else if ( options.mode == modeSectionSizes ) {
+        __block std::map<std::string, uint64_t> sectionSizes;
+        dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
+            const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)mh;
+            ma->forEachSection(^(const dyld3::MachOAnalyzer::SectionInfo &sectInfo, bool malformedSectionRange, bool &stop) {
+                std::string section = std::string(sectInfo.segInfo.segName) + " " + sectInfo.sectName;
+                sectionSizes[section] += sectInfo.sectSize;
+            });
+        });
+        for (const auto& keyAndValue : sectionSizes) {
+            printf("%lld %s\n", keyAndValue.second, keyAndValue.first.c_str());
+        }
+    }
+    else if ( options.mode == modeObjCProtocols ) {
+        if ( dyldCache->objcOpt() == nullptr ) {
+            fprintf(stderr, "Error: could not get optimized objc\n");
+            return 1;
+        }
+        objc_opt::objc_protocolopt2_t* protocols = dyldCache->objcOpt()->protocolopt2();
+        if ( protocols == nullptr ) {
+            fprintf(stderr, "Error: could not get optimized objc protocols\n");
+            return 1;
+        }
+
+        for (uint64_t index = 0; index != protocols->capacity; ++index) {
+            const objc_opt::objc_classheader_t& clshi = protocols->classOffsets()[index];
+            if ( clshi.clsOffset == 0 ) {
+                fprintf(stderr, "[% 5lld]\n", index);
+                continue;
+            }
+            const char* name = (const char*)(((const uint8_t*)protocols) + protocols->offsets()[index]);
+            if ( !clshi.isDuplicate() ) {
+                fprintf(stderr, "[% 5lld] -> (% 8d, % 8d) = %s\n", index, clshi.clsOffset, clshi.hiOffset, name);
+                continue;
+            }
+
+            // class appears in more than one header
+            uint32_t count = clshi.duplicateCount();
+            fprintf(stderr, "[% 5lld] -> duplicates [% 5d..% 5d] = %s\n",
+                    index, clshi.duplicateIndex(), clshi.duplicateIndex() + clshi.duplicateCount() - 1, name);
+
+            const objc_opt::objc_classheader_t *list = &protocols->duplicateOffsets()[clshi.duplicateIndex()];
+            for (uint32_t i = 0; i < count; i++) {
+                fprintf(stderr, "  - [% 5lld] -> (% 8d, % 8d)\n", (uint64_t)(clshi.duplicateIndex() + i), list[i].clsOffset, list[i].hiOffset);
+            }
+        }
+    }
+    else if ( options.mode == modeExtract ) {
+        char pathBuffer[PATH_MAX];
+        uint32_t bufferSize = PATH_MAX;
+        if ( _NSGetExecutablePath(pathBuffer, &bufferSize) != 0 ) {
+            fprintf(stderr, "Error: could not get path of program\n");
+            return 1;
+        }
+        char* last = strrchr(pathBuffer, '/');
+        // The bundle is at a different location on device.  Its /usr/lib/dsc_extractor.bundle in the SDK
+        // but /usr/local/lib/dsc_extractor.bundle on device.
+        strcpy(last+1, DSC_BUNDLE_REL_PATH);
+        void* handle = dlopen(pathBuffer, RTLD_LAZY);
+        if ( handle == NULL ) {
+            fprintf(stderr, "Error: dsc_extractor.bundle could not be loaded at %s\n", pathBuffer);
+            return 1;
+        }
+
+        typedef int (*extractor_proc)(const char* shared_cache_file_path, const char* extraction_root_path,
+                                      void (^progress)(unsigned current, unsigned total));
+
+        extractor_proc proc = (extractor_proc)dlsym(handle, "dyld_shared_cache_extract_dylibs_progress");
+        if ( proc == NULL ) {
+            fprintf(stderr, "Error: dsc_extractor.bundle did not have dyld_shared_cache_extract_dylibs_progress symbol\n");
+            return 1;
+        }
+
+        int result = (*proc)(sharedCachePath, options.extractionDir, ^(unsigned c, unsigned total) { } );
+        return result;
+    }
+    else {
+        switch ( options.mode ) {
+            case modeList: {
+                if (options.printInodes) {
+                    dyldCache->forEachImageEntry(^(const char* path, uint64_t mTime, uint64_t inode) {
+                        printf("0x%08llX 0x%08llX ", inode, mTime);
+                        if ( isAlias(path, dyldCache) )
+                            printf("[alias] %s\n", path);
+                        else
+                            printf("%s\n", path);
+                    });
+                } else {
+                    dyldCache->forEachImageTextSegment(^(uint64_t loadAddressUnslid, uint64_t textSegmentSize, const unsigned char *dylibUUID, const char *installName, bool &stop) {
+                        if ( options.printVMAddrs )
+                            printf("0x%08llX ", loadAddressUnslid);
+                        if ( options.printUUIDs ) {
+                            const uint8_t* uuid = (uint8_t*)dylibUUID;
+                            printf("<%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X> ",
+                                   uuid[0],  uuid[1],  uuid[2],  uuid[3],
+                                   uuid[4],  uuid[5],  uuid[6],  uuid[7],
+                                   uuid[8],  uuid[9],  uuid[10], uuid[11],
+                                   uuid[12], uuid[13], uuid[14], uuid[15]);
+                        }
+                        if ( isAlias(installName, dyldCache) )
+                            printf("[alias] %s\n", installName);
+                        else
+                            printf("%s\n", installName);
+                    });
+                }
+                break;
+            }
+            case modeMap: {
+                __block std::map<uint64_t, const char*> dataSegNames;
+                __block std::map<uint64_t, uint64_t>    dataSegEnds;
+                dyldCache->forEachImage(^(const mach_header* mh, const char* installName) {
+                    dyld3::MachOFile* mf = (dyld3::MachOFile*)mh;
+                    mf->forEachSegment(^(const dyld3::MachOAnalyzer::SegmentInfo &info, bool &stop) {
+                        if ( isAlias(installName, dyldCache) )
+                            return;
+                        printf("0x%08llX - 0x%08llX %s %s\n", info.vmAddr, info.vmAddr + info.vmSize, info.segName, installName);
+                        if ( strncmp(info.segName, "__DATA", 6) == 0 ) {
+                            dataSegNames[info.vmAddr] = installName;
+                            dataSegEnds[info.vmAddr] = info.vmAddr + info.vmSize;
+                        }
+                    });
+                });
+                // <rdar://problem/51084507> Enhance dyld_shared_cache_util to show where section alignment added padding
+                uint64_t lastEnd = 0;
+                for (const auto& entry : dataSegEnds) {
+                    uint64_t padding = entry.first - lastEnd;
+                    if ( (padding > 32) && (lastEnd != 0) ) {
+                        printf("0x%08llX - 0x%08llX PADDING %lluKB\n", lastEnd, entry.first, padding/1024);
+                    }
+                    lastEnd = entry.second;
+                }
+                break;
+            }
+            case modeDependencies: {
+                __block bool dependentTargetFound = false;
+                dyldCache->forEachImage(^(const mach_header* mh, const char* installName) {
+                    if ( strcmp(options.dependentsOfPath, installName) != 0 )
+                        return;
+                    dependentTargetFound = true;
+
+                    auto printDep = [&options](const char *loadPath, uint32_t compatVersion, uint32_t curVersion) {
+                        if ( options.printDylibVersions ) {
+                            uint32_t compat_vers = compatVersion;
+                            uint32_t current_vers = curVersion;
+                            printf("\t%s", loadPath);
+                            if ( compat_vers != 0xFFFFFFFF ) {
+                                printf("(compatibility version %u.%u.%u, current version %u.%u.%u)\n",
+                                       (compat_vers >> 16),
+                                       (compat_vers >> 8) & 0xff,
+                                       (compat_vers) & 0xff,
+                                       (current_vers >> 16),
+                                       (current_vers >> 8) & 0xff,
+                                       (current_vers) & 0xff);
+                            }
+                            else {
+                                printf("\n");
+                            }
+                        }
+                        else {
+                            printf("\t%s\n", loadPath);
+                        }
+                    };
+
+                    dyld3::MachOFile* mf = (dyld3::MachOFile*)mh;
+
+                    // First print out our dylib and version.
+                    const char* dylibInstallName;
+                    uint32_t currentVersion;
+                    uint32_t compatVersion;
+                    if ( mf->getDylibInstallName(&dylibInstallName, &compatVersion, &currentVersion) ) {
+                        printDep(dylibInstallName, compatVersion, currentVersion);
+                    }
+
+                    // Then the dependent dylibs.
+                    mf->forEachDependentDylib(^(const char *loadPath, bool isWeak, bool isReExport, bool isUpward, uint32_t compatVersion, uint32_t curVersion, bool &stop) {
+                        printDep(loadPath, compatVersion, curVersion);
+                    });
+                });
+                if (options.dependentsOfPath && !dependentTargetFound) {
+                    fprintf(stderr, "Error: could not find '%s' in the shared cache at\n  %s\n", options.dependentsOfPath, sharedCachePath);
+                    exit(1);
+                }
+                break;
+            }
+            case modeLinkEdit: {
+                std::map<uint32_t, const char*> pageToContent;
+                auto add_linkedit = [&pageToContent](uint32_t pageStart, uint32_t pageEnd, const char* message) {
+                    for (uint32_t p = pageStart; p <= pageEnd; p += 4096) {
+                        std::map<uint32_t, const char*>::iterator pos = pageToContent.find(p);
+                        if ( pos == pageToContent.end() ) {
+                            pageToContent[p] = strdup(message);
+                        }
+                        else {
+                            const char* oldMessage = pos->second;
+                            char* newMesssage;
+                            asprintf(&newMesssage, "%s, %s", oldMessage, message);
+                            pageToContent[p] = newMesssage;
+                            ::free((void*)oldMessage);
+                        }
+                    }
+                };
+
+                dyldCache->forEachImage(^(const mach_header* mh, const char* installName) {
+                    // Filter out symlinks.
+                    if (isAlias(installName, dyldCache))
+                        return;
+                    dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
+                    Diagnostics diag;
+                    dyld3::MachOAnalyzer::LinkEditInfo leInfo;
+                    ma->getLinkEditPointers(diag, leInfo);
+
+                    if (diag.hasError())
+                        return;
+
+                    char message[1000];
+                    const char* shortName = strrchr(installName, '/') + 1;
+                    // add export trie info
+                    if ( leInfo.dyldInfo->export_size != 0 ) {
+                        //printf("export_off=0x%X\n", leInfo.dyldInfo->export_off());
+                        uint32_t exportPageOffsetStart = leInfo.dyldInfo->export_off & (-4096);
+                        uint32_t exportPageOffsetEnd = (leInfo.dyldInfo->export_off + leInfo.dyldInfo->export_size) & (-4096);
+                        sprintf(message, "exports from %s", shortName);
+                        add_linkedit(exportPageOffsetStart, exportPageOffsetEnd, message);
+                    }
+                    // add binding info
+                    if ( leInfo.dyldInfo->bind_size != 0 ) {
+                        uint32_t bindPageOffsetStart = leInfo.dyldInfo->bind_off & (-4096);
+                        uint32_t bindPageOffsetEnd = (leInfo.dyldInfo->bind_off + leInfo.dyldInfo->bind_size) & (-4096);
+                        sprintf(message, "bindings from %s", shortName);
+                        add_linkedit(bindPageOffsetStart, bindPageOffsetEnd, message);
+                    }
+                    // add lazy binding info
+                    if ( leInfo.dyldInfo->lazy_bind_size != 0 ) {
+                        uint32_t lazybindPageOffsetStart = leInfo.dyldInfo->lazy_bind_off & (-4096);
+                        uint32_t lazybindPageOffsetEnd = (leInfo.dyldInfo->lazy_bind_off + leInfo.dyldInfo->lazy_bind_size) & (-4096);
+                        sprintf(message, "lazy bindings from %s", shortName);
+                        add_linkedit(lazybindPageOffsetStart, lazybindPageOffsetEnd, message);
+                    }
+                    // add weak binding info
+                    if ( leInfo.dyldInfo->weak_bind_size != 0 ) {
+                        uint32_t weakbindPageOffsetStart = leInfo.dyldInfo->weak_bind_off & (-4096);
+                        uint32_t weakbindPageOffsetEnd = (leInfo.dyldInfo->weak_bind_off + leInfo.dyldInfo->weak_bind_size) & (-4096);
+                        sprintf(message, "weak bindings from %s", shortName);
+                        add_linkedit(weakbindPageOffsetStart, weakbindPageOffsetEnd, message);
+                    }
+                });
+
+                for (std::map<uint32_t, const char*>::iterator it = pageToContent.begin(); it != pageToContent.end(); ++it) {
+                    printf("0x%08X %s\n", it->first, it->second);
+                }
+                break;
+            }
+            case modeSize: {
+                struct TextInfo {
+                    uint64_t    textSize;
+                    const char* path;
+                };
+                __block std::vector<TextInfo> textSegments;
+                dyldCache->forEachImage(^(const mach_header* mh, const char* installName) {
+                    // Filter out symlinks.
+                    if (isAlias(installName, dyldCache))
+                        return;
+
+                    dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
+                    ma->forEachSegment(^(const dyld3::MachOAnalyzer::SegmentInfo &info, bool &stop) {
+                        if ( strcmp(info.segName, "__TEXT") != 0 )
+                            return;
+                        textSegments.push_back({ info.fileSize, installName });
+                    });
+                });
+                std::sort(textSegments.begin(), textSegments.end(), [](const TextInfo& left, const TextInfo& right) {
+                    return (left.textSize > right.textSize);
+                });
+                for (std::vector<TextInfo>::iterator it = textSegments.begin(); it != textSegments.end(); ++it) {
+                    printf(" 0x%08llX  %s\n", it->textSize, it->path);
+                }
+                break;
+            }
+            case modeNone:
+            case modeInfo:
+            case modeSlideInfo:
+            case modeVerboseSlideInfo:
+            case modeAcceleratorInfo:
+            case modeTextInfo:
+            case modeLocalSymbols:
+            case modeJSONMap:
+            case modeJSONDependents:
+            case modeSectionSizes:
+            case modeStrings:
+            case modeObjCProtocols:
+            case modeExtract:
+                break;
+        }
+    }
+    return 0;
 }
+