Loading...
launch-cache/dyld_shared_cache_util.cpp dyld-239.4 dyld-655.1
--- dyld/dyld-239.4/launch-cache/dyld_shared_cache_util.cpp
+++ dyld/dyld-655.1/launch-cache/dyld_shared_cache_util.cpp
@@ -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,15 +34,23 @@
 #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 <mach/mach.h>
 
 #include <map>
+#include <vector>
+
+#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,
@@ -49,32 +58,112 @@
 	modeMap,
 	modeDependencies,
 	modeSlideInfo,
+    modeVerboseSlideInfo,
+	modeAcceleratorInfo,
+	modeTextInfo,
 	modeLinkEdit,
-	modeInfo
+	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;
 };
 
 
+// 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)
+{
+    struct stat statbuf;
+    if ( ::stat(path, &statbuf) ) {
+        fprintf(stderr, "Error: stat failed for dyld shared cache at %s\n", path);
+        return nullptr;
+    }
+    
+    int cache_fd = ::open(path, O_RDONLY);
+    if (cache_fd < 0) {
+        fprintf(stderr, "Error: failed to open shared cache file at %s\n", path);
+        return nullptr;
+    }
+    
+    uint8_t  firstPage[4096];
+    if ( ::pread(cache_fd, firstPage, 4096, 0) != 4096 ) {
+        fprintf(stderr, "Error: failed to read shared cache file at %s\n", path);
+        return nullptr;
+    }
+    const dyld_cache_header*       header   = (dyld_cache_header*)firstPage;
+    const dyld_cache_mapping_info* mappings = (dyld_cache_mapping_info*)(firstPage + header->mappingOffset);
+    
+    size_t vmSize = (size_t)(mappings[2].address + mappings[2].size - mappings[0].address);
+    vm_address_t result;
+    kern_return_t r = ::vm_allocate(mach_task_self(), &result, vmSize, VM_FLAGS_ANYWHERE);
+    if ( r != KERN_SUCCESS ) {
+        fprintf(stderr, "Error: failed to allocate space to load shared cache file at %s\n", path);
+        return nullptr;
+    }
+    for (int i=0; i < 3; ++i) {
+        void* mapped_cache = ::mmap((void*)(result + mappings[i].address - mappings[0].address), (size_t)mappings[i].size,
+                                    PROT_READ, MAP_FIXED | MAP_PRIVATE, cache_fd, mappings[i].fileOffset);
+        if (mapped_cache == MAP_FAILED) {
+            fprintf(stderr, "Error: mmap() for shared cache at %s failed, errno=%d\n", path, errno);
+            return nullptr;
+        }
+    }
+    ::close(cache_fd);
+    
+    cacheLength = statbuf.st_size;
+    
+    return (DyldSharedCache*)result;
+}
 
 
 
 void usage() {
-	fprintf(stderr, "Usage: dyld_shared_cache_util -list [ -uuid ] [-vmaddr] | -dependents <dylib-path> [ -versions ] | -linkedit | -map [ shared-cache-file ] | -slide_info | -info\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 );
+}
+#endif
 
 /*
  * Get the path to the native shared cache for this host
@@ -83,19 +172,28 @@
 #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";
+	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 __ARM_ARCH_7K__ 
-	return IPHONE_DYLD_SHARED_CACHE_DIR DYLD_SHARED_CACHE_BASE_NAME "armv7k";
+#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
@@ -173,6 +271,8 @@
 
 	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;;
@@ -189,6 +289,22 @@
 		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);
 }
 
 
@@ -279,7 +395,7 @@
 
 static void checkMode(Mode mode) {
 	if ( mode != modeNone ) {
-		fprintf(stderr, "Error: select one of: -list, -dependents, -info, -slide_info, -linkedit, or -map\n");
+		fprintf(stderr, "Error: select one of: -list, -dependents, -info, -slide_info, -verbose_slide_info, -linkedit, -map, -extract, or -size\n");
 		usage();
 		exit(1);
 	}
@@ -294,8 +410,13 @@
     options.printUUIDs = false;
 	options.printVMAddrs = false;
     options.printDylibVersions = false;
+	options.printInodes = false;
     options.dependentsOfPath = NULL;
-    
+    options.extractionDir = NULL;
+
+    bool printStrings = false;
+    bool printExports = false;
+
     for (uint32_t i = 1; i < argc; i++) {
         const char* opt = argv[i];
         if (opt[0] == '-') {
@@ -324,13 +445,58 @@
 			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, "-local_symbols") == 0) {
+                checkMode(options.mode);
+                options.mode = modeLocalSymbols;
+            }
+            else if (strcmp(opt, "-strings") == 0) {
+                if (options.mode != modeStrings)
+                    checkMode(options.mode);
+                options.mode = modeStrings;
+                printStrings = true;
+            }
+            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];
+                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;
@@ -355,7 +521,7 @@
 		exit(1);
 	}
 		
-	if ( options.mode != modeSlideInfo ) {
+	if ( options.mode != modeSlideInfo &&  options.mode != modeVerboseSlideInfo ) {
 		if ( options.printUUIDs && (options.mode != modeList) )
 			fprintf(stderr, "Warning: -uuid option ignored outside of -list mode\n");
 			
@@ -371,47 +537,226 @@
 			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, 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);
-	}
+    
+    const DyldSharedCache* dyldCache = nullptr;
+    bool dyldCacheIsLive = true;
+    size_t cacheLength = 0;
+    if ( sharedCachePath != nullptr ) {
+        dyldCache = mapCacheFile(sharedCachePath, cacheLength);
+        dyldCacheIsLive = false;
+    }
+    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
+        dyldCache = (DyldSharedCache*)_dyld_get_shared_cache_range(&cacheLength);
+#endif
+    }
+
+    options.mappedCache = dyldCache;
 	
-	if ( options.mode == modeSlideInfo ) {
+	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();
-		const dyldCacheSlideInfo<LittleEndian>* slideInfoHeader = (dyldCacheSlideInfo<LittleEndian>*)((char*)options.mappedCache+header->slideInfoOffset());
+        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());
-		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 ( options.mode == modeInfo ) {
+		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];
+                auto rebaseChain = [&](uint8_t* pageContent, uint16_t startOffset)
+                {
+                    uintptr_t slideAmount = 0;
+                    const uintptr_t   deltaMask    = (uintptr_t)(slideInfo->delta_mask());
+                    const uintptr_t   valueMask    = ~deltaMask;
+                    const uintptr_t   valueAdd     = (uintptr_t)(slideInfo->value_add());
+                    const unsigned    deltaShift   = __builtin_ctzll(deltaMask) - 2;
+
+                    uint32_t pageOffset = startOffset;
+                    uint32_t delta = 1;
+                    while ( delta != 0 ) {
+                        uint8_t* loc = pageContent + pageOffset;
+                        uintptr_t rawValue = *((uintptr_t*)loc);
+                        delta = (uint32_t)((rawValue & deltaMask) >> deltaShift);
+                        uintptr_t value = (rawValue & valueMask);
+                        if ( value != 0 ) {
+                            value += valueAdd;
+                            value += slideAmount;
+                        }
+                        printf("    [% 5d + 0x%04llX]: 0x%016llX\n", i, (uint64_t)(pageOffset), (uint64_t)rawValue);
+                        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);
+                        if ( options.mode == modeVerboseSlideInfo ) {
+                            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]);
+                    if ( options.mode == modeVerboseSlideInfo ) {
+                        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 ) {
+                    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 ) {
+            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);
+            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 rebaseChainV4 = [&](uint8_t* pageContent, uint16_t startOffset)
+                {
+                    uintptr_t slideAmount = 0;
+                    const uintptr_t   deltaMask    = (uintptr_t)(slideInfo->delta_mask);
+                    const uintptr_t   valueMask    = ~deltaMask;
+                    const uintptr_t   valueAdd     = (uintptr_t)(slideInfo->value_add);
+                    const unsigned    deltaShift   = __builtin_ctzll(deltaMask) - 2;
+
+                    uint32_t pageOffset = startOffset;
+                    uint32_t delta = 1;
+                    while ( delta != 0 ) {
+                        uint8_t* loc = pageContent + pageOffset;
+                        uint32_t rawValue = *((uint32_t*)loc);
+                        delta = (uint32_t)((rawValue & deltaMask) >> deltaShift);
+                        uintptr_t value = (rawValue & valueMask);
+                        if ( (value & 0xFFFF8000) == 0 ) {
+                            // small positive non-pointer, use as-is
+                        }
+                        else if ( (value & 0x3FFF8000) == 0x3FFF8000 ) {
+                            // small negative non-pointer
+                            value |= 0xC0000000;
+                        }
+                        else  {
+                            value += valueAdd;
+                            value += slideAmount;
+                        }
+                        printf("    [% 5d + 0x%04X]: 0x%08X\n", i, pageOffset, rawValue);
+                        pageOffset += delta;
+                    }
+                };
+                const uint8_t* dataPagesStart = (uint8_t*)((char*)options.mappedCache + dataMapping->file_offset());
+                if ( start == DYLD_CACHE_SLIDE4_PAGE_NO_REBASE ) {
+                    printf("page[% 5d]: no rebasing\n", i);
+                }
+                else if ( start & DYLD_CACHE_SLIDE4_PAGE_USE_EXTRA ) {
+                    printf("page[% 5d]: ", i);
+                    int j=(start & DYLD_CACHE_SLIDE4_PAGE_INDEX);
+                    bool done = false;
+                    do {
+                        uint16_t aStart = extras[j];
+                        printf("start=0x%04X ", aStart & DYLD_CACHE_SLIDE4_PAGE_INDEX);
+                        if ( options.mode == modeVerboseSlideInfo ) {
+                            uint8_t* page = (uint8_t*)(long)(dataPagesStart + (slideInfo->page_size*i));
+                            uint16_t pageStartOffset = (aStart & DYLD_CACHE_SLIDE4_PAGE_INDEX)*4;
+                            rebaseChainV4(page, pageStartOffset);
+                        }
+                        done = (extras[j] & DYLD_CACHE_SLIDE4_PAGE_EXTRA_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));
+                        uint16_t pageStartOffset = start*4;
+                        rebaseChainV4(page, pageStartOffset);
+                    }
+                }
+            }
+        }
+        return 0;
+	}
+	
+    if ( options.mode == modeInfo ) {
 		const dyldCacheHeader<LittleEndian>* header = (dyldCacheHeader<LittleEndian>*)options.mappedCache;
 		printf("uuid: ");
 		if ( header->mappingOffset() >= 0x68 ) {
@@ -425,20 +770,295 @@
 		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));
+            uint32_t simulator = bitfield & 0x200;
+            uint32_t locallyBuiltCache = bitfield & 0x400;
+            switch (platform) {
+                case 1:
+                    printf("platform: macOS\n");
+                    break;
+                case 2:
+                    if ( simulator )
+                        printf("platform: iOS simulator\n");
+                    else
+                        printf("platform: iOS\n");
+                    break;
+                case 3:
+                    if ( simulator )
+                        printf("platform: tvOS simulator\n");
+                    else
+                        printf("platform: tvOS\n");
+                    break;
+                case 4:
+                    if ( simulator )
+                        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("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     %lluMB\n", mappings[i].size()/(1024*1024));
+				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      %lluMB\n", mappings[i].size()/(1024*1024));
+				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  %lluMB\n", mappings[i].size()/(1024*1024));
-		}
+				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
+		}
+	}
+    else if ( options.mode == modeStrings ) {
+        if (printStrings) {
+            dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
+                const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
+                int64_t slide = ma->getSlide();
+                ma->forEachSection(^(const dyld3::MachOAnalyzer::SectionInfo& info, bool malformedSectionRange, bool& stop) {
+                    if ( ( (info.sectFlags & SECTION_TYPE) == S_CSTRING_LITERALS ) ) {
+                        if ( malformedSectionRange ) {
+                            stop = true;
+                            return;
+                        }
+                        const uint8_t* content = (uint8_t*)(info.sectAddr + slide);
+                        const char* s   = (char*)content;
+                        const char* end = s + info.sectSize;
+                        while ( s < end ) {
+                            printf("%s: %s\n", ma->installName(), s);
+                            while (*s != '\0' )
+                                ++s;
+                            ++s;
+                        }
+                    }
+                });
+            });
+        }
+
+        if (printExports) {
+            dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
+                const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
+                uint32_t exportTrieRuntimeOffset;
+                uint32_t exportTrieSize;
+                if ( ma->hasExportTrie(exportTrieRuntimeOffset, exportTrieSize) ) {
+                    const uint8_t* start = (uint8_t*)mh + exportTrieRuntimeOffset;
+                    const uint8_t* end = start + exportTrieSize;
+                    std::vector<ExportInfoTrie::Entry> exports;
+                    if ( !ExportInfoTrie::parseTrie(start, end, exports) ) {
+                        return;
+                    }
+
+                    for (const ExportInfoTrie::Entry& entry: exports) {
+                        printf("%s: %s\n", ma->installName(), entry.name.c_str());
+                    }
+                }
+            });
+        }
+    }
+	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;
+		segment_callback_t callback = nullptr;
 		if ( strcmp((char*)options.mappedCache, "dyld_v1    i386") == 0 ) {
 			switch ( options.mode ) {
 				case modeList:
@@ -453,61 +1073,157 @@
 				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:
-					break;
-			}
-		}		
-		else if ( strcmp((char*)options.mappedCache, "dyld_v1  x86_64") == 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 modeNone:
-				case modeInfo:
-				case modeSlideInfo:
-					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 modeNone:
-				case modeInfo:
-				case modeSlideInfo:
-					break;
-			}
-		}		
- 		else {
+                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, statbuf.st_size, 
+		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);
 										   });
@@ -522,7 +1238,13 @@
 				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);