Loading...
launch-cache/dyld_shared_cache_util.cpp dyld-195.5 dyld-551.3
--- dyld/dyld-195.5/launch-cache/dyld_shared_cache_util.cpp
+++ dyld/dyld-551.3/launch-cache/dyld_shared_cache_util.cpp
@@ -1,6 +1,6 @@
 /* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*- 
  *
- * Copyright (c) 2009-2010 Apple Inc. All rights reserved.
+ * Copyright (c) 2009-2012 Apple Inc. All rights reserved.
  *
  * @APPLE_LICENSE_HEADER_START@
  * 
@@ -26,6 +26,7 @@
 #include <unistd.h>
 #include <sys/stat.h>
 #include <string.h>
+#include <dlfcn.h>
 #include <fcntl.h>
 #include <stdlib.h>
 #include <errno.h>
@@ -33,42 +34,84 @@
 #include <sys/syslimits.h>
 #include <mach-o/arch.h>
 #include <mach-o/loader.h>
-
+#include <mach-o/dyld.h>
+#include <mach/mach.h>
+
+#include <map>
 #include <vector>
-#include <map>
-#include <set>
 
 #include "dsc_iterator.h"
+#include "dsc_extractor.h"
 #include "dyld_cache_format.h"
 #include "Architectures.hpp"
 #include "MachOFileAbstraction.hpp"
 #include "CacheFileAbstraction.hpp"
-
-
-#define OP_NULL 0
-#define OP_LIST_DEPENDENCIES 1
-#define OP_LIST_DYLIBS 2
-#define OP_LIST_LINKEDIT 3
-
-#define UUID_BYTES 16
-
-// Define this here so we can work with or without block support
-typedef void (*segment_callback_t)(const char* dylib, const char* segName, uint64_t offset, uint64_t sizem, 
-													uint64_t mappedddress, uint64_t slide, void* userData);
-
-struct seg_callback_args {
-	char *target_path;
-	uint32_t target_found;
-	void *mapped_cache;
-	uint32_t op;
-	uint8_t print_uuids;
-	uint8_t print_vmaddrs;
-    uint8_t print_dylib_versions;
+#include "Trie.hpp"
+
+enum Mode {
+	modeNone,
+	modeList,
+	modeMap,
+	modeDependencies,
+	modeSlideInfo,
+	modeAcceleratorInfo,
+	modeTextInfo,
+	modeLinkEdit,
+	modeLocalSymbols,
+	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;
+};
+
+
+
 void usage() {
-	fprintf(stderr, "Usage: dscutil -list [ -uuid ] [-vmaddr] | -dependents <dylib-path> [ -versions ] | -linkedit [ shared-cache-file ]\n");
-}
+	fprintf(stderr, "Usage: dyld_shared_cache_util -list [ -uuid ] [-vmaddr] | -dependents <dylib-path> [ -versions ] | -linkedit | -map | -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 );
+}
+#endif
 
 /*
  * Get the path to the native shared cache for this host
@@ -77,143 +120,155 @@
 #if __i386__
 	return MACOSX_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "i386";
 #elif __x86_64__ 
-	return MACOSX_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "x86_64";
-#elif __ppc__ 
-	return MACOSX_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "rosetta";
+	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 __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
 }
 
-/*
- * Get a vector of all the load commands from the header pointed to by headerAddr
- */
-template <typename A>
-std::vector<macho_load_command<typename A::P>* > get_load_cmds(void *headerAddr) {
-	typedef typename A::P		P;
-	typedef typename A::P::E	E;
-	
-	std::vector<macho_load_command<P>* > cmd_vector;
-	
-	const macho_header<P>* mh = (const macho_header<P>*)headerAddr;
-	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++) {
-		cmd_vector.push_back((macho_load_command<P>*)cmd);
-		cmd = (const macho_load_command<P>*)(((uint8_t*)cmd)+cmd->cmdsize());
-	}
-	return cmd_vector;
-}
+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 list_dependencies(const char *dylib, void *headerAddr, uint8_t print_dylib_versions) {
+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;
 	
-	std::vector< macho_load_command<P>* > cmds;
-	cmds = get_load_cmds<A>(headerAddr);
-	for(typename std::vector<macho_load_command<P>*>::iterator it = cmds.begin(); it != cmds.end(); ++it) {
-		uint32_t cmdType = (*it)->cmd();
-		if (cmdType == LC_LOAD_DYLIB || 
-			cmdType == LC_ID_DYLIB || 
-			cmdType == LC_LOAD_WEAK_DYLIB ||
-			cmdType == LC_REEXPORT_DYLIB ||
-			cmdType == LC_LOAD_UPWARD_DYLIB) {
-			macho_dylib_command<P>* dylib_cmd = (macho_dylib_command<P>*)*it;
-			const char *name = dylib_cmd->name();
-			uint32_t compat_vers = dylib_cmd->compatibility_version();
-			uint32_t current_vers = dylib_cmd->current_version();
-			
-            if (print_dylib_versions) {
-                printf("\t%s (compatibility version %u.%u.%u, current version %u.%u.%u)\n", 
-                       name, 
-                       (compat_vers >> 16),
-                       (compat_vers >> 8) & 0xff,
-                       (compat_vers) & 0xff,
-                       (current_vers >> 16),
-                       (current_vers >> 8) & 0xff,
-                       (current_vers) & 0xff);
-            } else {
-                printf("\t%s\n", name);
-            }			
-		}
-	}
+	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
+ * Print out a dylib from the shared cache, optionally including the UUID or unslid load address
  */
 template <typename A>
-void print_dylib(const char *dylib, void *headerAddr, uint64_t slide, struct seg_callback_args *args) {
-	typedef typename A::P		P;
-	typedef typename A::P::E	E;
-	char uuid_str[UUID_BYTES*3];
-	uint8_t got_uuid = 0;
-	uint64_t vmaddr = 0;
-		
-	std::vector< macho_load_command<P>* > cmds;
-	cmds = get_load_cmds<A>(headerAddr);
-	for(typename std::vector<macho_load_command<P>*>::iterator it = cmds.begin(); it != cmds.end(); ++it) {
-		uint32_t cmdType = (*it)->cmd();
-		if (cmdType == LC_UUID) {
-			macho_uuid_command<P>* uuid_cmd = (macho_uuid_command<P>*)*it;
-			const uint8_t *uuid = uuid_cmd->uuid();
-			sprintf(uuid_str, "<%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]);
-			got_uuid = 1;
-		} 
-		else if (cmdType == LC_SEGMENT) {
-			macho_segment_command<P>* seg_cmd = (macho_segment_command<P>*)*it;
-			if (strcmp(seg_cmd->segname(), "__TEXT") == 0) {
-				vmaddr = seg_cmd->vmaddr();
-			}
-		}			
-	}
-
-	if (args->print_vmaddrs)
-		printf("0x%08llX ", vmaddr+slide);
-	if (args->print_uuids) {
-		if (got_uuid)
-			printf("%s ", uuid_str);
+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               > ");
     }
-	printf("%s\n", dylib);
-}
-
-
-uint64_t					sLinkeditBase = 0;
-std::map<uint32_t, char*>	sPageToContent;
-
-
-
-
-static void add_linkedit(uint32_t pageStart, uint32_t pageEnd, char* message) 
+	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, char*>::iterator pos = sPageToContent.find(p);
-		if ( pos == sPageToContent.end() ) {
-			sPageToContent[p] = strdup(message);
+		std::map<uint32_t, const char*>::iterator pos = results.pageToContent.find(p);
+		if ( pos == results.pageToContent.end() ) {
+			results.pageToContent[p] = strdup(message);
 		}
 		else {
-			char* oldMessage = pos->second;
+			const char* oldMessage = pos->second;
 			char* newMesssage;
 			asprintf(&newMesssage, "%s, %s", oldMessage, message);
-			sPageToContent[p] = newMesssage;
-			free(oldMessage);
+			results.pageToContent[p] = newMesssage;
+			::free((void*)oldMessage);
 		}
 	}
 }
@@ -223,15 +278,14 @@
  * get LINKEDIT info for dylib
  */
 template <typename A>
-void process_linkedit(const char* dylib, void* headerAddr) {	
+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 by only handling first path found for each mach header
-	static std::set<void*> seenImages;
-	if ( seenImages.count(headerAddr) != 0 )
+	// filter out symlinks 
+	if ( dylibInfo->isAlias )
 		return;
-	seenImages.insert(headerAddr);
-	const macho_header<P>* mh = (const macho_header<P>*)headerAddr;
+	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;
@@ -239,35 +293,35 @@
 		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(dylib, '/') + 1;
+			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);
+				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);
+				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);
+				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);
+				add_linkedit(weakbindPageOffsetStart, weakbindPageOffsetEnd, message, results);
 			}
 		}
 		cmd = (const macho_load_command<P>*)(((uint8_t*)cmd)+cmd->cmdsize());
@@ -275,216 +329,610 @@
 }
 
 
-
 /*
- * This callback is used with dsc_iterator, and called once for each segment in the target shared cache
+ * Print out a .map file similar to what update_dyld_shared_cache created when the cache file was built
  */
 template <typename A>
-void segment_callback(const char *dylib, const char *segName, uint64_t offset, uint64_t sizem, 
-										uint64_t mappedAddress, uint64_t slide, void *userData) {
-	typedef typename A::P    P;
-	typedef typename A::P::E E;
-	struct seg_callback_args *args = (struct seg_callback_args *)userData;
-	if (strncmp(segName, "__TEXT", 6) == 0) {
-		int target_match = args->target_path ? (strcmp(args->target_path, dylib) == 0) : 0;
-		if (!args->target_path || target_match) {
-			if (target_match) {
-				args->target_found = 1;
-			}
-			void *headerAddr = (void*)((long)args->mapped_cache + (long)offset);
-			switch (args->op) {
-				case OP_LIST_DEPENDENCIES:
-					list_dependencies<A>(dylib, headerAddr, args->print_dylib_versions);
-					break;
-				case OP_LIST_DYLIBS:
-					print_dylib<A>(dylib, headerAddr, slide, args);
-					break;
-				case OP_LIST_LINKEDIT:
-					process_linkedit<A>(dylib, headerAddr);
-				default:
-					break;
-			}
-		}
-	}
-	else if (strncmp(segName, "__LINKEDIT", 6) == 0) {
-		sLinkeditBase = mappedAddress - offset;
-	}
-}
-
-
-
-
-int main (int argc, char **argv) {
-	struct seg_callback_args args;
-	const char *shared_cache_path = NULL;
-	void *mapped_cache;
-	struct stat statbuf;
-	int cache_fd;
-	char c;
-	bool print_slide_info = false;
-
-    args.target_path = NULL;
-	args.op = OP_NULL;
-    args.print_uuids = 0;
-	args.print_vmaddrs = 0;
-    args.print_dylib_versions = 0;
-    args.target_found = 0;
-    
-    for (uint32_t optind = 1; optind < argc; optind++) {
-        char *opt = argv[optind];
+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, -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;
+    options.printUUIDs = false;
+	options.printVMAddrs = false;
+    options.printDylibVersions = false;
+	options.printInodes = false;
+    options.dependentsOfPath = NULL;
+    options.extractionDir = NULL;
+
+    for (uint32_t i = 1; i < argc; i++) {
+        const char* opt = argv[i];
         if (opt[0] == '-') {
             if (strcmp(opt, "-list") == 0) {
-                if (args.op) {
-                    fprintf(stderr, "Error: select one of -list or -dependents\n");
-                    usage();
-                    exit(1);
-                }
-                args.op = OP_LIST_DYLIBS;
-            } else if (strcmp(opt, "-dependents") == 0) {
-                if (args.op) {
-                    fprintf(stderr, "Error: select one of -list or -dependents\n");
-                    usage();
-                    exit(1);
-                }
-                if (!(++optind < argc)) {
+				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);
                 }
-                args.op = OP_LIST_DEPENDENCIES;
-                args.target_path = argv[optind];
-            } else if (strcmp(opt, "-uuid") == 0) {
-                args.print_uuids = 1;
-            } else if (strcmp(opt, "-versions") == 0) {
-                args.print_dylib_versions = 1;
-            } else if (strcmp(opt, "-vmaddr") == 0) {
-				args.print_vmaddrs = 1;
-		    } else if (strcmp(opt, "-linkedit") == 0) {
-                args.op = OP_LIST_LINKEDIT;
-			} else if (strcmp(opt, "-slide_info") == 0) {
-				print_slide_info = true;
-            } else {
+            } 
+			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, "-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;
+			}
+			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];
+                if ( i >= argc ) {
+                    fprintf(stderr, "Error: option -extract requires a directory argument\n");
+                    usage();
+                    exit(1);
+                }
+           }
+			else if (strcmp(opt, "-uuid") == 0) {
+                options.printUUIDs = true;
+            } 
+			else if (strcmp(opt, "-inode") == 0) {
+                options.printInodes = true;
+            } 
+			else if (strcmp(opt, "-versions") == 0) {
+                options.printDylibVersions = true;
+            } 
+			else if (strcmp(opt, "-vmaddr") == 0) {
+				options.printVMAddrs = true;
+		    } 
+			else {
                 fprintf(stderr, "Error: unrecognized option %s\n", opt);
                 usage();
                 exit(1);
             }
-        } else {
-            shared_cache_path = opt;
+        } 
+		else {
+            sharedCachePath = opt;
         }
     }
     
-	if ( !print_slide_info ) {
-		if (args.op == OP_NULL) {
-			fprintf(stderr, "Error: select one of -list or -dependents\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 (args.print_uuids && args.op != OP_LIST_DYLIBS)
+	if ( options.mode != modeSlideInfo ) {
+		if ( options.printUUIDs && (options.mode != modeList) )
 			fprintf(stderr, "Warning: -uuid option ignored outside of -list mode\n");
-		if (args.print_vmaddrs && args.op != OP_LIST_DYLIBS)
+			
+		if ( options.printVMAddrs && (options.mode != modeList) )
 			fprintf(stderr, "Warning: -vmaddr option ignored outside of -list mode\n");
-		if (args.print_dylib_versions && args.op != OP_LIST_DEPENDENCIES)
+			
+		if ( options.printDylibVersions && (options.mode != modeDependencies) )
 			fprintf(stderr, "Warning: -versions option ignored outside of -dependents mode\n");
 		
-		if (args.op == OP_LIST_DEPENDENCIES && !args.target_path) {
+		if ( (options.mode == modeDependencies) && (options.dependentsOfPath == NULL) ) {
 			fprintf(stderr, "Error: -dependents given, but no dylib path specified\n");
 			usage();
 			exit(1);
 		}
 	}
+			
+	struct stat statbuf;
+	if ( ::stat(sharedCachePath, &statbuf) == -1 ) {
+		fprintf(stderr, "Error: stat() failed for dyld shared cache at %s, errno=%d\n", sharedCachePath, errno);
+		exit(1);
+	}
+		
+	int cache_fd = ::open(sharedCachePath, O_RDONLY);
+	if ( cache_fd < 0 ) {
+		fprintf(stderr, "Error: open() failed for shared cache file at %s, errno=%d\n", sharedCachePath, errno);
+		exit(1);
+	}
+	options.mappedCache = ::mmap(NULL, (size_t)statbuf.st_size, PROT_READ, MAP_PRIVATE, cache_fd, 0);
+	if (options.mappedCache == MAP_FAILED) {
+		fprintf(stderr, "Error: mmap() for shared cache at %s failed, errno=%d\n", sharedCachePath, errno);
+		exit(1);
+	}
 	
-	if (!shared_cache_path)
-		shared_cache_path = default_shared_cache_path();
-		
-	if (stat(shared_cache_path, &statbuf)) {
-		fprintf(stderr, "Error: stat failed for dyld shared cache at %s\n", shared_cache_path);
-		exit(1);
-	}
-		
-	cache_fd = open(shared_cache_path, O_RDONLY);
-	if (cache_fd < 0) {
-		fprintf(stderr, "Error: failed to open shared cache file at %s\n", shared_cache_path);
-		exit(1);
-	}
-	mapped_cache = mmap(NULL, statbuf.st_size, PROT_READ, MAP_PRIVATE, cache_fd, 0);
-	if (mapped_cache == MAP_FAILED) {
-		fprintf(stderr, "Error: mmap() for shared cache at %s failed, errno=%d\n", shared_cache_path, errno);
-		exit(1);
-	}
-	
-	if ( print_slide_info ) {
-		const dyldCacheHeader<LittleEndian>* header = (dyldCacheHeader<LittleEndian>*)mapped_cache;
-		if (   (strcmp(header->magic(), "dyld_v1  x86_64") != 0)
-			&& (strcmp(header->magic(), "dyld_v1   armv6") != 0)
-			&& (strcmp(header->magic(), "dyld_v1   armv7") != 0) ) {
-			fprintf(stderr, "Error: unrecognized dyld shared cache magic or arch does not support sliding\n");
-			exit(1);
-		}
+	if ( options.mode == modeSlideInfo ) {
+		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*)mapped_cache + header->mappingOffset());
+		const dyldCacheFileMapping<LittleEndian>* mappings = (dyldCacheFileMapping<LittleEndian>*)((char*)options.mappedCache + header->mappingOffset());
 		const dyldCacheFileMapping<LittleEndian>* dataMapping = &mappings[1];
 		uint64_t dataStartAddress = dataMapping->address();
 		uint64_t dataSize = dataMapping->size();
-		const dyldCacheSlideInfo<LittleEndian>* slideInfoHeader = (dyldCacheSlideInfo<LittleEndian>*)((char*)mapped_cache+header->slideInfoOffset());
+		const dyldCacheSlideInfo<LittleEndian>* slideInfoHeader = (dyldCacheSlideInfo<LittleEndian>*)((char*)options.mappedCache+header->slideInfoOffset());
 		printf("slide info version=%d\n", slideInfoHeader->version());
-		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");
+		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 ( 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);
+						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]);
+				}
+			}
+		}
+	}
+	else 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 ) {
+            // HACK until this uses new header
+            uint32_t platform = *((uint32_t*)(((char*)header) + 0xD8));
+            uint32_t simulator = *((uint32_t*)(((char*)header) + 0xDC));
+            switch (platform) {
+                case 1:
+                    printf("platform: macOS\n");
+                    break;
+                case 2:
+                    if ( simulator & 0x400 )
+                        printf("platform: iOS simulator\n");
+                    else
+                        printf("platform: iOS\n");
+                    break;
+                case 3:
+                    if ( simulator & 0x400 )
+                        printf("platform: tvOS simulator\n");
+                    else
+                        printf("platform: tvOS\n");
+                    break;
+                case 4:
+                    if ( simulator & 0x400 )
+                        printf("platform: watchOS simulator\n");
+                    else
+                        printf("platform: watchOS\n");
+                    break;
+                case 5:
+                    printf("platform: bridgeOS\n");
+                    break;
+                default:
+                    printf("platform: 0x%08X 0x%08X\n", platform, simulator);
+            }
+        }
+		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 = statbuf.st_size - 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
+		}
+	}
+	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;
-		if ( strcmp((char*)mapped_cache, "dyld_v1    i386") == 0 ) 
-			callback = segment_callback<x86>;
-		else if ( strcmp((char*)mapped_cache, "dyld_v1  x86_64") == 0 ) 
-			callback = segment_callback<x86_64>;
-		else if ( strcmp((char*)mapped_cache, "dyld_v1     ppc") == 0 ) 
-			callback = segment_callback<ppc>;
-		else if ( strcmp((char*)mapped_cache, "dyld_v1   armv5") == 0 ) 
-			callback = segment_callback<arm>;
-		else if ( strcmp((char*)mapped_cache, "dyld_v1   armv6") == 0 ) 
-			callback = segment_callback<arm>;
-		else if ( strcmp((char*)mapped_cache, "dyld_v1   armv7") == 0 ) 
-			callback = segment_callback<arm>;
-		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 modeAcceleratorInfo:
+				case modeTextInfo:
+				case modeLocalSymbols:
+				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 modeAcceleratorInfo:
+				case modeTextInfo:
+				case modeLocalSymbols:
+				case modeExtract:
+					break;
+			}
+		}		
+		else if ( (strncmp((char*)options.mappedCache, "dyld_v1   armv", 14) == 0) 
+			   || (strncmp((char*)options.mappedCache, "dyld_v1  armv", 13) == 0) ) {
+			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 modeAcceleratorInfo:
+				case modeTextInfo:
+				case modeLocalSymbols:
+				case modeExtract:
+					break;
+			}
+		}		
+		else if ( (strcmp((char*)options.mappedCache, "dyld_v1   arm64") == 0)
+               || (strcmp((char*)options.mappedCache, "dyld_v1  arm64e") == 0) ) {
+			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 modeAcceleratorInfo:
+				case modeTextInfo:
+				case modeLocalSymbols:
+				case modeExtract:
+					break;
+			}
+		}		
+ 		else {
 			fprintf(stderr, "Error: unrecognized dyld shared cache magic.\n");
 			exit(1);
 		}
 		
-		args.mapped_cache = mapped_cache;
+		__block Results results;
+		results.dependentTargetFound = false;
+		int iterateResult = dyld_shared_cache_iterate(options.mappedCache, (uint32_t)statbuf.st_size, 
+										   ^(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 __BLOCKS__
-		// Shim to allow building for the host
-		void *argsPtr = &args;
-		dyld_shared_cache_iterate_segments_with_slide(mapped_cache, 
-										   ^(const char* dylib, const char* segName, uint64_t offset, uint64_t size, uint64_t mappedddress, uint64_t slide ) {
-											   (callback)(dylib, segName, offset, size, mappedddress, slide, argsPtr);
-										   });
-	#else
-		dyld_shared_cache_iterate_segments_with_slide_nb(mapped_cache, callback, &args);
-	#endif
-		
-		if (args.op == OP_LIST_LINKEDIT) {
+		if ( options.mode == modeLinkEdit ) {
 			// dump -linkedit information
-			for (std::map<uint32_t, char*>::iterator it = sPageToContent.begin(); it != sPageToContent.end(); ++it) {
-				printf("0x%0llX %s\n", sLinkeditBase+it->first, it->second);
-			}
-		}
-		
-		
-		if (args.target_path && !args.target_found) {
-			fprintf(stderr, "Error: could not find '%s' in the shared cache at\n  %s\n", args.target_path, shared_cache_path);
+			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);
 		}
 	}