Loading...
--- dyld/dyld-1235.2/other-tools/dyld_shared_cache_util.cpp
+++ dyld/dyld-960/other-tools/dyld_shared_cache_util.cpp
@@ -49,24 +49,20 @@
#include <iostream>
#include <optional>
-#include "ClosureFileSystemPhysical.h"
+//#include "ClosureBuilder.h"
#include "DyldSharedCache.h"
#include "JSONWriter.h"
#include "Trie.hpp"
#include "dsc_extractor.h"
#include "dyld_introspection.h"
-#include "OptimizerObjC.h"
#include "OptimizerSwift.h"
#include "PrebuiltLoader.h"
#include "DyldProcessConfig.h"
#include "DyldRuntimeState.h"
-#include "Utils.h"
#include "objc-shared-cache.h"
#include "OptimizerObjC.h"
-
-#include "ObjCVisitor.h"
using namespace dyld4;
@@ -76,6 +72,30 @@
#define DSC_BUNDLE_REL_PATH "../lib/dsc_extractor.bundle"
#endif
+// In newer shared caches, relative method list selectors are offsets from the magic selector in libobjc
+static uint64_t getSharedCacheRelativeSelectorBaseVMAddress(const DyldSharedCache* dyldCache, bool rebased)
+{
+ __block uint64_t sharedCacheRelativeSelectorBaseVMAddress = 0;
+ if ( dyldCache->header.mappingOffset >= __offsetof(dyld_cache_header, symbolFileUUID) ) {
+ constexpr std::string_view magicSelector = "\xf0\x9f\xa4\xaf";
+ dyld3::MachOAnalyzer::VMAddrConverter vmAddrConverter = dyldCache->makeVMAddrConverter(rebased);
+ dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
+ if ( !strcmp(installName, "/usr/lib/libobjc.A.dylib") ) {
+ const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)mh;
+ uintptr_t slide = ma->getSlide();
+ Diagnostics diag;
+ ma->forEachObjCSelectorReference(diag, vmAddrConverter,
+ ^(uint64_t selRefVMAddr, uint64_t selRefTargetVMAddr, bool &stop) {
+ const char* selString = (const char*)selRefTargetVMAddr + slide;
+ if ( selString == magicSelector ) {
+ sharedCacheRelativeSelectorBaseVMAddress = selRefTargetVMAddr;
+ }
+ });
+ }
+ });
+ }
+ return sharedCacheRelativeSelectorBaseVMAddress;
+}
enum Mode {
modeNone,
@@ -84,39 +104,24 @@
modeDependencies,
modeSlideInfo,
modeVerboseSlideInfo,
- modeFixupsInDylib,
modeTextInfo,
modeLinkEdit,
modeLocalSymbols,
modeJSONMap,
- modeVerboseJSONMap,
modeJSONDependents,
modeSectionSizes,
modeStrings,
modeInfo,
- modeTPROInfo,
- modeStats,
modeSize,
modeObjCInfo,
modeObjCProtocols,
modeObjCImpCaches,
modeObjCClasses,
- modeObjCClassLayout,
- modeObjCClassMethodLists,
- modeObjCClassHashTable,
modeObjCSelectors,
modeSwiftProtocolConformances,
modeExtract,
modePatchTable,
- modeRootsCost,
- modeListDylibsWithSection,
- modeDuplicates,
- modeDuplicatesSummary,
- modeMachHeaders,
- modeLoadCommands,
- modeCacheHeader,
- modeDylibSymbols,
- modeFunctionStarts,
+ modeListDylibsWithSection
};
struct Options {
@@ -126,8 +131,6 @@
const char* segmentName;
const char* sectionName;
const char* rootPath = nullptr;
- const char* fixupsInDylib;
- const char* rootsCostOfDylib = nullptr;
bool printUUIDs;
bool printVMAddrs;
bool printDylibVersions;
@@ -136,45 +139,7 @@
static void usage() {
- fprintf(stderr, "Usage: dyld_shared_cache_util <command> [-fs-root] [-inode] [-versions] [-vmaddr] [shared-cache-file]\n"
- " Commands:\n"
- " -list [-uuid] [-vmaddr] list images\n"
- " -dependents <dylb-path> list dependents of dylib\n"
- " -linkedit print linkedit contents\n"
- " -info print shared cache info\n"
- " -stats print size stats\n"
- " -slide_info print slide info\n"
- " -verbose_slide_info print verbose slide info\n"
- " -fixups_in_dylib <dylib-path> print fixups in dylib\n"
- " -text_info print locations of TEXT segments\n"
- " -local_symbols print local symbols and locations\n"
- " -strings print C strings in images\n"
- " -sections print summary of section sizes\n"
- " -exports list exported symbols in images\n"
- " -duplicate_exports list symbols exported by multiple images\n"
- " -duplicate_exports_summary print number of duplicated symbols per image\n"
- " -map print map of segment locations\n"
- " -json-map print map of segment locations in JSON format\n"
- " -verbose-json-map print map of segment and section locations in JSON format\n"
- " -json-dependents print dependents in JSON format\n"
- " -size print the size of each image\n"
- " -objc-info print summary of ObjC content\n"
- " -objc-protocols list ObjC protocols\n"
- " -objc-imp-caches print contents of ObjC method caches\n"
- " -objc-classes print ObjC class names and methods in JSON format\n"
- " -objc-class-layout print size, start offset, and ivars of ObjC classes\n"
- " -objc-class-method-lists print methods and properties of ObjC classes\n"
- " -objc-class-hash-table print the contents of the ObjC class table\n"
- " -objc-selectors print all ObjC selector names and locations in JSON format\n"
- " -swift-proto print Swift protocol conformance table\n"
- " -extract <directory> extract images into the given directory\n"
- " -patch_table print symbol patch table\n"
- " -list_dylibs_with_section <seg> <sect> list images that contain the given section\n"
- " -mach_headers summarize mach header of each image\n"
- " -load_commands summarize load commands of each image\n"
- " -cache_header print header of each shared cache file\n"
- " -dylib_symbols print all symbol names and locations\n"
- " -function_starts print address of beginning of each function\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");
}
static void checkMode(Mode mode) {
@@ -193,30 +158,20 @@
const char* segName;
};
-static void sortSegmentInfo(std::vector<SegmentInfo>& segInfos)
-{
- std::sort(segInfos.begin(), segInfos.end(), [](const SegmentInfo& l, const SegmentInfo& r) -> bool {
- return l.vmAddr < r.vmAddr;
- });
-}
-
-static void buildSegmentInfo(const dyld3::MachOAnalyzer* ma, std::vector<SegmentInfo>& segInfos)
-{
- const char* installName = ma->installName();
- ma->forEachSegment(^(const dyld3::MachOAnalyzer::SegmentInfo& info, bool& stop) {
- // Note, we subtract 1 from the vmSize so that lower_bound doesn't include the end of the segment
- // as being a match for a given address.
- segInfos.push_back({info.vmAddr, info.vmSize - 1, installName, info.segName});
- });
-}
-
static void buildSegmentInfo(const DyldSharedCache* dyldCache, std::vector<SegmentInfo>& segInfos)
{
dyldCache->forEachImage(^(const mach_header* mh, const char* installName) {
dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
- buildSegmentInfo(ma, segInfos);
+ ma->forEachSegment(^(const dyld3::MachOAnalyzer::SegmentInfo& info, bool& stop) {
+ // Note, we subtract 1 from the vmSize so that lower_bound doesn't include the end of the segment
+ // as being a match for a given address.
+ segInfos.push_back({info.vmAddr, info.vmSize - 1, installName, info.segName});
+ });
});
- sortSegmentInfo(segInfos);
+
+ std::sort(segInfos.begin(), segInfos.end(), [](const SegmentInfo& l, const SegmentInfo& r) -> bool {
+ return l.vmAddr < r.vmAddr;
+ });
}
static void printSlideInfoForDataRegion(const DyldSharedCache* dyldCache, uint64_t dataStartAddress, uint64_t dataSize,
@@ -234,20 +189,6 @@
for(int j=0; j < slideInfoHeader->entries_size; ++j)
printf("%02X", entry->bits[j]);
printf("\n");
- if ( verboseSlideInfo ) {
- uint8_t* pageContent = (uint8_t*)(long)(dataPagesStart + (4096 * i));
- for(int j=0; j < slideInfoHeader->entries_size; ++j) {
- uint8_t bitmask = entry->bits[j];
- for (unsigned k = 0; k != 8; ++k) {
- if ( bitmask & (1 << k) ) {
- uint32_t pageOffset = ((j * 8) + k) * 4;
- uint8_t* loc = pageContent + pageOffset;
- uint32_t rawValue = *((uint32_t*)loc);
- printf(" [% 5d + 0x%04llX]: 0x%016llX\n", i, (uint64_t)(pageOffset), (uint64_t)rawValue);
- }
- }
- }
- }
}
}
else if ( slideInfoHeader->version == 2 ) {
@@ -341,6 +282,9 @@
if ( loc->auth.authenticated ) {
uint64_t target = authValueAdd + loc->auth.offsetFromSharedCacheBase;
uint64_t targetValue = target;
+#if __has_feature(ptrauth_calls)
+ targetValue = ptr.arm64e.signPointer((void*)loc, target);
+#endif
printf(" [% 5d + 0x%04llX]: 0x%016llX (JOP: diversity %d, address %s, %s)\n",
i, (uint64_t)((const uint8_t*)loc - pageStart), targetValue,
ptr.arm64e.authBind.diversity, ptr.arm64e.authBind.addrDiv ? "true" : "false",
@@ -423,264 +367,10 @@
}
}
}
- else if ( slideInfoHeader->version == 5 ) {
- const dyld_cache_slide_info5* slideInfo = (dyld_cache_slide_info5*)(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->value_add);
- const uintptr_t valueAdd = (uintptr_t)(slideInfo->value_add);
- for (int i=0; i < slideInfo->page_starts_count; ++i) {
- uint16_t delta = slideInfo->page_starts[i];
- if ( delta == DYLD_CACHE_SLIDE_V5_PAGE_ATTR_NO_REBASE ) {
- printf("page[% 5d]: no rebasing\n", i);
- continue;
- }
-
- printf("page[% 5d]: start=0x%04X\n", i, delta);
- if ( !verboseSlideInfo )
- continue;
-
- delta = delta/sizeof(uint64_t); // initial offset is byte based
- const uint8_t* pageStart = dataPagesStart + (i * slideInfo->page_size);
- const dyld_cache_slide_pointer5* loc = (dyld_cache_slide_pointer5*)pageStart;
-
- do {
- loc += delta;
- delta = loc->regular.next;
-
- dyld3::MachOLoaded::ChainedFixupPointerOnDisk ptr;
- ptr.raw64 = *((uint64_t*)loc);
- PointerMetaData pmd(&ptr, DYLD_CHAINED_PTR_ARM64E_SHARED_CACHE);
-
- uint64_t targetValue = valueAdd + loc->regular.runtimeOffset;
- if ( pmd.authenticated ) {
- printf(" [% 5d + 0x%04llX]: 0x%016llX (JOP: diversity %d, address %s, %s)\n",
- i, (uint64_t)((const uint8_t*)loc - pageStart), targetValue,
- ptr.cache64e.auth.diversity, ptr.cache64e.auth.addrDiv ? "true" : "false",
- ptr.cache64e.keyName());
- } else {
- targetValue = targetValue | ptr.cache64e.high8();
- printf(" [% 5d + 0x%04llX]: 0x%016llX\n", i, (uint64_t)((const uint8_t*)loc - pageStart), targetValue);
- }
- } while (delta != 0);
- }
- }
}
-static void forEachSlidValue(const DyldSharedCache* dyldCache, uint64_t dataStartAddress, uint64_t dataSize,
- const uint8_t* dataPagesStart,
- const dyld_cache_slide_info* slideInfoHeader,
- void (^callback)(uint64_t fixupVMAddr, uint64_t targetVMAddr,
- PointerMetaData PMD))
-{
- if ( slideInfoHeader->version == 1 ) {
- const dyld_cache_slide_info_entry* entries = (dyld_cache_slide_info_entry*)((char*)slideInfoHeader + slideInfoHeader->entries_offset);
- const uint16_t* tocs = (uint16_t*)((char*)slideInfoHeader + slideInfoHeader->toc_offset);
- for(int i=0; i < slideInfoHeader->toc_count; ++i) {
- const dyld_cache_slide_info_entry* entry = &entries[tocs[i]];
- uint8_t* pageContent = (uint8_t*)(long)(dataPagesStart + (4096 * i));
- for(int j=0; j < slideInfoHeader->entries_size; ++j) {
- uint8_t bitmask = entry->bits[j];
- for (unsigned k = 0; k != 8; ++k) {
- if ( bitmask & (1 << k) ) {
- uint32_t pageOffset = ((j * 8) + k) * 4;
- uint8_t* loc = pageContent + pageOffset;
- uint32_t rawValue = *((uint32_t*)loc);
-
- uint64_t offsetInDataRegion = loc - dataPagesStart;
- uint64_t fixupVMAddr = dataStartAddress + offsetInDataRegion;
- uint64_t targetVMAddr = rawValue;
- callback(fixupVMAddr, targetVMAddr, PointerMetaData());
- }
- }
- }
- }
- }
- else if ( slideInfoHeader->version == 2 ) {
- const dyld_cache_slide_info2* slideInfo = (dyld_cache_slide_info2*)(slideInfoHeader);
- 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;
- }
- pageOffset += delta;
-
- uint64_t offsetInDataRegion = loc - dataPagesStart;
- uint64_t fixupVMAddr = dataStartAddress + offsetInDataRegion;
- uint64_t targetVMAddr = value;
- callback(fixupVMAddr, targetVMAddr, PointerMetaData());
- }
- };
- if ( start == DYLD_CACHE_SLIDE_PAGE_ATTR_NO_REBASE ) {
- // Nothing to do here
- }
- else if ( start & DYLD_CACHE_SLIDE_PAGE_ATTR_EXTRA ) {
- int j=(start & 0x3FFF);
- bool done = false;
- do {
- uint16_t aStart = extras[j];
- 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 );
- }
- else {
- 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 dyld_cache_slide_info3* slideInfo = (dyld_cache_slide_info3*)(slideInfoHeader);
- const uintptr_t authValueAdd = (uintptr_t)(slideInfo->auth_value_add);
- for (int i=0; i < slideInfo->page_starts_count; ++i) {
- uint16_t delta = slideInfo->page_starts[i];
- if ( delta == DYLD_CACHE_SLIDE_V3_PAGE_ATTR_NO_REBASE ) {
- // Nothing to do here
- continue;
- }
-
- delta = delta/sizeof(uint64_t); // initial offset is byte based
- const uint8_t* pageStart = dataPagesStart + (i * slideInfo->page_size);
- const dyld_cache_slide_pointer3* loc = (dyld_cache_slide_pointer3*)pageStart;
- do {
- loc += delta;
- delta = loc->plain.offsetToNextPointer;
- dyld3::MachOLoaded::ChainedFixupPointerOnDisk ptr;
- ptr.raw64 = *((uint64_t*)loc);
- if ( loc->auth.authenticated ) {
- uint64_t targetVMAddr = authValueAdd + loc->auth.offsetFromSharedCacheBase;
-
- PointerMetaData pmd(&ptr, DYLD_CHAINED_PTR_ARM64E);
- uint64_t offsetInDataRegion = (const uint8_t*)loc - dataPagesStart;
- uint64_t fixupVMAddr = dataStartAddress + offsetInDataRegion;
- callback(fixupVMAddr, targetVMAddr, pmd);
- }
- else {
- uint64_t targetVMAddr = ptr.arm64e.unpackTarget();
-
- uint64_t offsetInDataRegion = (const uint8_t*)loc - dataPagesStart;
- uint64_t fixupVMAddr = dataStartAddress + offsetInDataRegion;
- callback(fixupVMAddr, targetVMAddr, PointerMetaData());
- }
- } while (delta != 0);
- }
- }
- else if ( slideInfoHeader->version == 4 ) {
- const dyld_cache_slide_info4* slideInfo = (dyld_cache_slide_info4*)(slideInfoHeader);
- 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;
-
- uint64_t offsetInDataRegion = (const uint8_t*)loc - dataPagesStart;
- uint64_t fixupVMAddr = dataStartAddress + offsetInDataRegion;
- uint64_t targetVMAddr = value;
- callback(fixupVMAddr, targetVMAddr, PointerMetaData());
- }
- pageOffset += delta;
- }
- };
- if ( start == DYLD_CACHE_SLIDE4_PAGE_NO_REBASE ) {
- // Nothing to do here
- }
- else if ( start & DYLD_CACHE_SLIDE4_PAGE_USE_EXTRA ) {
- int j=(start & DYLD_CACHE_SLIDE4_PAGE_INDEX);
- bool done = false;
- do {
- uint16_t aStart = extras[j];
- 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 );
- }
- else {
- uint8_t* page = (uint8_t*)(long)(dataPagesStart + (slideInfo->page_size*i));
- uint16_t pageStartOffset = start*4;
- rebaseChainV4(page, pageStartOffset);
- }
- }
- }
- else if ( slideInfoHeader->version == 5 ) {
- const dyld_cache_slide_info5* slideInfo = (dyld_cache_slide_info5*)(slideInfoHeader);
- const uintptr_t valueAdd = (uintptr_t)(slideInfo->value_add);
- for (int i=0; i < slideInfo->page_starts_count; ++i) {
- uint16_t delta = slideInfo->page_starts[i];
- if ( delta == DYLD_CACHE_SLIDE_V5_PAGE_ATTR_NO_REBASE ) {
- // Nothing to do here
- continue;
- }
-
- delta = delta/sizeof(uint64_t); // initial offset is byte based
- const uint8_t* pageStart = dataPagesStart + (i * slideInfo->page_size);
- const dyld_cache_slide_pointer5* loc = (dyld_cache_slide_pointer5*)pageStart;
- do {
- loc += delta;
- delta = loc->regular.next;
-
- dyld3::MachOLoaded::ChainedFixupPointerOnDisk ptr;
- ptr.raw64 = *((uint64_t*)loc);
- PointerMetaData pmd(&ptr, DYLD_CHAINED_PTR_ARM64E_SHARED_CACHE);
-
- uint64_t offsetInDataRegion = (const uint8_t*)loc - dataPagesStart;
- uint64_t fixupVMAddr = dataStartAddress + offsetInDataRegion;
- uint64_t targetVMAddr = valueAdd + loc->auth.runtimeOffset + ((uint64_t)pmd.high8 << 56);
- callback(fixupVMAddr, targetVMAddr, pmd);
- } while (delta != 0);
- }
- }
-}
-
-
-static bool findImageAndSegment(const DyldSharedCache* dyldCache, const std::vector<SegmentInfo>& segInfos, uint64_t cacheOffset, SegmentInfo* found)
+
+static void findImageAndSegment(const DyldSharedCache* dyldCache, const std::vector<SegmentInfo>& segInfos, uint64_t cacheOffset, SegmentInfo* found)
{
const uint64_t locVmAddr = dyldCache->unslidLoadAddress() + cacheOffset;
const SegmentInfo target = { locVmAddr, 0, NULL, NULL };
@@ -688,426 +378,7 @@
[](const SegmentInfo& l, const SegmentInfo& r) -> bool {
return l.vmAddr+l.vmSize < r.vmAddr+r.vmSize;
});
-
- if ( lowIt == segInfos.end() )
- return false;
-
- if ( locVmAddr < lowIt->vmAddr )
- return false;
- if ( locVmAddr >= (lowIt->vmAddr + lowIt->vmSize) )
- return false;
-
*found = *lowIt;
- return true;
-}
-
-static void dumpObjCClassLayout(const DyldSharedCache* dyldCache)
-{
- dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
- const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
- Diagnostics diag;
-
- uint64_t sharedCacheRelativeSelectorBaseVMAddress = dyldCache->sharedCacheRelativeSelectorBaseVMAddress();
- __block objc_visitor::Visitor visitor(dyldCache, ma, VMAddress(sharedCacheRelativeSelectorBaseVMAddress));
- visitor.forEachClassAndMetaClass(^(const objc_visitor::Class& objcClass, bool& stopClass) {
- const char* className = objcClass.getName(visitor);
- bool isMetaClass = objcClass.isMetaClass;
- uint32_t instanceStart = objcClass.getInstanceStart(visitor);
- objc_visitor::IVarList ivars = objcClass.getIVars(visitor);
-
- printf("%s (%s): start 0x%x\n", className, isMetaClass ? "metaclass" : "class", instanceStart);
- std::optional<metadata_visitor::ResolvedValue> superClassValue = objcClass.getSuperclass(visitor);
- if ( superClassValue.has_value() ) {
- bool unusedIsPatchable = false;
- objc_visitor::Class superClass(superClassValue.value(), isMetaClass, unusedIsPatchable);
- const char* superClassName = superClass.getName(visitor);
- uint32_t superStart = superClass.getInstanceStart(visitor);
- uint32_t superSize = superClass.getInstanceSize(visitor);
- printf(" super %s (%s): start 0x%x, size 0x%x\n", superClassName,
- isMetaClass ? "metaclass" : "class", superStart, superSize);
- }
-
- uint32_t numIVars = ivars.numIVars();
- for ( uint32_t i = 0; i != numIVars; ++i ) {
- objc_visitor::IVar ivar = ivars.getIVar(visitor, i);
- std::optional<uint32_t> ivarStart = ivar.getOffset(visitor);
- const char* name = ivar.getName(visitor);
- printf(" ivar %s: 0x%x (start + 0x%d), alignment %d\n",
- name,
- ivarStart.has_value() ? ivarStart.value() : -1,
- ivarStart.has_value() ? (ivarStart.value() - instanceStart) : -1,
- ivar.getAlignment(visitor));
- }
- });
- });
-}
-
-template<typename ListTy>
-static ListTy skipListsOfLists(ListTy&& list, const objc_visitor::Visitor& visitor)
-{
- // we only want the class list. Ignore all ther other lists of lists
- if ( list.isListOfLists() ) {
- const ListOfListsEntry* listHeader = (ListOfListsEntry*)((uint8_t*) ((uint64_t)list.getLocation() & ~1));
- VMAddress methodListVMAddr = list.getVMAddress().value() - VMOffset(1ULL);
-
- if ( listHeader->count != 0 ) {
- uint32_t classListIndex = listHeader->count - 1;
-
- const ListOfListsEntry& listEntry = (listHeader + 1)[classListIndex];
-
- // The list entry is a relative offset to the target
- // Work out the VMAddress of that target
- VMOffset listEntryVMOffset{(uint64_t)&listEntry - (uint64_t)listHeader};
- VMAddress listEntryVMAddr = methodListVMAddr + listEntryVMOffset;
- VMAddress targetVMAddr = listEntryVMAddr + VMOffset((uint64_t)listEntry.offset);
-
- metadata_visitor::ResolvedValue classMethodListValue = visitor.getValueFor(targetVMAddr);
- ListTy classMethodList(classMethodListValue);
-
- return classMethodList;
- } else {
- return { std::nullopt };
- }
- }
-
- return list;
-}
-
-static void dumpObjCClassMethodLists(const DyldSharedCache* dyldCache)
-{
- // Map from vmAddr to the category name for that address
-
- __block std::unordered_map<VMAddress, std::string, VMAddressHash, VMAddressEqual> categoryMap;
- dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
- const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
- Diagnostics diag;
-
- const char* leafName = strrchr(installName, '/');
- if ( leafName == NULL )
- leafName = installName;
- else
- leafName++;
-
- uint64_t sharedCacheRelativeSelectorBaseVMAddress = dyldCache->sharedCacheRelativeSelectorBaseVMAddress();
- __block objc_visitor::Visitor visitor(dyldCache, ma, VMAddress(sharedCacheRelativeSelectorBaseVMAddress));
- visitor.forEachCategory(^(const objc_visitor::Category& objcCategory, bool& stopCategory) {
- const char* categoryName = objcCategory.getName(visitor);
- {
- objc_visitor::MethodList methodList = objcCategory.getClassMethods(visitor);
- std::optional<VMAddress> vmAddr = methodList.getVMAddress();
- if ( vmAddr.has_value() ) {
- categoryMap[vmAddr.value()] = std::string(categoryName) + " - " + leafName;
- }
- }
- {
- objc_visitor::MethodList methodList = objcCategory.getInstanceMethods(visitor);
- std::optional<VMAddress> vmAddr = methodList.getVMAddress();
- if ( vmAddr.has_value() ) {
- categoryMap[vmAddr.value()] = std::string(categoryName) + " - " + leafName;
- }
- }
- {
- objc_visitor::ProtocolList protocolList = objcCategory.getProtocols(visitor);
- std::optional<VMAddress> vmAddr = protocolList.getVMAddress();
- if ( vmAddr.has_value() ) {
- categoryMap[vmAddr.value()] = std::string(categoryName) + " - " + leafName;
- }
- }
- {
- objc_visitor::PropertyList propertyList = objcCategory.getClassProperties(visitor);
- std::optional<VMAddress> vmAddr = propertyList.getVMAddress();
- if ( vmAddr.has_value() ) {
- categoryMap[vmAddr.value()] = std::string(categoryName) + " - " + leafName;
- }
- }
- {
- objc_visitor::PropertyList propertyList = objcCategory.getInstanceProperties(visitor);
- std::optional<VMAddress> vmAddr = propertyList.getVMAddress();
- if ( vmAddr.has_value() ) {
- categoryMap[vmAddr.value()] = std::string(categoryName) + " - " + leafName;
- }
- }
- });
- });
-
- __block std::map<uint64_t, const char*> dylibVMAddrMap;
- dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
- const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)mh;
- if ( ma->hasObjC() )
- dylibVMAddrMap[ma->preferredLoadAddress()] = installName;
- });
-
-#if 0
- // Get a map of all dylibs in the cache from their "objc index" to install name
- __block std::map<uint16_t, const char*> dylibMap;
-
- const objc::HeaderInfoRO* headerInfoRO = dyldCache->objcHeaderInfoRO();
- const bool is64 = (strstr(dyldCache->archName(), "64") != nullptr) && (strstr(dyldCache->archName(), "64_32") == nullptr);
- if ( is64 ) {
- const auto* headerInfo64 = (objc::objc_headeropt_ro_t<uint64_t>*)headerInfoRO;
- uint64_t headerInfoVMAddr = dyldCache->unslidLoadAddress();
- headerInfoVMAddr += (uint64_t)headerInfo64 - (uint64_t)dyldCache;
- for ( std::pair<uint64_t, const char*> vmAddrAndName : dylibVMAddrMap ) {
- const objc::objc_header_info_ro_t<uint64_t>* element = headerInfo64->get(headerInfoVMAddr, vmAddrAndName.first);
- if ( element != nullptr ) {
- dylibMap[headerInfo64->index(element)] = vmAddrAndName.second;
- }
- }
- } else {
- const auto* headerInfo32 = (objc::objc_headeropt_ro_t<uint32_t>*)headerInfoRO;
- uint64_t headerInfoVMAddr = dyldCache->unslidLoadAddress();
- headerInfoVMAddr += (uint64_t)headerInfo32 - (uint64_t)dyldCache;
- for ( std::pair<uint64_t, const char*> vmAddrAndName : dylibVMAddrMap ) {
- const objc::objc_header_info_ro_t<uint32_t>* element = headerInfo32->get(headerInfoVMAddr, vmAddrAndName.first);
- if ( element != nullptr ) {
- dylibMap[headerInfo32->index(element)] = vmAddrAndName.second;
- }
- }
- }
- }
-#endif
-
- // Print all method lists in the shared cache
-
- struct ListOfListsEntry {
- union {
- struct {
- uint64_t imageIndex: 16;
- int64_t offset: 48;
- };
- struct {
- uint32_t entsize;
- uint32_t count;
- };
- };
- };
-
- __block std::unordered_set<VMAddress, VMAddressHash, VMAddressEqual> seenCategories;
- dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
- const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
- Diagnostics diag;
-
- printf("--- %s ---\n", installName);
-
- uint64_t sharedCacheRelativeSelectorBaseVMAddress = dyldCache->sharedCacheRelativeSelectorBaseVMAddress();
- __block objc_visitor::Visitor visitor(dyldCache, ma, VMAddress(sharedCacheRelativeSelectorBaseVMAddress));
- visitor.forEachClassAndMetaClass(^(const objc_visitor::Class& objcClass, bool& stopClass) {
- const char* className = objcClass.getName(visitor);
- bool isMetaClass = objcClass.isMetaClass;
-
- printf("%s (%s):\n", className, isMetaClass ? "metaclass" : "class");
- // method lists
- {
- objc_visitor::MethodList methodList = objcClass.getBaseMethods(visitor);
- if ( methodList.isListOfLists() ) {
- const ListOfListsEntry* listHeader = (ListOfListsEntry*)((uint8_t*) ((uint64_t)methodList.getLocation() & ~1));
- VMAddress methodListVMAddr = methodList.getVMAddress().value() - VMOffset(1ULL);
-
- printf("(list of %d lists) {\n", listHeader->count);
- for ( uint32_t i = 0; i != listHeader->count; ++i ) {
- const ListOfListsEntry& listEntry = (listHeader + 1)[i];
-
- // The list entry is a relative offset to the target
- // Work out the VMAddress of that target
- VMOffset listEntryVMOffset{(uint64_t)&listEntry - (uint64_t)listHeader};
- VMAddress listEntryVMAddr = methodListVMAddr + listEntryVMOffset;
- VMAddress targetVMAddr = listEntryVMAddr + VMOffset((uint64_t)listEntry.offset);
-
- auto categoryIt = categoryMap.find(targetVMAddr);
- if ( categoryIt != categoryMap.end() ) {
- seenCategories.insert(targetVMAddr);
- printf(" (category methods: image (%d) %s) {\n", listEntry.imageIndex, categoryIt->second.c_str());
-
- metadata_visitor::ResolvedValue catMethodListValue = visitor.getValueFor(targetVMAddr);
- objc_visitor::MethodList catMethodList(catMethodListValue);
- uint32_t numMethods = catMethodList.numMethods();
- for ( uint32_t methodIndex = 0; methodIndex != numMethods; ++methodIndex ) {
- objc_visitor::Method method = catMethodList.getMethod(visitor, methodIndex);
- const char* name = method.getName(visitor);
- printf(" %s\n", name);
- }
-
- printf(" }\n");
- } else {
- // If we didn't find a category then we must be processing the class
- // methods. These have to be last
- if ( (i + 1) != listHeader->count ) {
- fprintf(stderr, "Invalid method list on %s in %s\n", className, installName);
- exit(1);
- }
- printf(" (class methods: image (%d)) {\n", listEntry.imageIndex);
-
- metadata_visitor::ResolvedValue classMethodListValue = visitor.getValueFor(targetVMAddr);
- objc_visitor::MethodList classMethodList(classMethodListValue);
- uint32_t numMethods = classMethodList.numMethods();
- for ( uint32_t methodIndex = 0; methodIndex != numMethods; ++methodIndex ) {
- objc_visitor::Method method = classMethodList.getMethod(visitor, methodIndex);
- const char* name = method.getName(visitor);
- printf(" %s\n", name);
- }
-
- printf(" }\n");
- }
- }
- printf("}\n");
- } else {
- printf("(class methods) {\n");
- uint32_t numMethods = methodList.numMethods();
- for ( uint32_t methodIndex = 0; methodIndex != numMethods; ++methodIndex ) {
- objc_visitor::Method method = methodList.getMethod(visitor, methodIndex);
- const char* name = method.getName(visitor);
- printf(" %s\n", name);
- }
- printf("}\n");
- }
- }
-
- // protocol lists
- if ( !isMetaClass) {
- objc_visitor::ProtocolList protocolList = objcClass.getBaseProtocols(visitor);
- if ( protocolList.isListOfLists() ) {
-
- const ListOfListsEntry* listHeader = (ListOfListsEntry*)((uint8_t*) ((uint64_t)protocolList.getLocation() & ~1));
- VMAddress protocolListVMAddr = protocolList.getVMAddress().value() - VMOffset(1ULL);
-
- printf("(list of %d lists) {\n", listHeader->count);
- for ( uint32_t i = 0; i != listHeader->count; ++i ) {
- const ListOfListsEntry& listEntry = (listHeader + 1)[i];
-
- // The list entry is a relative offset to the target
- // Work out the VMAddress of that target
- VMOffset listEntryVMOffset{(uint64_t)&listEntry - (uint64_t)listHeader};
- VMAddress listEntryVMAddr = protocolListVMAddr + listEntryVMOffset;
- VMAddress targetVMAddr = listEntryVMAddr + VMOffset((uint64_t)listEntry.offset);
-
- auto categoryIt = categoryMap.find(targetVMAddr);
- if ( categoryIt != categoryMap.end() ) {
- seenCategories.insert(targetVMAddr);
- printf(" (category protocols: image (%d) %s) {\n", listEntry.imageIndex, categoryIt->second.c_str());
-
- metadata_visitor::ResolvedValue catProtocolListValue = visitor.getValueFor(targetVMAddr);
- objc_visitor::ProtocolList catProtocolList(catProtocolListValue);
- uint64_t numProtocols = catProtocolList.numProtocols(visitor);
- for ( uint64_t protocolIndex = 0; protocolIndex != numProtocols; ++protocolIndex ) {
- objc_visitor::Protocol protocol = catProtocolList.getProtocol(visitor, protocolIndex);
- const char* name = protocol.getName(visitor);
- printf(" %s\n", name);
- }
-
- printf(" }\n");
- } else {
- // If we didn't find a category then we must be processing the class
- // protocols. These have to be last
- if ( (i + 1) != listHeader->count ) {
- fprintf(stderr, "Invalid protocol list on %s in %s\n", className, installName);
- exit(1);
- }
- printf(" (class protocols: image (%d)) {\n", listEntry.imageIndex);
-
- metadata_visitor::ResolvedValue classProtocolListValue = visitor.getValueFor(targetVMAddr);
- objc_visitor::ProtocolList classProtocolList(classProtocolListValue);
- uint64_t numProtocols = classProtocolList.numProtocols(visitor);
- for ( uint64_t protocolIndex = 0; protocolIndex != numProtocols; ++protocolIndex ) {
- objc_visitor::Protocol protocol = classProtocolList.getProtocol(visitor, protocolIndex);
- const char* name = protocol.getName(visitor);
- printf(" %s\n", name);
- }
-
- printf(" }\n");
- }
- }
- printf("}\n");
- } else {
- printf("(class protocols) {\n");
- uint64_t numProtocols = protocolList.numProtocols(visitor);
- for ( uint64_t protocolIndex = 0; protocolIndex != numProtocols; ++protocolIndex ) {
- objc_visitor::Protocol protocol = protocolList.getProtocol(visitor, protocolIndex);
- const char* name = protocol.getName(visitor);
- printf(" %s\n", name);
- }
- printf("}\n");
- }
- }
- // property lists
- {
- objc_visitor::PropertyList propertyList = objcClass.getBaseProperties(visitor);
- if ( propertyList.isListOfLists() ) {
- const ListOfListsEntry* listHeader = (ListOfListsEntry*)((uint8_t*) ((uint64_t)propertyList.getLocation() & ~1));
- VMAddress propertyListVMAddr = propertyList.getVMAddress().value() - VMOffset(1ULL);
-
- printf("(list of %d lists) {\n", listHeader->count);
- for ( uint32_t i = 0; i != listHeader->count; ++i ) {
- const ListOfListsEntry& listEntry = (listHeader + 1)[i];
-
- // The list entry is a relative offset to the target
- // Work out the VMAddress of that target
- VMOffset listEntryVMOffset{(uint64_t)&listEntry - (uint64_t)listHeader};
- VMAddress listEntryVMAddr = propertyListVMAddr + listEntryVMOffset;
- VMAddress targetVMAddr = listEntryVMAddr + VMOffset((uint64_t)listEntry.offset);
-
- auto categoryIt = categoryMap.find(targetVMAddr);
- if ( categoryIt != categoryMap.end() ) {
- seenCategories.insert(targetVMAddr);
- printf(" (category properties: image (%d) %s) {\n", listEntry.imageIndex, categoryIt->second.c_str());
-
- metadata_visitor::ResolvedValue catPropertyListValue = visitor.getValueFor(targetVMAddr);
- objc_visitor::PropertyList catPropertyList(catPropertyListValue);
- uint32_t numProperties = catPropertyList.numProperties();
- for ( uint32_t propertyIndex = 0; propertyIndex != numProperties; ++propertyIndex ) {
- objc_visitor::Property property = catPropertyList.getProperty(visitor, propertyIndex);
- const char* name = property.getName(visitor);
- printf(" %s\n", name);
- }
-
- printf(" }\n");
- } else {
- // If we didn't find a category then we must be processing the class
- // properties. These have to be last
- if ( (i + 1) != listHeader->count ) {
- fprintf(stderr, "Invalid property list on %s in %s\n", className, installName);
- exit(1);
- }
- printf(" (class properties: image (%d)) {\n", listEntry.imageIndex);
-
- metadata_visitor::ResolvedValue classPropertyListValue = visitor.getValueFor(targetVMAddr);
- objc_visitor::PropertyList classPropertyList(classPropertyListValue);
- uint32_t numProperties = classPropertyList.numProperties();
- for ( uint32_t propertyIndex = 0; propertyIndex != numProperties; ++propertyIndex ) {
- objc_visitor::Property property = classPropertyList.getProperty(visitor, propertyIndex);
- const char* name = property.getName(visitor);
- printf(" %s\n", name);
- }
-
- printf(" }\n");
- }
- }
- printf("}\n");
- } else {
- printf("(class properties) {\n");
- uint32_t numProperties = propertyList.numProperties();
- for ( uint32_t propertyIndex = 0; propertyIndex != numProperties; ++propertyIndex ) {
- objc_visitor::Property property = propertyList.getProperty(visitor, propertyIndex);
- const char* name = property.getName(visitor);
- printf(" %s\n", name);
- }
- printf("}\n");
- }
- }
- });
- });
-
- // Check if any categories weren't attached
- bool badCategory = false;
- for ( auto& [vmAddr, name] : categoryMap ) {
- if ( seenCategories.count(vmAddr) )
- continue;
-
- badCategory = true;
- fprintf(stderr, "Failed to find class with category: %s\n", name.c_str());
- }
-
- if ( badCategory )
- exit(1);
}
@@ -1152,14 +423,6 @@
checkMode(options.mode);
options.mode = modeInfo;
}
- else if (strcmp(opt, "-tpro") == 0) {
- checkMode(options.mode);
- options.mode = modeTPROInfo;
- }
- else if (strcmp(opt, "-stats") == 0) {
- checkMode(options.mode);
- options.mode = modeStats;
- }
else if (strcmp(opt, "-slide_info") == 0) {
checkMode(options.mode);
options.mode = modeSlideInfo;
@@ -1167,16 +430,6 @@
else if (strcmp(opt, "-verbose_slide_info") == 0) {
checkMode(options.mode);
options.mode = modeVerboseSlideInfo;
- }
- else if (strcmp(opt, "-fixups_in_dylib") == 0) {
- checkMode(options.mode);
- options.mode = modeFixupsInDylib;
- options.fixupsInDylib = argv[++i];
- if ( i >= argc ) {
- fprintf(stderr, "Error: option -fixups_in_dylib requires a path argument\n");
- usage();
- exit(1);
- }
}
else if (strcmp(opt, "-text_info") == 0) {
checkMode(options.mode);
@@ -1202,12 +455,6 @@
options.mode = modeStrings;
printExports = true;
}
- else if (strcmp(opt, "-duplicate_exports") == 0) {
- options.mode = modeDuplicates;
- }
- else if (strcmp(opt, "-duplicate_exports_summary") == 0) {
- options.mode = modeDuplicatesSummary;
- }
else if (strcmp(opt, "-map") == 0) {
checkMode(options.mode);
options.mode = modeMap;
@@ -1216,10 +463,6 @@
checkMode(options.mode);
options.mode = modeJSONMap;
}
- else if (strcmp(opt, "-verbose-json-map") == 0) {
- checkMode(options.mode);
- options.mode = modeVerboseJSONMap;
- }
else if (strcmp(opt, "-json-dependents") == 0) {
checkMode(options.mode);
options.mode = modeJSONDependents;
@@ -1243,18 +486,6 @@
else if (strcmp(opt, "-objc-classes") == 0) {
checkMode(options.mode);
options.mode = modeObjCClasses;
- }
- else if (strcmp(opt, "-objc-class-layout") == 0) {
- checkMode(options.mode);
- options.mode = modeObjCClassLayout;
- }
- else if (strcmp(opt, "-objc-class-method-lists") == 0) {
- checkMode(options.mode);
- options.mode = modeObjCClassMethodLists;
- }
- else if (strcmp(opt, "-objc-class-hash-table") == 0) {
- checkMode(options.mode);
- options.mode = modeObjCClassHashTable;
}
else if (strcmp(opt, "-objc-selectors") == 0) {
checkMode(options.mode);
@@ -1292,16 +523,6 @@
else if (strcmp(opt, "-patch_table") == 0) {
options.mode = modePatchTable;
}
- else if (strcmp(opt, "-roots_cost") == 0) {
- checkMode(options.mode);
- options.mode = modeRootsCost;
- options.rootsCostOfDylib = argv[++i];
- if ( i >= argc ) {
- fprintf(stderr, "Error: option -roots_cost requires a path argument\n");
- usage();
- exit(1);
- }
- }
else if (strcmp(opt, "-list_dylibs_with_section") == 0) {
options.mode = modeListDylibsWithSection;
options.segmentName = argv[++i];
@@ -1312,25 +533,6 @@
exit(1);
}
}
- else if (strcmp(opt, "-mach_headers") == 0) {
- checkMode(options.mode);
- options.mode = modeMachHeaders;
- }
- else if (strcmp(opt, "-load_commands") == 0) {
- checkMode(options.mode);
- options.mode = modeLoadCommands;
- }
- else if (strcmp(opt, "-cache_header") == 0) {
- checkMode(options.mode);
- options.mode = modeCacheHeader;
- }
- else if (strcmp(opt, "-dylib_symbols") == 0) {
- checkMode(options.mode);
- options.mode = modeDylibSymbols;
- }
- else if (strcmp(opt, "-function_starts") == 0) {
- options.mode = modeFunctionStarts;
- }
else {
fprintf(stderr, "Error: unrecognized option %s\n", opt);
usage();
@@ -1343,7 +545,7 @@
}
if ( options.mode == modeNone ) {
- fprintf(stderr, "Error: no command selected\n");
+ fprintf(stderr, "Error: select one of -list, -dependents, -info, -linkedit, or -map\n");
usage();
exit(1);
}
@@ -1386,18 +588,6 @@
fprintf(stderr, "Cannot use -objc-classes with a live cache. Please run with a path to an on-disk cache file\n");
return 1;
}
- if ( options.mode == modeObjCClassLayout ) {
- fprintf(stderr, "Cannot use -objc-class-layout with a live cache. Please run with a path to an on-disk cache file\n");
- return 1;
- }
- if ( options.mode == modeObjCClassMethodLists ) {
- fprintf(stderr, "Cannot use -objc-class-method-lists with a live cache. Please run with a path to an on-disk cache file\n");
- return 1;
- }
- if ( options.mode == modeVerboseSlideInfo ) {
- fprintf(stderr, "Cannot use -verbose_slide_info with a live cache. Please run with a path to an on-disk cache file\n");
- return 1;
- }
// The in-use cache might be the first cache file of many. In that case, also add the sub caches
@@ -1407,94 +597,16 @@
}
if ( options.mode == modeSlideInfo || options.mode == modeVerboseSlideInfo ) {
- if ( dyldCache->numSubCaches() == 0 ) {
- if ( !dyldCache->hasSlideInfo() ) {
- fprintf(stderr, "Error: dyld shared cache does not contain slide info\n");
- exit(1);
- }
+ if ( !dyldCache->hasSlideInfo() ) {
+ fprintf(stderr, "Error: dyld shared cache does not contain slide info\n");
+ exit(1);
}
const bool verboseSlideInfo = (options.mode == modeVerboseSlideInfo);
- dyldCache->forEachCache(^(const DyldSharedCache *cache, bool& stopCache) {
- cache->forEachSlideInfo(^(uint64_t mappingStartAddress, uint64_t mappingSize, const uint8_t *mappingPagesStart,
- uint64_t slideInfoOffset, uint64_t slideInfoSize, const dyld_cache_slide_info *slideInfoHeader) {
- printSlideInfoForDataRegion(cache, mappingStartAddress, mappingSize, mappingPagesStart,
- slideInfoHeader, verboseSlideInfo);
- });
- });
- return 0;
- }
- else if ( options.mode == modeFixupsInDylib ) {
- if ( dyldCache->numSubCaches() == 0 ) {
- if ( !dyldCache->hasSlideInfo() ) {
- fprintf(stderr, "Error: dyld shared cache does not contain slide info\n");
- exit(1);
- }
- }
-
- uint32_t imageIndex = ~0U;
- if ( !dyldCache->hasImagePath(options.fixupsInDylib, imageIndex) ) {
- fprintf(stderr, "Error: dyld shared cache does not contain image: %s\n",
- options.fixupsInDylib);
- exit(1);
- }
-
- const auto* ma = (const dyld3::MachOAnalyzer*)dyldCache->getIndexedImageEntry(imageIndex);
-
- __block std::vector<SegmentInfo> dylibSegInfo;
- buildSegmentInfo(ma, dylibSegInfo);
- sortSegmentInfo(dylibSegInfo);
-
- __block std::vector<SegmentInfo> cacheSegInfo;
- buildSegmentInfo(dyldCache, cacheSegInfo);
-
- uint64_t cacheBaseAddress = dyldCache->unslidLoadAddress();
- auto handler = ^(uint64_t fixupVMAddr, uint64_t targetVMAddr,
- PointerMetaData pmd)
- {
- SegmentInfo fixupAt;
- if ( !findImageAndSegment(dyldCache, dylibSegInfo, fixupVMAddr - cacheBaseAddress, &fixupAt) ) {
- // Fixup is not in the given dylib
- return;
- }
-
- // Remove high8 if we have it
- uint64_t high8 = targetVMAddr >> 56;
- targetVMAddr = targetVMAddr & 0x00FFFFFFFFFFFFFF;
-
- SegmentInfo targetAt;
- if ( !findImageAndSegment(dyldCache, cacheSegInfo, targetVMAddr - cacheBaseAddress, &targetAt) ) {
- return;
- }
-
- if ( pmd.authenticated ) {
- static const char* keyNames[] = {
- "IA", "IB", "DA", "DB"
- };
- printf("%s(0x%04llX) -> %s(0x%04llX):%s; (PAC: div=%d, addr=%s, key=%s)\n",
- fixupAt.segName, fixupVMAddr - fixupAt.vmAddr,
- targetAt.segName, targetVMAddr - targetAt.vmAddr, targetAt.installName,
- pmd.diversity, pmd.usesAddrDiversity ? "true" : "false", keyNames[pmd.key]);
- } else {
- if ( high8 != 0 ) {
- printf("%s(0x%04llX) -> %s(0x%04llX):%s; (high8: 0x%02llX)\n",
- fixupAt.segName, fixupVMAddr - fixupAt.vmAddr,
- targetAt.segName, targetVMAddr - targetAt.vmAddr, targetAt.installName,
- high8);
- } else {
- printf("%s(0x%04llX) -> %s(0x%04llX):%s\n",
- fixupAt.segName, fixupVMAddr - fixupAt.vmAddr,
- targetAt.segName, targetVMAddr - targetAt.vmAddr, targetAt.installName);
- }
- }
- };
-
- dyldCache->forEachCache(^(const DyldSharedCache *cache, bool& stopCache) {
- cache->forEachSlideInfo(^(uint64_t mappingStartAddress, uint64_t mappingSize, const uint8_t *mappingPagesStart,
- uint64_t slideInfoOffset, uint64_t slideInfoSize, const dyld_cache_slide_info *slideInfoHeader) {
- forEachSlidValue(cache, mappingStartAddress, mappingSize, mappingPagesStart,
- slideInfoHeader, handler);
- });
+ dyldCache->forEachSlideInfo(^(uint64_t mappingStartAddress, uint64_t mappingSize, const uint8_t *mappingPagesStart,
+ uint64_t slideInfoOffset, uint64_t slideInfoSize, const dyld_cache_slide_info *slideInfoHeader) {
+ printSlideInfoForDataRegion(dyldCache, mappingStartAddress, mappingSize, mappingPagesStart,
+ slideInfoHeader, verboseSlideInfo);
});
return 0;
}
@@ -1507,11 +619,7 @@
dyld3::Platform platform = dyldCache->platform();
printf("platform: %s\n", dyld3::MachOFile::platformName(platform));
printf("built by: %s\n", header->locallyBuiltCache ? "local machine" : "B&I");
- printf("cache type: %s\n", DyldSharedCache::getCacheTypeName(header->cacheType));
- if ( header->dylibsExpectedOnDisk )
- printf("dylibs expected on disk: true\n");
- if ( header->cacheType == kDyldSharedCacheTypeUniversal )
- printf("cache sub-type: %s\n", DyldSharedCache::getCacheTypeName(header->cacheSubType));
+ printf("cache type: %s\n", header->cacheType ? "production" : "development");
if ( header->mappingOffset >= __offsetof(dyld_cache_header, imagesCount) ) {
printf("image count: %u\n", header->imagesCount);
} else {
@@ -1528,36 +636,22 @@
entropyBits = __builtin_clz(possibleSlideValues - 1);
printf("ASLR entropy: %u-bits (%lldMB)\n", entropyBits, header->maxSlide >> 20);
}
+
printf("mappings:\n");
dyldCache->forEachRange(^(const char *mappingName, uint64_t unslidVMAddr, uint64_t vmSize,
uint32_t cacheFileIndex, uint64_t fileOffset, uint32_t initProt, uint32_t maxProt, bool& stopRange) {
- std::string initProtString;
- initProtString += (initProt & VM_PROT_READ) ? "r" : "-";
- initProtString += (initProt & VM_PROT_WRITE) ? "w" : "-";
- initProtString += (initProt & VM_PROT_EXECUTE) ? "x" : "-";
-
- std::string maxProtString;
- maxProtString += (maxProt & VM_PROT_READ) ? "r" : "-";
- maxProtString += (maxProt & VM_PROT_WRITE) ? "w" : "-";
- maxProtString += (maxProt & VM_PROT_EXECUTE) ? "x" : "-";
-
- printf("%20s %4lluMB, file offset: #%u/0x%08llX -> 0x%08llX, address: 0x%08llX -> 0x%08llX, %s -> %s\n",
- mappingName, vmSize / (1024*1024), cacheFileIndex, fileOffset, fileOffset + vmSize,
- unslidVMAddr, unslidVMAddr + vmSize, initProtString.c_str(), maxProtString.c_str());
- if (header->mappingOffset >= __offsetof(dyld_cache_header, dynamicDataOffset)) {
- if ( (unslidVMAddr + vmSize) == (header->sharedRegionStart + header->dynamicDataOffset) ) {
- printf(" dynamic config %4lluKB, address: 0x%08llX -> 0x%08llX\n",
- header->dynamicDataMaxSize/1024, header->sharedRegionStart + header->dynamicDataOffset,
- header->sharedRegionStart + header->dynamicDataOffset + header->dynamicDataMaxSize);
- }
- }
+ printf("%16s %4lluMB, file offset: #%u/0x%08llX -> 0x%08llX, address: 0x%08llX -> 0x%08llX\n",
+ mappingName, vmSize / (1024*1024), cacheFileIndex, fileOffset, fileOffset + vmSize, unslidVMAddr, unslidVMAddr + vmSize);
}, ^(const DyldSharedCache* subCache, uint32_t cacheFileIndex) {
const dyld_cache_header* subCacheHeader = &subCache->header;
- if ( subCacheHeader->codeSignatureSize != 0) {
- printf("%20s %4lluMB, file offset: #%u/0x%08llX -> 0x%08llX\n",
- "code sign", subCacheHeader->codeSignatureSize/(1024*1024), cacheFileIndex,
- subCacheHeader->codeSignatureOffset, subCacheHeader->codeSignatureOffset + subCacheHeader->codeSignatureSize);
+ if ( subCacheHeader->codeSignatureOffset != 0 ) {
+ uint64_t size = subCacheHeader->codeSignatureSize;
+ uint64_t csAddr = subCache->getCodeSignAddress();
+ if ( size != 0 )
+ printf("%16s %4lluMB, file offset: #%u/0x%08llX -> 0x%08llX, address: 0x%08llX -> 0x%08llX\n",
+ "code sign", size/(1024*1024), cacheFileIndex,
+ subCacheHeader->codeSignatureOffset, subCacheHeader->codeSignatureOffset + size, csAddr, csAddr + size);
}
if ( subCacheHeader->mappingOffset > __offsetof(dyld_cache_header, rosettaReadOnlySize) ) {
@@ -1584,38 +678,6 @@
subCacheHeader->localSymbolsSize/(1024*1024), cacheFileIndex,
subCacheHeader->localSymbolsOffset, subCacheHeader->localSymbolsOffset + subCacheHeader->localSymbolsSize);
});
- }
- else if ( options.mode == modeTPROInfo ) {
- printf("TPRO mappings:\n");
- __block bool foundMapping = false;
- dyldCache->forEachTPRORegion(^(const void *content, uint64_t unslidVMAddr, uint64_t vmSize, bool &stopRegion) {
- printf(" %4lluKB, address: 0x%08llX -> 0x%08llX\n", vmSize / 1024, unslidVMAddr, unslidVMAddr + vmSize);
- foundMapping = true;
- });
- if ( !foundMapping )
- printf(" none found\n");
- }
- else if ( options.mode == modeStats ) {
- __block std::map<std::string_view, uint64_t> mappingSizes;
- __block uint64_t totalFileSize = 0;
- __block uint64_t minVMAddr = UINT64_MAX;
- __block uint64_t maxVMAddr = 0;
-
- dyldCache->forEachRange(^(const char *mappingName, uint64_t unslidVMAddr, uint64_t vmSize,
- uint32_t cacheFileIndex, uint64_t fileOffset, uint32_t initProt, uint32_t maxProt, bool& stopRange) {
- mappingSizes[mappingName] += vmSize;
- totalFileSize += vmSize;
- minVMAddr = std::min(minVMAddr, unslidVMAddr);
- maxVMAddr = std::max(maxVMAddr, unslidVMAddr + vmSize);
- }, nullptr);
-
- uint64_t totalVMSize = maxVMAddr - minVMAddr;
-
- printf("-stats:\n");
- printf(" total file size: %lldMB\n", totalFileSize >> 20);
- printf(" total VM size: %lldMB\n", totalVMSize >> 20);
- for ( const auto& mappingNameAndSize : mappingSizes )
- printf(" total VM size (%s): %lldMB\n", mappingNameAndSize.first.data(), mappingNameAndSize.second >> 20);
}
else if ( options.mode == modeTextInfo ) {
const dyld_cache_header* header = &dyldCache->header;
@@ -1713,11 +775,8 @@
printf("local symbols by dylib (count=%d):\n", entriesCount);
#endif
}
- else if ( (options.mode == modeJSONMap) || (options.mode == modeVerboseJSONMap) ) {
- bool verbose = (options.mode == modeVerboseJSONMap);
- uuid_t uuid;
- dyldCache->getUUID(uuid);
- std::string buffer = dyldCache->generateJSONMap("unknown", uuid, verbose);
+ else if ( options.mode == modeJSONMap ) {
+ std::string buffer = dyldCache->generateJSONMap("unknown");
printf("%s\n", buffer.c_str());
}
else if ( options.mode == modeJSONDependents ) {
@@ -1731,7 +790,7 @@
if ( !cacheRebased )
dyldCache->applyCacheRebases();
- uint64_t sharedCacheRelativeSelectorBaseVMAddress = dyldCache->sharedCacheRelativeSelectorBaseVMAddress();
+ uint64_t sharedCacheRelativeSelectorBaseVMAddress = getSharedCacheRelativeSelectorBaseVMAddress(dyldCache, cacheRebased);
dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
__block std::unordered_set<std::string_view> seenStrings;
@@ -1836,10 +895,7 @@
}
for (const ExportInfoTrie::Entry& entry: exports) {
- const char* resolver = "";
- if ( entry.info.flags & EXPORT_SYMBOL_FLAGS_STUB_AND_RESOLVER )
- resolver = " (resolver)";
- printf("%s: %s%s\n", installName, entry.name.c_str(), resolver);
+ printf("%s: %s\n", installName, entry.name.c_str());
}
}
});
@@ -1859,201 +915,57 @@
}
}
else if ( options.mode == modeObjCInfo ) {
- if ( !dyldCache->hasOptimizedObjC() ) {
+ const objc_opt::objc_opt_t* objcOpt = dyldCache->objcOpt();
+ if ( objcOpt == nullptr ) {
fprintf(stderr, "Error: could not get optimized objc\n");
return 1;
}
- printf("version: %u\n", dyldCache->objcOptVersion());
- printf("flags: 0x%08x\n", dyldCache->objcOptFlags());
- if ( const objc::SelectorHashTable* selectors = dyldCache->objcSelectorHashTable() ) {
+ printf("version: %u\n", objcOpt->version);
+ printf("flags: 0x%08x\n", objcOpt->flags);
+ if ( const objc::SelectorHashTable* selectors = dyldCache->objcOpt()->selectorOpt() ) {
printf("num selectors: %u\n", selectors->occupancy());
}
- if ( const objc::ClassHashTable* classes = dyldCache->objcClassHashTable() ) {
+ if ( const objc::ClassHashTable* classes = dyldCache->objcOpt()->classOpt() ) {
printf("num classes: %u\n", classes->occupancy());
}
- if ( const objc::ProtocolHashTable* protocols = dyldCache->objcProtocolHashTable() ) {
+ if ( const objc::ProtocolHashTable* protocols = dyldCache->objcOpt()->protocolOpt() ) {
printf("num protocols: %u\n", protocols->occupancy());
}
- if ( const void* relativeMethodListSelectorBase = dyldCache->objcRelativeMethodListsBaseAddress() ) {
+ if ( const void* relativeMethodListSelectorBase = dyldCache->objcOpt()->relativeMethodListsBaseAddress() ) {
printf("method list selector base address: 0x%llx\n", dyldCache->unslidLoadAddress() + ((uint64_t)relativeMethodListSelectorBase - (uint64_t)dyldCache));
printf("method list selector base value: \"%s\"\n", (const char*)relativeMethodListSelectorBase);
}
-
- // Dump the objc indices
-
- __block std::map<uint64_t, const char*> dylibVMAddrMap;
- dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
- const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)mh;
- if ( ma->hasObjC() )
- dylibVMAddrMap[ma->preferredLoadAddress()] = installName;
- });
-
- std::vector<std::pair<std::string_view, const objc::objc_image_info*>> objcDylibs;
-
- const objc::HeaderInfoRO* headerInfoRO = dyldCache->objcHeaderInfoRO();
- const bool is64 = (strstr(dyldCache->archName(), "64") != nullptr) && (strstr(dyldCache->archName(), "64_32") == nullptr);
- if ( is64 ) {
- const auto* headerInfo64 = (objc::objc_headeropt_ro_t<uint64_t>*)headerInfoRO;
- uint64_t headerInfoVMAddr = dyldCache->unslidLoadAddress();
- headerInfoVMAddr += (uint64_t)headerInfo64 - (uint64_t)dyldCache;
- for ( std::pair<uint64_t, const char*> vmAddrAndName : dylibVMAddrMap ) {
- const objc::objc_header_info_ro_t<uint64_t>* element = headerInfo64->get(headerInfoVMAddr, vmAddrAndName.first);
- if ( element != nullptr ) {
- objcDylibs.resize(headerInfo64->index(element) + 1);
- objcDylibs[headerInfo64->index(element)] = { vmAddrAndName.second, (const objc::objc_image_info*)element->imageInfo() };
- }
- }
- } else {
- const auto* headerInfo32 = (objc::objc_headeropt_ro_t<uint32_t>*)headerInfoRO;
- uint64_t headerInfoVMAddr = dyldCache->unslidLoadAddress();
- headerInfoVMAddr += (uint64_t)headerInfo32 - (uint64_t)dyldCache;
- for ( std::pair<uint64_t, const char*> vmAddrAndName : dylibVMAddrMap ) {
- const objc::objc_header_info_ro_t<uint32_t>* element = headerInfo32->get(headerInfoVMAddr, vmAddrAndName.first);
- if ( element != nullptr ) {
- objcDylibs.resize(headerInfo32->index(element) + 1);
- objcDylibs[headerInfo32->index(element)] = { vmAddrAndName.second, (const objc::objc_image_info*)element->imageInfo() };
- }
- }
- }
-
- printf("num objc dylibs: %lu\n", objcDylibs.size());
- for ( uint32_t i = 0; i != objcDylibs.size(); ++i ) {
- const std::pair<std::string_view, const objc::objc_image_info*> objcDylib = objcDylibs[i];
-
- // Try work out which flags we have
- std::string flagsStr;
- uint32_t flags = objcDylib.second->flags;
- std::pair<uint32_t, const char*> flagComponents[] = {
- { 1 << 0, "dyldCategories" },
- { 1 << 1, "supportsGC" },
- { 1 << 2, "requiresGC" },
- { 1 << 3, "optimizedByDyld" },
- { 1 << 4, "signedClassRO" },
- { 1 << 5, "isSimulated" },
- { 1 << 6, "hasCategoryClassProperties" },
- { 1 << 7, "optimizedByDyldClosure" },
- { 0xFF << 8, "swiftUnstableVersion" },
- { 0xFFFF << 16, "swiftVersion" },
- };
- bool needsSeparator = false;
- for ( auto [mask, name] : flagComponents ) {
- if ( (flags & mask) != 0 ) {
- if ( needsSeparator )
- flagsStr += " | ";
- needsSeparator = true;
-
- flagsStr += name;
- }
- }
- printf("dylib[%d]: { 0x%x, 0x%08x } (%s) %s\n",
- i, objcDylib.second->version, objcDylib.second->flags,
- flagsStr.c_str(), objcDylib.first.data());
- }
}
else if ( options.mode == modeObjCProtocols ) {
- if ( !dyldCache->hasOptimizedObjC() ) {
+ if ( dyldCache->objcOpt() == nullptr ) {
fprintf(stderr, "Error: could not get optimized objc\n");
return 1;
}
- const objc::ProtocolHashTable* protocols = dyldCache->objcProtocolHashTable();
+ const objc::ProtocolHashTable* protocols = dyldCache->objcOpt()->protocolOpt();
if ( protocols == nullptr ) {
fprintf(stderr, "Error: could not get optimized objc protocols\n");
return 1;
}
- __block std::map<uint64_t, const char*> dylibVMAddrMap;
- dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
- const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)mh;
- if ( ma->hasObjC() )
- dylibVMAddrMap[ma->preferredLoadAddress()] = installName;
- });
-
- __block std::map<uint16_t, const char*> dylibMap;
-
- const objc::HeaderInfoRO* headerInfoRO = dyldCache->objcHeaderInfoRO();
- const bool is64 = (strstr(dyldCache->archName(), "64") != nullptr) && (strstr(dyldCache->archName(), "64_32") == nullptr);
- if ( is64 ) {
- const auto* headerInfo64 = (objc::objc_headeropt_ro_t<uint64_t>*)headerInfoRO;
- uint64_t headerInfoVMAddr = dyldCache->unslidLoadAddress();
- headerInfoVMAddr += (uint64_t)headerInfo64 - (uint64_t)dyldCache;
- for ( std::pair<uint64_t, const char*> vmAddrAndName : dylibVMAddrMap ) {
- const objc::objc_header_info_ro_t<uint64_t>* element = headerInfo64->get(headerInfoVMAddr, vmAddrAndName.first);
- if ( element != nullptr ) {
- dylibMap[headerInfo64->index(element)] = vmAddrAndName.second;
- }
- }
- } else {
- const auto* headerInfo32 = (objc::objc_headeropt_ro_t<uint32_t>*)headerInfoRO;
- uint64_t headerInfoVMAddr = dyldCache->unslidLoadAddress();
- headerInfoVMAddr += (uint64_t)headerInfo32 - (uint64_t)dyldCache;
- for ( std::pair<uint64_t, const char*> vmAddrAndName : dylibVMAddrMap ) {
- const objc::objc_header_info_ro_t<uint32_t>* element = headerInfo32->get(headerInfoVMAddr, vmAddrAndName.first);
- if ( element != nullptr ) {
- dylibMap[headerInfo32->index(element)] = vmAddrAndName.second;
- }
- }
- }
-
- typedef objc::ProtocolHashTable::ObjectAndDylibIndex ObjectAndDylibIndex;
- protocols->forEachProtocol(^(uint32_t bucketIndex, const char* protocolName,
- const dyld3::Array<ObjectAndDylibIndex>& implCacheInfos) {
-
- if ( implCacheInfos.empty() ) {
+ protocols->forEachProtocol(^(uint32_t bucketIndex, const char* protocolName, const dyld3::Array<uint64_t>& implCacheOffsets) {
+
+ if ( implCacheOffsets.empty() ) {
// Empty bucket
- printf("[% 5d]\n", bucketIndex);
+ fprintf(stderr, "[% 5d]\n", bucketIndex);
return;
}
- if ( implCacheInfos.count() == 1 ) {
+ if ( implCacheOffsets.count() == 1 ) {
// No duplicates
- printf("[% 5d] -> (% 8lld, %4d) = %s (in %s)\n",
- bucketIndex, implCacheInfos[0].first, implCacheInfos[0].second, protocolName,
- dylibMap.at(implCacheInfos[0].second));
+ fprintf(stderr, "[% 5d] -> (% 8lld) = %s\n", bucketIndex, implCacheOffsets[0], protocolName);
return;
}
// class appears in more than one header
- fprintf(stderr, "[% 5d] -> %llu duplicates = %s\n", bucketIndex, implCacheInfos.count(), protocolName);
- for (const ObjectAndDylibIndex& objectInfo : implCacheInfos) {
- printf(" - [% 5d] -> (% 8lld, %4d) = %s in (%s)\n",
- bucketIndex, objectInfo.first, objectInfo.second, protocolName,
- dylibMap.at(objectInfo.second));
- }
- });
- }
- else if ( options.mode == modeObjCClassHashTable ) {
- if ( !dyldCache->hasOptimizedObjC() ) {
- fprintf(stderr, "Error: could not get optimized objc\n");
- return 1;
- }
- const objc::ClassHashTable* classes = dyldCache->objcClassHashTable();
- if ( classes == nullptr ) {
- fprintf(stderr, "Error: could not get optimized objc classes\n");
- return 1;
- }
-
- typedef objc::ClassHashTable::ObjectAndDylibIndex ObjectAndDylibIndex;
- classes->forEachClass(^(uint32_t bucketIndex, const char* className,
- const dyld3::Array<ObjectAndDylibIndex>& implCacheInfos) {
- if ( implCacheInfos.empty() ) {
- // Empty bucket
- printf("[% 5d]\n", bucketIndex);
- return;
- }
-
- if ( implCacheInfos.count() == 1 ) {
- // No duplicates
- printf("[% 5d] -> (% 8lld, %4d) = %s\n",
- bucketIndex, implCacheInfos[0].first, implCacheInfos[0].second, className);
- return;
- }
-
- // class appears in more than one header
- printf("[% 5d] -> %llu duplicates = %s\n", bucketIndex, implCacheInfos.count(), className);
- for (const ObjectAndDylibIndex& objectInfo : implCacheInfos) {
- printf(" - [% 5d] -> (% 8lld, %4d) = %s\n",
- bucketIndex, objectInfo.first, objectInfo.second, className);
+ fprintf(stderr, "[% 5d] -> %lu duplicates = %s\n", bucketIndex, implCacheOffsets.count(), protocolName);
+ for (uint64_t cacheOffset : implCacheOffsets) {
+ fprintf(stderr, " - [% 5d] -> (% 8lld) = %s\n", bucketIndex, cacheOffset, protocolName);
}
});
}
@@ -2069,15 +981,18 @@
dyldCache->applyCacheRebases();
- auto getString = ^const char *(const dyld3::MachOAnalyzer* ma, VMAddress nameVMAddr){
+ auto getString = ^const char *(const dyld3::MachOAnalyzer* ma, uint64_t nameVMAddr){
dyld3::MachOAnalyzer::PrintableStringResult result;
- const char* name = ma->getPrintableString(nameVMAddr.rawValue(), result);
+ const char* name = ma->getPrintableString(nameVMAddr, result);
if (result == dyld3::MachOAnalyzer::PrintableStringResult::CanPrint)
return name;
return nullptr;
};
- uint64_t sharedCacheRelativeSelectorBaseVMAddress = dyldCache->sharedCacheRelativeSelectorBaseVMAddress();
+ // We don't actually slide the cache. It still contains unslid VMAddr's
+ const bool rebased = false;
+
+ uint64_t sharedCacheRelativeSelectorBaseVMAddress = getSharedCacheRelativeSelectorBaseVMAddress(dyldCache, rebased);
using dyld3::json::Node;
using dyld3::json::NodeValueType;
@@ -2091,21 +1006,24 @@
__block std::unordered_map<uint64_t, const char*> metaclassVMAddrToName;
dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)mh;
-
- __block objc_visitor::Visitor visitor(dyldCache, ma, VMAddress(sharedCacheRelativeSelectorBaseVMAddress));
-
- auto visitClass = ^(const objc_visitor::Class& objcClass, bool& stopClass) {
- VMAddress classVMAddr = objcClass.getVMAddress();
- VMAddress nameVMAddr = objcClass.getNameVMAddr(visitor);
- if ( auto className = getString(ma, nameVMAddr) ) {
- if ( objcClass.isMetaClass )
- metaclassVMAddrToName[classVMAddr.rawValue()] = className;
+ const uint32_t pointerSize = ma->pointerSize();
+
+ auto visitClass = ^(uint64_t classVMAddr,
+ uint64_t classSuperclassVMAddr, uint64_t classDataVMAddr,
+ const dyld3::MachOAnalyzer::ObjCClassInfo& objcClass, bool isMetaClass,
+ bool& stop) {
+ if (auto className = getString(ma, objcClass.nameVMAddr(pointerSize))) {
+ if (isMetaClass)
+ metaclassVMAddrToName[classVMAddr] = className;
else
- classVMAddrToName[classVMAddr.rawValue()] = className;
+ classVMAddrToName[classVMAddr] = className;
}
};
- visitor.forEachClassAndMetaClass(visitClass);
+ Diagnostics diag;
+
+ dyld3::MachOAnalyzer::VMAddrConverter vmAddrConverter = dyldCache->makeVMAddrConverter(rebased);
+ ma->forEachObjCClass(diag, vmAddrConverter, visitClass);
});
// These are used only for the on-disk binaries we analyze
@@ -2113,110 +1031,116 @@
__block std::unordered_map<uint64_t, const char*> onDiskClassVMAddrToName;
__block std::unordered_map<uint64_t, const char*> onDiskMetaclassVMAddrToName;
- auto getProperties = ^(const dyld3::MachOAnalyzer* ma, const objc_visitor::PropertyList& propertyList,
- objc_visitor::Visitor& visitor) {
- Node propertiesNode;
-
- for ( uint32_t i = 0, numProperties = propertyList.numProperties(); i != numProperties; ++i ) {
- objc_visitor::Property property = propertyList.getProperty(visitor, i);
-
+ auto getProperties = ^(const dyld3::MachOAnalyzer* ma, uint64_t propertiesVMAddr,
+ const dyld3::MachOAnalyzer::VMAddrConverter& vmAddrConverter) {
+ __block Node propertiesNode;
+ auto visitProperty = ^(uint64_t propertyVMAddr, const dyld3::MachOAnalyzer::ObjCProperty& property) {
// Get the name && attributes
- const char* propertyName = property.getName(visitor);
- const char* propertyAttributes = property.getAttributes(visitor);
+ auto propertyName = getString(ma, property.nameVMAddr);
+ auto propertyAttributes = getString(ma, property.attributesVMAddr);
+
+ if (!propertyName || !propertyAttributes)
+ return;
Node propertyNode;
propertyNode.map["name"] = Node{propertyName};
propertyNode.map["attributes"] = Node{propertyAttributes};
propertiesNode.array.push_back(propertyNode);
- }
-
+ };
+ ma->forEachObjCProperty(propertiesVMAddr, vmAddrConverter, visitProperty);
return propertiesNode.array.empty() ? std::optional<Node>() : propertiesNode;
};
- auto getClassProtocols = ^(const dyld3::MachOAnalyzer* ma, const objc_visitor::ProtocolList& protocolList,
- objc_visitor::Visitor& visitor) {
- Node protocolsNode;
-
- for ( uint64_t i = 0, numProtocols = protocolList.numProtocols(visitor); i != numProtocols; ++i ) {
- objc_visitor::Protocol protocol = protocolList.getProtocol(visitor, i);
-
- if ( const char *name = getString(ma, protocol.getNameVMAddr(visitor)) ) {
+ auto getClassProtocols = ^(const dyld3::MachOAnalyzer* ma, uint64_t protocolsVMAddr,
+ const dyld3::MachOAnalyzer::VMAddrConverter& vmAddrConverter) {
+ __block Node protocolsNode;
+
+ auto visitProtocol = ^(uint64_t protocolVMAddr, const dyld3::MachOAnalyzer::ObjCProtocol& protocol) {
+ if (const char *name = getString(ma, protocol.nameVMAddr)) {
protocolsNode.array.push_back(Node{name});
}
- }
+ };
+
+ ma->forEachObjCProtocol(protocolsVMAddr, vmAddrConverter, visitProtocol);
return protocolsNode.array.empty() ? std::optional<Node>() : protocolsNode;
};
auto getProtocols = ^(const dyld3::MachOAnalyzer* ma,
- objc_visitor::Visitor& visitor) {
- auto getMethods = ^(const dyld3::MachOAnalyzer* mh, objc_visitor::MethodList methodList,
- const std::string &prefix, Node &node){
- for ( uint32_t i = 0, numMethods = methodList.numMethods(); i != numMethods; ++i ) {
- objc_visitor::Method objcMethod = methodList.getMethod(visitor, i);
-
- if ( auto name = getString(mh, objcMethod.getNameVMAddr(visitor)) ) {
+ const dyld3::MachOAnalyzer::VMAddrConverter& vmAddrConverter) {
+ __block Node protocols;
+
+ auto getMethods = ^(const dyld3::MachOAnalyzer* mh, uint64_t methodListVMAddr, const std::string &prefix, Node &node){
+ auto visitMethod = ^(uint64_t methodVMAddr, const dyld3::MachOAnalyzer::ObjCMethod& method,
+ bool& stopMethod) {
+ if (auto name = getString(mh, method.nameVMAddr)) {
node.array.push_back(Node{prefix + name});
}
- }
+ };
+
+ ma->forEachObjCMethod(methodListVMAddr, vmAddrConverter, sharedCacheRelativeSelectorBaseVMAddress, visitMethod);
};
- __block Node protocolsNode;
- auto visitProtocol = ^(const objc_visitor::Protocol& objcProtocol, bool& stopProtocol) {
- const char* protoName = getString(ma, objcProtocol.getNameVMAddr(visitor));
- if ( !protoName )
+ auto visitProtocol = ^(uint64_t protoVMAddr,
+ const dyld3::MachOAnalyzer::ObjCProtocol& objcProto,
+ bool& stopProtocol) {
+ const char* protoName = getString(ma, objcProto.nameVMAddr);
+ if (!protoName)
return;
Node entry;
entry.map["protocolName"] = Node{protoName};
- objc_visitor::ProtocolList protocolList = objcProtocol.getProtocols(visitor);
- if ( uint64_t numProtocols = protocolList.numProtocols(visitor); numProtocols != 0 ) {
- Node visitedProtocols;
-
- for ( uint32_t i = 0; i != numProtocols; ++i ) {
- objc_visitor::Protocol innerProtocol = protocolList.getProtocol(visitor, i);
-
- if ( const char* name = getString(ma, innerProtocol.getNameVMAddr(visitor)) )
+ if ( objcProto.protocolsVMAddr != 0 ) {
+ __block Node visitedProtocols;
+
+ auto visitProtocolInner = ^(uint64_t protocolRefVMAddr, const dyld3::MachOAnalyzer::ObjCProtocol& protocol) {
+ if (auto name = getString(ma, protocol.nameVMAddr)) {
visitedProtocols.array.push_back(Node{name});
- }
-
+ }
+ };
+
+ ma->forEachObjCProtocol(objcProto.protocolsVMAddr, vmAddrConverter, visitProtocolInner);
if (!visitedProtocols.array.empty()) {
entry.map["protocols"] = visitedProtocols;
}
}
Node methods;
- getMethods(ma, objcProtocol.getInstanceMethods(visitor), instancePrefix, methods);
- getMethods(ma, objcProtocol.getClassMethods(visitor), classPrefix, methods);
+ getMethods(ma, objcProto.instanceMethodsVMAddr, instancePrefix, methods);
+ getMethods(ma, objcProto.classMethodsVMAddr, classPrefix, methods);
if (!methods.array.empty()) {
entry.map["methods"] = methods;
}
Node optMethods;
- getMethods(ma, objcProtocol.getOptionalInstanceMethods(visitor), instancePrefix, optMethods);
- getMethods(ma, objcProtocol.getOptionalClassMethods(visitor), classPrefix, optMethods);
+ getMethods(ma, objcProto.optionalInstanceMethodsVMAddr, instancePrefix, optMethods);
+ getMethods(ma, objcProto.optionalClassMethodsVMAddr, classPrefix, optMethods);
if (!optMethods.array.empty()) {
entry.map["optionalMethods"] = optMethods;
}
- protocolsNode.array.push_back(entry);
+ protocols.array.push_back(entry);
};
- visitor.forEachProtocol(visitProtocol);
-
- return protocolsNode.array.empty() ? std::optional<Node>() : protocolsNode;
+ Diagnostics diag;
+ ma->forEachObjCProtocol(diag, vmAddrConverter, visitProtocol);
+
+ return protocols.array.empty() ? std::optional<Node>() : protocols;
};
auto getSelRefs = ^(const dyld3::MachOAnalyzer* ma,
- objc_visitor::Visitor& visitor) {
+ const dyld3::MachOAnalyzer::VMAddrConverter& vmAddrConverter) {
__block std::vector<const char *> selNames;
- visitor.forEachSelectorReference(^(VMAddress selRefVMAddr, VMAddress selRefTargetVMAddr, const char *selectorString) {
- if ( auto selValue = getString(ma, selRefTargetVMAddr) ) {
+ auto visitSelRef = ^(uint64_t selRefVMAddr, uint64_t selRefTargetVMAddr, bool& stop) {
+ if (auto selValue = getString(ma, selRefTargetVMAddr)) {
selNames.push_back(selValue);
}
- });
+ };
+
+ Diagnostics diag;
+ ma->forEachObjCSelectorReference(diag, vmAddrConverter, visitSelRef);
std::sort(selNames.begin(), selNames.end(),
[](const char* a, const char* b) {
@@ -2232,9 +1156,9 @@
};
auto getClasses = ^(const dyld3::MachOAnalyzer* ma,
- objc_visitor::Visitor& visitor) {
+ const dyld3::MachOAnalyzer::VMAddrConverter& vmAddrConverter) {
+ Diagnostics diag;
const uint32_t pointerSize = ma->pointerSize();
- const uint16_t chainedPointerFormat = ma->hasChainedFixups() ? ma->chainedPointerFormat() : 0;
// Get the vmAddrs for all exported symbols as we want to know if classes
// are exported
@@ -2258,8 +1182,11 @@
__block Node classesNode;
__block bool skippedPreviousClass = false;
- auto visitClass = ^(const objc_visitor::Class& objcClass, bool& stopClass) {
- if ( objcClass.isMetaClass ) {
+ auto visitClass = ^(uint64_t classVMAddr,
+ uint64_t classSuperclassVMAddr, uint64_t classDataVMAddr,
+ const dyld3::MachOAnalyzer::ObjCClassInfo& objcClass, bool isMetaClass,
+ bool& stopClass) {
+ if (isMetaClass) {
if (skippedPreviousClass) {
// If the class was bad, then skip the meta class too
skippedPreviousClass = false;
@@ -2270,111 +1197,93 @@
}
std::string classType = "-";
- if ( objcClass.isMetaClass )
+ if (isMetaClass)
classType = "+";
-
- VMAddress classVMAddr = objcClass.getVMAddress();
- VMAddress nameVMAddr = objcClass.getNameVMAddr(visitor);
-
dyld3::MachOAnalyzer::PrintableStringResult classNameResult;
- const char* className = ma->getPrintableString(nameVMAddr.rawValue(), classNameResult);
- if ( classNameResult != dyld3::MachOAnalyzer::PrintableStringResult::CanPrint ) {
+ const char* className = ma->getPrintableString(objcClass.nameVMAddr(pointerSize), classNameResult);
+ if (classNameResult != dyld3::MachOAnalyzer::PrintableStringResult::CanPrint) {
return;
}
- __block const char* superClassName = nullptr;
+ const char* superClassName = nullptr;
if ( DyldSharedCache::inDyldCache(dyldCache, ma) ) {
- std::optional<VMAddress> superclassVMAddr = objcClass.getSuperclassVMAddr(visitor);
- if ( superclassVMAddr.has_value() ) {
- if ( objcClass.isMetaClass ) {
+ if ( objcClass.superclassVMAddr != 0 ) {
+ if (isMetaClass) {
// If we are root class, then our superclass should actually point to our own class
- if ( objcClass.isRootClass(visitor) ) {
- auto it = classVMAddrToName.find(superclassVMAddr.value().rawValue());
+ const uint32_t RO_ROOT = (1<<1);
+ if ( objcClass.flags(pointerSize) & RO_ROOT ) {
+ auto it = classVMAddrToName.find(objcClass.superclassVMAddr);
assert(it != classVMAddrToName.end());
superClassName = it->second;
} else {
- auto it = metaclassVMAddrToName.find(superclassVMAddr.value().rawValue());
+ auto it = metaclassVMAddrToName.find(objcClass.superclassVMAddr);
assert(it != metaclassVMAddrToName.end());
superClassName = it->second;
}
} else {
- auto it = classVMAddrToName.find(superclassVMAddr.value().rawValue());
+ auto it = classVMAddrToName.find(objcClass.superclassVMAddr);
assert(it != classVMAddrToName.end());
superClassName = it->second;
}
}
} else {
// On-disk binary. Lets crack the chain to work out what we are pointing at
- objcClass.withSuperclass(visitor, ^(const dyld3::MachOFile::ChainedFixupPointerOnDisk* fixup, uint16_t) {
- if ( (pointerSize == 8) && (fixup->raw64 == 0) )
- return;
- else if ( (pointerSize == 4) && (fixup->raw32 == 0) )
- return;
-
- uint32_t bindOrdinal;
- int64_t embeddedAddend;
- if ( fixup->isBind(chainedPointerFormat, bindOrdinal, embeddedAddend) ) {
- // Bind to another image. Use the bind table to work out which name to bind to
- const char* symbolName = onDiskChainedFixupBindTargets[(size_t)bindOrdinal];
- if ( objcClass.isMetaClass ) {
- if ( strstr(symbolName, "_OBJC_METACLASS_$_") == symbolName ) {
- superClassName = symbolName + strlen("_OBJC_METACLASS_$_");
- } else {
- // Swift classes don't start with these prefixes so just skip them
- if ( objcClass.isSwiftLegacy(visitor) || objcClass.isSwiftStable(visitor) )
- return;
- }
+ dyld3::MachOAnalyzer::ChainedFixupPointerOnDisk fixup;
+ if ( pointerSize == 8 )
+ fixup.raw64 = objcClass.superclassVMAddr;
+ else
+ fixup.raw32 = (uint32_t)objcClass.superclassVMAddr;
+ uint32_t bindOrdinal;
+ int64_t embeddedAddend;
+ if (fixup.isBind(vmAddrConverter.chainedPointerFormat, bindOrdinal, embeddedAddend)) {
+ // Bind to another image. Use the bind table to work out which name to bind to
+ const char* symbolName = onDiskChainedFixupBindTargets[(size_t)bindOrdinal];
+ if (isMetaClass) {
+ if ( strstr(symbolName, "_OBJC_METACLASS_$_") == symbolName ) {
+ superClassName = symbolName + strlen("_OBJC_METACLASS_$_");
} else {
- if ( strstr(symbolName, "_OBJC_CLASS_$_") == symbolName ) {
- superClassName = symbolName + strlen("_OBJC_CLASS_$_");
- } else {
- // Swift classes don't start with these prefixes so just skip them
- if ( objcClass.isSwiftLegacy(visitor) || objcClass.isSwiftStable(visitor) )
- return;
- }
+ // Swift classes don't start with these prefixes so just skip them
+ if (objcClass.isSwiftLegacy || objcClass.isSwiftStable)
+ return;
}
} else {
- // Rebase within this image.
- std::optional<VMAddress> superclassVMAddr = objcClass.getSuperclassVMAddr(visitor);
- if ( objcClass.isMetaClass ) {
- auto it = onDiskMetaclassVMAddrToName.find(superclassVMAddr.value().rawValue());
- assert(it != onDiskMetaclassVMAddrToName.end());
- superClassName = it->second;
+ if ( strstr(symbolName, "_OBJC_CLASS_$_") == symbolName ) {
+ superClassName = symbolName + strlen("_OBJC_CLASS_$_");
} else {
- auto it = onDiskClassVMAddrToName.find(superclassVMAddr.value().rawValue());
- assert(it != onDiskClassVMAddrToName.end());
- superClassName = it->second;
+ // Swift classes don't start with these prefixes so just skip them
+ if (objcClass.isSwiftLegacy || objcClass.isSwiftStable)
+ return;
}
}
- });
-
- if ( !superClassName ) {
- // Probably a swift class we want to skip
+ } else {
+ // Rebase within this image.
+ if (isMetaClass) {
+ auto it = onDiskMetaclassVMAddrToName.find(objcClass.superclassVMAddr);
+ assert(it != onDiskMetaclassVMAddrToName.end());
+ superClassName = it->second;
+ } else {
+ auto it = onDiskClassVMAddrToName.find(objcClass.superclassVMAddr);
+ assert(it != onDiskClassVMAddrToName.end());
+ superClassName = it->second;
+ }
+ }
+ }
+
+ // Print the methods on this class
+ __block Node methodsNode;
+ auto visitMethod = ^(uint64_t methodVMAddr, const dyld3::MachOAnalyzer::ObjCMethod& method, bool& stopMethod) {
+ dyld3::MachOAnalyzer::PrintableStringResult methodNameResult;
+ const char* methodName = ma->getPrintableString(method.nameVMAddr, methodNameResult);
+ if (methodNameResult != dyld3::MachOAnalyzer::PrintableStringResult::CanPrint)
return;
- }
- }
-
- // Print the methods on this class
- Node methodsNode;
-
- objc_visitor::MethodList objcMethodList = skipListsOfLists(objcClass.getBaseMethods(visitor), visitor);
-
- for ( uint32_t i = 0, numMethods = objcMethodList.numMethods(); i != numMethods; ++i ) {
- objc_visitor::Method objcMethod = objcMethodList.getMethod(visitor, i);
-
- dyld3::MachOAnalyzer::PrintableStringResult methodNameResult;
- const char* methodName = ma->getPrintableString(objcMethod.getNameVMAddr(visitor).rawValue(),
- methodNameResult);
- if (methodNameResult != dyld3::MachOAnalyzer::PrintableStringResult::CanPrint)
- continue;
-
methodsNode.array.push_back(Node{classType + methodName});
- }
-
- objc_visitor::PropertyList propertyList = skipListsOfLists(objcClass.getBaseProperties(visitor), visitor);
- std::optional<Node> properties = getProperties(ma, propertyList, visitor);
-
- if ( objcClass.isMetaClass ) {
+ };
+ ma->forEachObjCMethod(objcClass.baseMethodsVMAddr(pointerSize), vmAddrConverter,
+ sharedCacheRelativeSelectorBaseVMAddress, visitMethod);
+
+ std::optional<Node> properties = getProperties(ma, objcClass.basePropertiesVMAddr(pointerSize), vmAddrConverter);
+
+ if (isMetaClass) {
assert(!classesNode.array.empty());
Node& currentClassNode = classesNode.array.back();
assert(currentClassNode.map["className"].value == className);
@@ -2393,8 +1302,6 @@
return;
}
- objc_visitor::ProtocolList protocolList = skipListsOfLists(objcClass.getBaseProtocols(visitor), visitor);
-
Node currentClassNode;
currentClassNode.map["className"] = Node{className};
if ( superClassName != nullptr )
@@ -2403,10 +1310,10 @@
currentClassNode.map["methods"] = methodsNode;
if (properties.has_value())
currentClassNode.map["properties"] = properties.value();
- if (std::optional<Node> protocols = getClassProtocols(ma, protocolList, visitor))
+ if (std::optional<Node> protocols = getClassProtocols(ma, objcClass.baseProtocolsVMAddr(pointerSize), vmAddrConverter))
currentClassNode.map["protocols"] = protocols.value();
- currentClassNode.map["exported"] = Node{exportedSymbolVMAddrs.count(classVMAddr.rawValue()) != 0};
+ currentClassNode.map["exported"] = Node{exportedSymbolVMAddrs.count(classVMAddr) != 0};
// We didn't skip this class so mark it as such
skippedPreviousClass = false;
@@ -2414,37 +1321,32 @@
classesNode.array.push_back(currentClassNode);
};
- visitor.forEachClassAndMetaClass(visitClass);
-
+ ma->forEachObjCClass(diag, vmAddrConverter, visitClass);
return classesNode.array.empty() ? std::optional<Node>() : classesNode;
};
auto getCategories = ^(const dyld3::MachOAnalyzer* ma,
- objc_visitor::Visitor& visitor) {
+ const dyld3::MachOAnalyzer::VMAddrConverter& vmAddrConverter) {
+ Diagnostics diag;
+
const uint32_t pointerSize = ma->pointerSize();
- const uint16_t chainedPointerFormat = ma->hasChainedFixups() ? ma->chainedPointerFormat() : 0;
__block Node categoriesNode;
- auto visitCategory = ^(const objc_visitor::Category& objcCategory, bool& stopCategory) {
- VMAddress nameVMAddr = objcCategory.getNameVMAddr(visitor);
-
+ auto visitCategory = ^(uint64_t categoryVMAddr,
+ const dyld3::MachOAnalyzer::ObjCCategory& objcCategory,
+ bool& stopCategory) {
dyld3::MachOAnalyzer::PrintableStringResult categoryNameResult;
- const char* categoryName = ma->getPrintableString(nameVMAddr.rawValue(), categoryNameResult);
+ const char* categoryName = ma->getPrintableString(objcCategory.nameVMAddr, categoryNameResult);
if (categoryNameResult != dyld3::MachOAnalyzer::PrintableStringResult::CanPrint)
return;
- __block const char* className = nullptr;
- if ( DyldSharedCache::inDyldCache(dyldCache, ma) ) {
- // The class might be missing if the target is not in the shared cache. So just skip these ones
- std::optional<VMAddress> clsVMAddr = objcCategory.getClassVMAddr(visitor);
- if ( !clsVMAddr.has_value() )
- return;
-
- if ( objcCategory.isForSwiftStubClass() ) {
- // We don't have a class for stub classes, so just use a marker
- className = "unknown swift stub class";
- } else {
- auto it = classVMAddrToName.find(clsVMAddr.value().rawValue());
+ const char* className = nullptr;
+ if ( DyldSharedCache::inDyldCache(dyldCache, ma) ) {
+ // The class might be missing if the target is not in the shared cache. So just skip these ones
+ if ( objcCategory.clsVMAddr == 0 )
+ return;
+
+ auto it = classVMAddrToName.find(objcCategory.clsVMAddr);
if (it == classVMAddrToName.end()) {
// This is an odd binary with perhaps a Swift class. Just skip this entry
// Specifically, categories can be attached to "stub classes" which are not in the
@@ -2453,19 +1355,17 @@
return;
}
className = it->second;
- }
- } else {
- // On-disk binary. Lets crack the chain to work out what we are pointing at
- objcCategory.withClass(visitor,
- ^(const dyld3::MachOFile::ChainedFixupPointerOnDisk* fixup, uint16_t) {
- if ( (pointerSize == 8) && (fixup->raw64 == 0) )
- return;
- else if ( (pointerSize == 4) && (fixup->raw32 == 0) )
- return;
-
+ } else {
+ // On-disk binary. Lets crack the chain to work out what we are pointing at
+ dyld3::MachOAnalyzer::ChainedFixupPointerOnDisk fixup;
+ fixup.raw64 = objcCategory.clsVMAddr;
+ if ( pointerSize == 8 )
+ fixup.raw64 = objcCategory.clsVMAddr;
+ else
+ fixup.raw32 = (uint32_t)objcCategory.clsVMAddr;
uint32_t bindOrdinal;
int64_t embeddedAddend;
- if ( fixup->isBind(chainedPointerFormat, bindOrdinal, embeddedAddend) ) {
+ if (fixup.isBind(vmAddrConverter.chainedPointerFormat, bindOrdinal, embeddedAddend)) {
// Bind to another image. Use the bind table to work out which name to bind to
const char* symbolName = onDiskChainedFixupBindTargets[(size_t)bindOrdinal];
if ( strstr(symbolName, "_OBJC_CLASS_$_") == symbolName ) {
@@ -2476,59 +1376,47 @@
return;
}
} else {
- std::optional<VMAddress> clsVMAddr = objcCategory.getClassVMAddr(visitor);
- auto it = onDiskClassVMAddrToName.find(clsVMAddr.value().rawValue());
+ auto it = onDiskClassVMAddrToName.find(objcCategory.clsVMAddr);
if (it == onDiskClassVMAddrToName.end()) {
// This is an odd binary with perhaps a Swift class. Just skip this entry
return;
}
className = it->second;
}
- });
-
- if ( !className ) {
- // Probably a swift class we want to skip
- return;
- }
- }
+ }
// Print the instance methods on this category
__block Node methodsNode;
- {
- objc_visitor::MethodList objcMethodList = objcCategory.getInstanceMethods(visitor);
- for ( uint32_t i = 0, numMethods = objcMethodList.numMethods(); i != numMethods; ++i ) {
- objc_visitor::Method objcMethod = objcMethodList.getMethod(visitor, i);
-
- if ( auto methodName = getString(ma, objcMethod.getNameVMAddr(visitor)) )
- methodsNode.array.push_back(Node{instancePrefix + methodName});
- }
- }
-
- // Print the class methods on this category
- {
- objc_visitor::MethodList objcMethodList = objcCategory.getClassMethods(visitor);
- for ( uint32_t i = 0, numMethods = objcMethodList.numMethods(); i != numMethods; ++i ) {
- objc_visitor::Method objcMethod = objcMethodList.getMethod(visitor, i);
-
- if ( auto methodName = getString(ma, objcMethod.getNameVMAddr(visitor)) )
- methodsNode.array.push_back(Node{classPrefix + methodName});
- }
- }
+ auto visitInstanceMethod = ^(uint64_t methodVMAddr, const dyld3::MachOAnalyzer::ObjCMethod& method, bool& stopMethod) {
+ if (auto methodName = getString(ma, method.nameVMAddr))
+ methodsNode.array.push_back(Node{instancePrefix + methodName});
+ };
+ ma->forEachObjCMethod(objcCategory.instanceMethodsVMAddr, vmAddrConverter,
+ sharedCacheRelativeSelectorBaseVMAddress, visitInstanceMethod);
+
+ // Print the instance methods on this category
+ __block Node classMethodsNode;
+ auto visitClassMethod = ^(uint64_t methodVMAddr, const dyld3::MachOAnalyzer::ObjCMethod& method, bool& stopMethod) {
+ if (auto methodName = getString(ma, method.nameVMAddr))
+ methodsNode.array.push_back(Node{classPrefix + methodName});
+ };
+ ma->forEachObjCMethod(objcCategory.classMethodsVMAddr, vmAddrConverter,
+ sharedCacheRelativeSelectorBaseVMAddress, visitClassMethod);
Node currentCategoryNode;
currentCategoryNode.map["categoryName"] = Node{categoryName};
currentCategoryNode.map["className"] = Node{className};
if (!methodsNode.array.empty())
currentCategoryNode.map["methods"] = methodsNode;
- if (std::optional<Node> properties = getProperties(ma, objcCategory.getInstanceProperties(visitor), visitor))
+ if (std::optional<Node> properties = getProperties(ma, objcCategory.instancePropertiesVMAddr, vmAddrConverter))
currentCategoryNode.map["properties"] = properties.value();
- if (std::optional<Node> protocols = getClassProtocols(ma, objcCategory.getProtocols(visitor), visitor))
+ if (std::optional<Node> protocols = getClassProtocols(ma, objcCategory.protocolsVMAddr, vmAddrConverter))
currentCategoryNode.map["protocols"] = protocols.value();
categoriesNode.array.push_back(currentCategoryNode);
};
- visitor.forEachCategory(visitCategory);
+ ma->forEachObjCCategory(diag, vmAddrConverter, visitCategory);
return categoriesNode.array.empty() ? std::optional<Node>() : categoriesNode;
};
@@ -2537,17 +1425,16 @@
dyld3::json::streamArrayBegin(needsComma);
dyldCache->forEachImage(^(const mach_header *mh, const char *installName) {
+ dyld3::MachOAnalyzer::VMAddrConverter vmAddrConverter = dyldCache->makeVMAddrConverter(rebased);
const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)mh;
-
- objc_visitor::Visitor visitor(dyldCache, ma, VMAddress(sharedCacheRelativeSelectorBaseVMAddress));
Node imageRecord;
imageRecord.map["imagePath"] = Node{installName};
imageRecord.map["imageType"] = Node{"cache-dylib"};
- std::optional<Node> classes = getClasses(ma, visitor);
- std::optional<Node> categories = getCategories(ma, visitor);
- std::optional<Node> protocols = getProtocols(ma, visitor);
- std::optional<Node> selrefs = getSelRefs(ma, visitor);
+ std::optional<Node> classes = getClasses(ma, vmAddrConverter);
+ std::optional<Node> categories = getCategories(ma, vmAddrConverter);
+ std::optional<Node> protocols = getProtocols(ma, vmAddrConverter);
+ std::optional<Node> selrefs = getSelRefs(ma, vmAddrConverter);
// Skip emitting images with no objc data
if (!classes.has_value() && !categories.has_value() && !protocols.has_value() && !selrefs.has_value())
@@ -2582,35 +1469,22 @@
}
KernelArgs kernArgs(mainMA, {"test.exe"}, {}, {});
- Allocator& alloc = Allocator::defaultAllocator();
SyscallDelegate osDelegate;
osDelegate._dyldCache = dyldCache;
osDelegate._rootPath = options.rootPath;
- __block ProcessConfig config(&kernArgs, osDelegate, alloc);
- RuntimeLocks locks;
- RuntimeState stateObject(config, locks, alloc);
- RuntimeState& state = stateObject;
+
+ __block ProcessConfig config(&kernArgs, osDelegate);
+ RuntimeState stateObject(config);
+ RuntimeState& state = stateObject;
config.dyldCache.addr->forEachLaunchLoaderSet(^(const char* executableRuntimePath, const PrebuiltLoaderSet* pbls) {
__block Diagnostics diag;
bool checkIfOSBinary = state.config.process.archs->checksOSBinary();
state.config.syscall.withReadOnlyMappedFile(diag, executableRuntimePath, checkIfOSBinary, ^(const void* mapping, size_t mappedSize, bool isOSBinary, const FileID& fileID, const char* canonicalPath) {
- uint64_t sliceSize;
- if ( const dyld3::MachOFile* mf = dyld3::MachOFile::compatibleSlice(diag, sliceSize, mapping, mappedSize, executableRuntimePath, state.config.process.platform, isOSBinary, *state.config.process.archs) ) {
- dyld3::closure::FileSystemPhysical fileSystem;
- dyld3::closure::LoadedFileInfo fileInfo = {
- .fileContent = (void*)mf,
- .fileContentLen = sliceSize,
- .sliceOffset = 0,
- .sliceLen = sliceSize,
- .isOSBinary = false,
- .inode = 0,
- .mtime = 0,
- .unload = nullptr,
- .path = executableRuntimePath
- };
- const dyld3::MachOAnalyzer* ma = ((const dyld3::MachOAnalyzer*)mf)->remapIfZeroFill(diag, fileSystem, fileInfo);
+ if ( const dyld3::MachOFile* mf = dyld3::MachOFile::compatibleSlice(diag, mapping, mappedSize, executableRuntimePath, state.config.process.platform, isOSBinary, *state.config.process.archs) ) {
+ const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)mf;
+ uint32_t pointerSize = ma->pointerSize();
// Populate the bind targets for classes from other images
onDiskChainedFixupBindTargets.clear();
@@ -2623,29 +1497,30 @@
// Populate the rebase targets for class names
onDiskMetaclassVMAddrToName.clear();
onDiskClassVMAddrToName.clear();
-
- __block objc_visitor::Visitor visitor(dyldCache, ma, std::nullopt);
-
- auto visitClass = ^(const objc_visitor::Class& objcClass, bool& stopClass) {
- VMAddress classVMAddr = objcClass.getVMAddress();
- VMAddress nameVMAddr = objcClass.getNameVMAddr(visitor);
- if ( auto className = getString(ma, nameVMAddr) ) {
- if ( objcClass.isMetaClass )
- onDiskMetaclassVMAddrToName[classVMAddr.rawValue()] = className;
+ auto visitClass = ^(uint64_t classVMAddr,
+ uint64_t classSuperclassVMAddr, uint64_t classDataVMAddr,
+ const dyld3::MachOAnalyzer::ObjCClassInfo& objcClass, bool isMetaClass,
+ bool& stopClass) {
+ if (auto className = getString(ma, objcClass.nameVMAddr(pointerSize))) {
+ if (isMetaClass)
+ onDiskMetaclassVMAddrToName[classVMAddr] = className;
else
- onDiskClassVMAddrToName[classVMAddr.rawValue()] = className;
+ onDiskClassVMAddrToName[classVMAddr] = className;
}
};
- visitor.forEachClassAndMetaClass(visitClass);
+ // Get a vmAddrConverter for this on-disk binary. We can't use the shared cache one
+ dyld3::MachOAnalyzer::VMAddrConverter onDiskVMAddrConverter = ma->makeVMAddrConverter(rebased);
+
+ ma->forEachObjCClass(diag, onDiskVMAddrConverter, visitClass);
Node imageRecord;
imageRecord.map["imagePath"] = Node{executableRuntimePath};
imageRecord.map["imageType"] = Node{"executable"};
- std::optional<Node> classes = getClasses(ma, visitor);
- std::optional<Node> categories = getCategories(ma, visitor);
+ std::optional<Node> classes = getClasses(ma, onDiskVMAddrConverter);
+ std::optional<Node> categories = getCategories(ma, onDiskVMAddrConverter);
// TODO: protocols
- std::optional<Node> selrefs = getSelRefs(ma, visitor);
+ std::optional<Node> selrefs = getSelRefs(ma, onDiskVMAddrConverter);
// Skip emitting images with no objc data
if (!classes.has_value() && !categories.has_value() && !selrefs.has_value())
@@ -2664,18 +1539,12 @@
dyld3::json::streamArrayEnd(needsComma);
}
- else if ( options.mode == modeObjCClassLayout ) {
- dumpObjCClassLayout(dyldCache);
- }
- else if ( options.mode == modeObjCClassMethodLists ) {
- dumpObjCClassMethodLists(dyldCache);
- }
else if ( options.mode == modeObjCSelectors ) {
- if ( !dyldCache->hasOptimizedObjC() ) {
+ if ( dyldCache->objcOpt() == nullptr ) {
fprintf(stderr, "Error: could not get optimized objc\n");
return 1;
}
- const objc::SelectorHashTable* selectors = dyldCache->objcSelectorHashTable();
+ const objc::SelectorHashTable* selectors = dyldCache->objcOpt()->selectorOpt();
if ( selectors == nullptr ) {
fprintf(stderr, "Error: could not get optimized objc selectors\n");
return 1;
@@ -2820,7 +1689,7 @@
return 0;
}
printf("Swift optimization version: %d\n", swiftOptHeader->version);
- if ( swiftOptHeader->version == 1 || swiftOptHeader->version == 2 ) {
+ if ( swiftOptHeader->version == 1 ) {
printf("Type hash table\n");
const SwiftHashTable* typeHashTable = (const SwiftHashTable*)((uint8_t*)dyldCache + swiftOptHeader->typeConformanceHashTableCacheOffset);
typeHashTable->forEachValue(^(uint32_t bucketIndex, const dyld3::Array<SwiftTypeProtocolConformanceLocation>& impls) {
@@ -2973,9 +1842,6 @@
conformance.data(), protoLoc.protocolConformanceCacheOffset, conformanceDylib.data());
}
});
-
- if ( swiftOptHeader->version >= 2 )
- printf("Swift prespecialization data offset: 0x%llx\n", swiftOptHeader->prespecializationDataCacheOffset);
} else {
printf("Unhandled version\n");
}
@@ -2996,16 +1862,11 @@
// Get the base pointers from the magic section in objc
__block uint64_t objcCacheOffsetsSize = 0;
__block const void* objcCacheOffsets = nullptr;
- __block int impCachesVersion = 1;
__block Diagnostics diag;
dyldCache->forEachImage(^(const mach_header* mh, const char* installName) {
if ( !strcmp(installName, "/usr/lib/libobjc.A.dylib") ) {
const dyld3::MachOAnalyzer* ma = (const dyld3::MachOAnalyzer*)mh;
objcCacheOffsets = ma->findSectionContent("__DATA_CONST", "__objc_scoffs", objcCacheOffsetsSize);
- dyld3::MachOAnalyzer::FoundSymbol foundInfo;
- if (ma->findExportedSymbol(diag, "_objc_opt_preopt_caches_version", false, foundInfo, nullptr)) {
- impCachesVersion = *(int*)((uint8_t*)ma + foundInfo.value);
- }
}
});
@@ -3021,11 +1882,8 @@
dyld3::MachOAnalyzer::VMAddrConverter vmAddrConverter = dyldCache->makeVMAddrConverter(contentRebased);
- uint8_t selectorStringIndex = 0;
- if (impCachesVersion > 1)
- selectorStringIndex = 1;
- uint64_t selectorStringVMAddrStart = vmAddrConverter.convertToVMAddr(((uint64_t*)objcCacheOffsets)[selectorStringIndex]);
- uint64_t selectorStringVMAddrEnd = vmAddrConverter.convertToVMAddr(((uint64_t*)objcCacheOffsets)[selectorStringIndex+1]);
+ uint64_t selectorStringVMAddrStart = vmAddrConverter.convertToVMAddr(((uint64_t*)objcCacheOffsets)[0]);
+ uint64_t selectorStringVMAddrEnd = vmAddrConverter.convertToVMAddr(((uint64_t*)objcCacheOffsets)[1]);
uint64_t sharedCacheRelativeSelectorBaseVMAddress = dyldCache->sharedCacheRelativeSelectorBaseVMAddress();
@@ -3098,50 +1956,37 @@
return;
}
- const uint8_t* impCacheBuffer = (const uint8_t*)(objcClass.methodCacheVMAddr + slide);
- uint32_t cacheMask = 0;
- uint32_t sizeOfHeader = 0;
- if (impCachesVersion < 3) {
- const ImpCacheHeader_v1* impCache = (const ImpCacheHeader_v1*)impCacheBuffer;
- printf("%s (%s): %d buckets\n", className, type, impCache->cache_mask + 1);
- if ((classVMAddr + impCache->fallback_class_offset) != objcClass.superclassVMAddr)
- printf("Flattening fallback: %s\n", classVMAddrToNameMap[classVMAddr + impCache->fallback_class_offset]);
- cacheMask = impCache->cache_mask;
- sizeOfHeader = sizeof(ImpCacheHeader_v1);
- } else {
- const ImpCacheHeader_v2* impCache = (const ImpCacheHeader_v2*)impCacheBuffer;
- printf("%s (%s): %d buckets\n", className, type, impCache->cache_mask + 1);
- if ((classVMAddr + impCache->fallback_class_offset) != objcClass.superclassVMAddr)
- printf("Flattening fallback: %s\n", classVMAddrToNameMap[classVMAddr + impCache->fallback_class_offset]);
- cacheMask = impCache->cache_mask;
- sizeOfHeader = sizeof(ImpCacheHeader_v2);
- }
-
- const uint8_t* buckets = impCacheBuffer + sizeOfHeader;
+ struct Bucket {
+ uint32_t selOffset;
+ uint32_t impOffset;
+ };
+ struct ImpCache {
+ int32_t fallback_class_offset;
+ uint32_t cache_shift : 5;
+ uint32_t cache_mask : 11;
+ uint32_t occupied : 14;
+ uint32_t has_inlines : 1;
+ uint32_t bit_one : 1;
+ struct Bucket buckets[];
+ };
+
+ const ImpCache* impCache = (const ImpCache*)(objcClass.methodCacheVMAddr + slide);
+ printf("%s (%s): %d buckets\n", className, type, impCache->cache_mask + 1);
+
+ if ((classVMAddr + impCache->fallback_class_offset) != objcClass.superclassVMAddr) {
+ printf("Flattening fallback: %s\n", classVMAddrToNameMap[classVMAddr + impCache->fallback_class_offset]);
+ }
// Buckets are a 32-bit offset from the impcache itself
- for (uint32_t i = 0; i <= cacheMask ; ++i) {
- uint64_t sel = 0;
- uint64_t imp = 0;
- bool empty = false;
- if (impCachesVersion == 1) {
- const ImpCacheEntry_v1* bucket = (ImpCacheEntry_v1*)buckets + i;
- sel = selectorStringVMAddrStart + bucket->selOffset;
- imp = classVMAddr - bucket->impOffset;
- if (bucket->selOffset == 0xFFFFFFF && bucket->impOffset == 0)
- empty = true;
- } else {
- const ImpCacheEntry_v2* bucket = (ImpCacheEntry_v2*)buckets + i;
- sel = selectorStringVMAddrStart + bucket->selOffset;
- imp = classVMAddr - (bucket->impOffset << 2);
- if (bucket->selOffset == 0x3FFFFFF && bucket->impOffset == 0)
- empty = true;
- }
-
- if ( empty ) {
+ for (uint32_t i = 0; i <= impCache->cache_mask ; ++i) {
+ const Bucket& b = impCache->buckets[i];
+ uint64_t sel = (uint64_t)b.selOffset + selectorStringVMAddrStart;
+ uint64_t imp = classVMAddr - (uint64_t)b.impOffset;
+ if (b.selOffset == 0xFFFFFFFF) {
// Empty bucket
printf(" - 0x%016llx: %s\n", 0ULL, "");
} else {
assert(sel < selectorStringVMAddrEnd);
+
auto it = methodToClassMap.find(imp);
if (it == methodToClassMap.end()) {
fprintf(stderr, "Could not find IMP %llx (for %s)\n", imp, (const char*)(sel + slide));
@@ -3156,15 +2001,9 @@
} else {
switch ( options.mode ) {
case modeList: {
- if ( options.printInodes && !dyldCache->header.dylibsExpectedOnDisk ) {
- fprintf(stderr, "Error: '-inode' option only valid on simulator shared caches\n");
- return 1;
- }
// list all dylibs, including their aliases (symlinks to them) with option vmaddr
__block std::vector<std::unordered_set<std::string>> indexToPaths;
__block std::vector<uint64_t> indexToAddr;
- __block std::unordered_map<uint64_t, uint64_t> indexToINode;
- __block std::unordered_map<uint64_t, uint64_t> indexToModTime;
__block std::vector<std::string> indexToUUID;
dyldCache->forEachImageTextSegment(^(uint64_t loadAddressUnslid, uint64_t textSegmentSize, const unsigned char* dylibUUID, const char* installName, bool& stop) {
std::unordered_set<std::string> empty;
@@ -3180,12 +2019,6 @@
});
dyldCache->forEachDylibPath(^(const char* dylibPath, uint32_t index) {
indexToPaths[index].insert(dylibPath);
-
- uint64_t mTime = ~0ULL;
- uint64_t inode = ~0ULL;
- dyldCache->getIndexedImageEntry(index, mTime, inode);
- indexToINode[index] = inode;
- indexToModTime[index] = mTime;
});
int index = 0;
for (const std::unordered_set<std::string>& paths : indexToPaths) {
@@ -3194,8 +2027,6 @@
printf("0x%08llX ", indexToAddr[index]);
if ( options.printUUIDs )
printf("<%s> ", indexToUUID[index].c_str());
- if ( options.printInodes )
- printf("0x%08llX 0x%08llX ", indexToINode[index], indexToModTime[index]);
printf("%s\n", path.c_str());
}
++index;
@@ -3325,28 +2156,28 @@
//printf("export_off=0x%X\n", leInfo.dyldInfo->export_off());
uint32_t exportPageOffsetStart = leInfo.dyldInfo->export_off & (-4096);
uint32_t exportPageOffsetEnd = (leInfo.dyldInfo->export_off + leInfo.dyldInfo->export_size) & (-4096);
- snprintf(message, sizeof(message), "exports from %s", shortName);
+ sprintf(message, "exports from %s", shortName);
add_linkedit(exportPageOffsetStart, exportPageOffsetEnd, message);
}
// add binding info
if ( leInfo.dyldInfo->bind_size != 0 ) {
uint32_t bindPageOffsetStart = leInfo.dyldInfo->bind_off & (-4096);
uint32_t bindPageOffsetEnd = (leInfo.dyldInfo->bind_off + leInfo.dyldInfo->bind_size) & (-4096);
- snprintf(message, sizeof(message), "bindings from %s", shortName);
+ sprintf(message, "bindings from %s", shortName);
add_linkedit(bindPageOffsetStart, bindPageOffsetEnd, message);
}
// add lazy binding info
if ( leInfo.dyldInfo->lazy_bind_size != 0 ) {
uint32_t lazybindPageOffsetStart = leInfo.dyldInfo->lazy_bind_off & (-4096);
uint32_t lazybindPageOffsetEnd = (leInfo.dyldInfo->lazy_bind_off + leInfo.dyldInfo->lazy_bind_size) & (-4096);
- snprintf(message, sizeof(message), "lazy bindings from %s", shortName);
+ sprintf(message, "lazy bindings from %s", shortName);
add_linkedit(lazybindPageOffsetStart, lazybindPageOffsetEnd, message);
}
// add weak binding info
if ( leInfo.dyldInfo->weak_bind_size != 0 ) {
uint32_t weakbindPageOffsetStart = leInfo.dyldInfo->weak_bind_off & (-4096);
uint32_t weakbindPageOffsetEnd = (leInfo.dyldInfo->weak_bind_off + leInfo.dyldInfo->weak_bind_size) & (-4096);
- snprintf(message, sizeof(message), "weak bindings from %s", shortName);
+ sprintf(message, "weak bindings from %s", shortName);
add_linkedit(weakbindPageOffsetStart, weakbindPageOffsetEnd, message);
}
} else {
@@ -3355,7 +2186,7 @@
//printf("export_off=0x%X\n", leInfo.exportsTrie->export_off());
uint32_t exportPageOffsetStart = leInfo.exportsTrie->dataoff & (-4096);
uint32_t exportPageOffsetEnd = (leInfo.exportsTrie->dataoff + leInfo.exportsTrie->datasize) & (-4096);
- snprintf(message, sizeof(message), "exports from %s", shortName);
+ sprintf(message, "exports from %s", shortName);
add_linkedit(exportPageOffsetStart, exportPageOffsetEnd, message);
}
// Chained fixups are stripped from cache binaries, so no need to check for them here
@@ -3391,8 +2222,6 @@
break;
}
case modePatchTable: {
- printf("Patch table size: %lld bytes\n", dyldCache->header.patchInfoSize);
-
std::vector<SegmentInfo> segInfos;
buildSegmentInfo(dyldCache, segInfos);
__block uint32_t imageIndex = 0;
@@ -3400,15 +2229,12 @@
printf("%s:\n", installName);
uint64_t cacheBaseAddress = dyldCache->unslidLoadAddress();
uint64_t dylibBaseAddress = ((dyld3::MachOAnalyzer*)mh)->preferredLoadAddress();
- dyldCache->forEachPatchableExport(imageIndex, ^(uint32_t dylibVMOffsetOfImpl, const char* exportName,
- PatchKind patchKind) {
+ dyldCache->forEachPatchableExport(imageIndex, ^(uint32_t dylibVMOffsetOfImpl, const char* exportName) {
uint64_t cacheOffsetOfImpl = (dylibBaseAddress + dylibVMOffsetOfImpl) - cacheBaseAddress;
- printf(" export: 0x%08llX%s %s\n", cacheOffsetOfImpl,
- PatchTable::patchKindName(patchKind), exportName);
+ printf(" export: 0x%08llX %s\n", cacheOffsetOfImpl, exportName);
dyldCache->forEachPatchableUseOfExport(imageIndex, dylibVMOffsetOfImpl,
^(uint32_t userImageIndex, uint32_t userVMOffset,
- dyld3::MachOLoaded::PointerMetaData pmd, uint64_t addend,
- bool isWeakImport) {
+ dyld3::MachOLoaded::PointerMetaData pmd, uint64_t addend) {
// Get the image so that we can convert from dylib offset to cache offset
uint64_t mTime;
uint64_t inode;
@@ -3423,588 +2249,25 @@
// Verify that findImage and the callback image match
std::string_view userInstallName = imageMA->installName();
-
- // FIXME: We can't get this from MachoLoaded without having a fixup location to call
- static const char* keyNames[] = {
- "IA", "IB", "DA", "DB"
- };
-
- uint64_t sectionOffset = patchLocVmAddr-usageAt.vmAddr;
-
- const char* weakImportString = isWeakImport ? " (weak-import)" : "";
-
- if ( addend == 0 ) {
- if ( pmd.authenticated ) {
- printf(" used by: %s(0x%04llX)%s (PAC: div=%d, addr=%s, key=%s) in %s\n",
- usageAt.segName, sectionOffset, weakImportString,
- pmd.diversity, pmd.usesAddrDiversity ? "true" : "false", keyNames[pmd.key],
- userInstallName.data());
- } else {
- printf(" used by: %s(0x%04llX)%s in %s\n", usageAt.segName, sectionOffset, weakImportString, userInstallName.data());
- }
- } else {
- if ( pmd.authenticated ) {
- printf(" used by: %s(0x%04llX)%s (addend=%lld) (PAC: div=%d, addr=%s, key=%s) in %s\n",
- usageAt.segName, sectionOffset, weakImportString, addend,
- pmd.diversity, pmd.usesAddrDiversity ? "true" : "false", keyNames[pmd.key],
- userInstallName.data());
- } else {
- printf(" used by: %s(0x%04llX)%s (addend=%lld) in %s\n", usageAt.segName, sectionOffset, weakImportString,
- addend, userInstallName.data());
- }
- }
- });
-
- // Print GOT uses
- dyldCache->forEachPatchableGOTUseOfExport(imageIndex, dylibVMOffsetOfImpl,
- ^(uint64_t cacheVMOffset,
- dyld3::MachOLoaded::PointerMetaData pmd, uint64_t addend,
- bool isWeakImport) {
-
- // FIXME: We can't get this from MachoLoaded without having a fixup location to call
- static const char* keyNames[] = {
- "IA", "IB", "DA", "DB"
- };
-
- const char* weakImportString = isWeakImport ? " (weak-import)" : "";
- if ( addend == 0 ) {
- if ( pmd.authenticated ) {
- printf(" used by: GOT%s (PAC: div=%d, addr=%s, key=%s)\n",
- weakImportString, pmd.diversity, pmd.usesAddrDiversity ? "true" : "false", keyNames[pmd.key]);
- } else {
- printf(" used by: GOT%s\n", weakImportString);
- }
- } else {
- if ( pmd.authenticated ) {
- printf(" used by: GOT%s (addend=%lld) (PAC: div=%d, addr=%s, key=%s)\n",
- weakImportString, addend, pmd.diversity, pmd.usesAddrDiversity ? "true" : "false", keyNames[pmd.key]);
- } else {
- printf(" used by: GOT%s (addend=%lld)\n", weakImportString, addend);
- }
- }
+ assert(userInstallName == usageAt.installName);
+
+ if ( addend == 0 )
+ printf(" used by: %s+0x%04llX in %s\n", usageAt.segName, patchLocVmAddr-usageAt.vmAddr, usageAt.installName);
+ else
+ printf(" used by: %s+0x%04llX (addend=%lld) in %s\n", usageAt.segName, patchLocVmAddr-usageAt.vmAddr, addend, usageAt.installName);
});
});
++imageIndex;
});
break;
}
- case modeRootsCost: {
- std::vector<SegmentInfo> segInfos;
- buildSegmentInfo(dyldCache, segInfos);
-
- __block std::optional<uint32_t> rootImageIndex;
- {
- __block uint32_t imageIndex = 0;
- dyldCache->forEachImage(^(const mach_header* mh, const char* installName) {
- if ( strcmp(installName, options.rootsCostOfDylib) == 0 )
- rootImageIndex = imageIndex;
- ++imageIndex;
- });
- }
-
- if ( !rootImageIndex.has_value() ) {
- fprintf(stderr, "Could not find image '%s' in shared cache\n", options.rootsCostOfDylib);
- return 1;
- }
-
- // For each page of the cache, we record if it was dirtied by patching, and by which dylibs
- typedef std::pair<const char*, const char*> InstallNameAndSegment;
- __block std::map<uint64_t, std::set<InstallNameAndSegment>> pages;
-
- uint64_t cacheBaseAddress = dyldCache->unslidLoadAddress();
- dyldCache->forEachPatchableExport(rootImageIndex.value(),
- ^(uint32_t dylibVMOffsetOfImpl, const char* exportName,
- PatchKind patchKind) {
- if ( (patchKind == PatchKind::cfObj2) || (patchKind == PatchKind::objcClass) )
- return;
- dyldCache->forEachPatchableUseOfExport(rootImageIndex.value(), dylibVMOffsetOfImpl,
- ^(uint32_t userImageIndex, uint32_t userVMOffset,
- dyld3::MachOLoaded::PointerMetaData pmd, uint64_t addend,
- bool isWeakImport) {
- // Get the image so that we can convert from dylib offset to cache offset
- uint64_t mTime;
- uint64_t inode;
- const dyld3::MachOAnalyzer* imageMA = (dyld3::MachOAnalyzer*)(dyldCache->getIndexedImageEntry(userImageIndex, mTime, inode));
- if ( imageMA == nullptr )
- return;
-
- SegmentInfo usageAt;
- const uint64_t patchLocVmAddr = imageMA->preferredLoadAddress() + userVMOffset;
- const uint64_t patchLocCacheOffset = patchLocVmAddr - cacheBaseAddress;
- findImageAndSegment(dyldCache, segInfos, patchLocCacheOffset, &usageAt);
-
- // Round to the 16KB page we dirty
- //clientUsedPages[userImageIndex].insert(usageAt.vmAddr & ~0x3FFF);
- uint64_t pageAddr = usageAt.vmAddr & ~0x3FFF;
- pages[pageAddr].insert({ usageAt.installName, usageAt.segName });
- });
-
- // Print GOT uses
- dyldCache->forEachPatchableGOTUseOfExport(rootImageIndex.value(), dylibVMOffsetOfImpl,
- ^(uint64_t cacheVMOffset,
- dyld3::MachOLoaded::PointerMetaData pmd, uint64_t addend,
- bool isWeakImport) {
- // Round to the 16KB page we dirty
- //gotUsedPages.insert((cacheBaseAddress + cacheVMOffset) & ~0x3FFF);
- uint64_t pageAddr = (cacheBaseAddress + cacheVMOffset) & ~0x3FFF;
- pages[pageAddr].insert({ "GOT", nullptr });
- });
- });
-
- // Print the results
- printf("Cost of root of '%s' is %lld pages:\n", options.rootsCostOfDylib, (uint64_t)pages.size());
-
- for ( const auto& page : pages ) {
- printf("0x%08llx ", page.first);
-
- bool needsComma = false;
- for ( const InstallNameAndSegment& installNameAndSegment : page.second ) {
- if ( needsComma )
- printf(", ");
- needsComma = true;
-
- const char* leafName = strrchr(installNameAndSegment.first, '/');
- if ( leafName == NULL )
- leafName = installNameAndSegment.first;
- else
- leafName++;
-
- if ( installNameAndSegment.second )
- printf("%s(%s)", leafName, installNameAndSegment.second);
- else
- printf("%s", leafName);
- }
- printf("\n");
- }
-
- break;
- }
- case modeMachHeaders: {
- auto printRow = [](const char* magic, const char* arch, const char* filetype,
- const char* ncmds, const char* sizeofcmds , const char* flags,
- const char* installname) {
- printf("%12s %8s %8s %8s %12s %12s %8s\n",
- magic, arch, filetype, ncmds, sizeofcmds , flags, installname);
- };
-
- printRow("magic", "arch", "filetype", "ncmds", "sizeofcmds", "flags", "installname");
- dyldCache->forEachDylib(^(const dyld3::MachOAnalyzer *ma, const char *installName, uint32_t imageIndex, uint64_t inode, uint64_t mtime, bool &stop) {
- const char* magic = nullptr;
- if ( ma->magic == MH_MAGIC )
- magic = "MH_MAGIC";
- else if ( ma->magic == MH_MAGIC_64 )
- magic = "MH_MAGIC_64";
- else if ( ma->magic == MH_CIGAM )
- magic = "MH_CIGAM";
- else if ( ma->magic == MH_CIGAM_64 )
- magic = "MH_CIGAM_64";
-
- const char* arch = ma->archName();
- const char* filetype = ma->isDylib() ? "DYLIB" : "UNKNOWN";
- std::string ncmds = dyld3::json::decimal(ma->ncmds);
- std::string sizeofcmds = dyld3::json::decimal(ma->sizeofcmds);
- std::string flags = dyld3::json::hex(ma->flags);
-
- printRow(magic, arch, filetype, ncmds.c_str(), sizeofcmds.c_str(), flags.c_str(), installName);
- });
-
- break;
- }
- case modeLoadCommands: {
- dyldCache->forEachDylib(^(const dyld3::MachOAnalyzer *ma, const char *installName, uint32_t imageIndex, uint64_t inode, uint64_t mtime, bool &stop) {
- printf("%s:\n", installName);
-
- Diagnostics diag;
- ma->forEachLoadCommand(diag, ^(const load_command *cmd, bool &stopLC) {
- const char* loadCommandName = "unknown";
- switch (cmd->cmd) {
- case LC_SEGMENT:
- loadCommandName = "LC_SEGMENT";
- break;
- case LC_SYMTAB:
- loadCommandName = "LC_SYMTAB";
- break;
- case LC_SYMSEG:
- loadCommandName = "LC_SYMSEG";
- break;
- case LC_THREAD:
- loadCommandName = "LC_THREAD";
- break;
- case LC_UNIXTHREAD:
- loadCommandName = "LC_UNIXTHREAD";
- break;
- case LC_LOADFVMLIB:
- loadCommandName = "LC_LOADFVMLIB";
- break;
- case LC_IDFVMLIB:
- loadCommandName = "LC_IDFVMLIB";
- break;
- case LC_IDENT:
- loadCommandName = "LC_IDENT";
- break;
- case LC_FVMFILE:
- loadCommandName = "LC_FVMFILE";
- break;
- case LC_PREPAGE:
- loadCommandName = "LC_PREPAGE";
- break;
- case LC_DYSYMTAB:
- loadCommandName = "LC_DYSYMTAB";
- break;
- case LC_LOAD_DYLIB:
- loadCommandName = "LC_LOAD_DYLIB";
- break;
- case LC_ID_DYLIB:
- loadCommandName = "LC_ID_DYLIB";
- break;
- case LC_LOAD_DYLINKER:
- loadCommandName = "LC_LOAD_DYLINKER";
- break;
- case LC_ID_DYLINKER:
- loadCommandName = "LC_ID_DYLINKER";
- break;
- case LC_PREBOUND_DYLIB:
- loadCommandName = "LC_PREBOUND_DYLIB";
- break;
- case LC_ROUTINES:
- loadCommandName = "LC_ROUTINES";
- break;
- case LC_SUB_FRAMEWORK:
- loadCommandName = "LC_SUB_FRAMEWORK";
- break;
- case LC_SUB_UMBRELLA:
- loadCommandName = "LC_SUB_UMBRELLA";
- break;
- case LC_SUB_CLIENT:
- loadCommandName = "LC_SUB_CLIENT";
- break;
- case LC_SUB_LIBRARY:
- loadCommandName = "LC_SUB_LIBRARY";
- break;
- case LC_TWOLEVEL_HINTS:
- loadCommandName = "LC_TWOLEVEL_HINTS";
- break;
- case LC_PREBIND_CKSUM:
- loadCommandName = "LC_PREBIND_CKSUM";
- break;
- case LC_LOAD_WEAK_DYLIB:
- loadCommandName = "LC_LOAD_WEAK_DYLIB";
- break;
- case LC_SEGMENT_64:
- loadCommandName = "LC_SEGMENT_64";
- break;
- case LC_ROUTINES_64:
- loadCommandName = "LC_ROUTINES_64";
- break;
- case LC_UUID:
- loadCommandName = "LC_UUID";
- break;
- case LC_RPATH:
- loadCommandName = "LC_RPATH";
- break;
- case LC_CODE_SIGNATURE:
- loadCommandName = "LC_CODE_SIGNATURE";
- break;
- case LC_SEGMENT_SPLIT_INFO:
- loadCommandName = "LC_SEGMENT_SPLIT_INFO";
- break;
- case LC_REEXPORT_DYLIB:
- loadCommandName = "LC_REEXPORT_DYLIB";
- break;
- case LC_LAZY_LOAD_DYLIB:
- loadCommandName = "LC_LAZY_LOAD_DYLIB";
- break;
- case LC_ENCRYPTION_INFO:
- loadCommandName = "LC_ENCRYPTION_INFO";
- break;
- case LC_DYLD_INFO:
- loadCommandName = "LC_DYLD_INFO";
- break;
- case LC_DYLD_INFO_ONLY:
- loadCommandName = "LC_DYLD_INFO_ONLY";
- break;
- case LC_LOAD_UPWARD_DYLIB:
- loadCommandName = "LC_LOAD_UPWARD_DYLIB";
- break;
- case LC_VERSION_MIN_MACOSX:
- loadCommandName = "LC_VERSION_MIN_MACOSX";
- break;
- case LC_VERSION_MIN_IPHONEOS:
- loadCommandName = "LC_VERSION_MIN_IPHONEOS";
- break;
- case LC_FUNCTION_STARTS:
- loadCommandName = "LC_FUNCTION_STARTS";
- break;
- case LC_DYLD_ENVIRONMENT:
- loadCommandName = "LC_DYLD_ENVIRONMENT";
- break;
- case LC_MAIN:
- loadCommandName = "LC_MAIN";
- break;
- case LC_DATA_IN_CODE:
- loadCommandName = "LC_DATA_IN_CODE";
- break;
- case LC_SOURCE_VERSION:
- loadCommandName = "LC_SOURCE_VERSION";
- break;
- case LC_DYLIB_CODE_SIGN_DRS:
- loadCommandName = "LC_DYLIB_CODE_SIGN_DRS";
- break;
- case LC_ENCRYPTION_INFO_64:
- loadCommandName = "LC_ENCRYPTION_INFO_64";
- break;
- case LC_LINKER_OPTION:
- loadCommandName = "LC_LINKER_OPTION";
- break;
- case LC_LINKER_OPTIMIZATION_HINT:
- loadCommandName = "LC_LINKER_OPTIMIZATION_HINT";
- break;
- case LC_VERSION_MIN_TVOS:
- loadCommandName = "LC_VERSION_MIN_TVOS";
- break;
- case LC_VERSION_MIN_WATCHOS:
- loadCommandName = "LC_VERSION_MIN_WATCHOS";
- break;
- case LC_NOTE:
- loadCommandName = "LC_NOTE";
- break;
- case LC_BUILD_VERSION:
- loadCommandName = "LC_BUILD_VERSION";
- break;
- case LC_DYLD_EXPORTS_TRIE:
- loadCommandName = "LC_DYLD_EXPORTS_TRIE";
- break;
- case LC_DYLD_CHAINED_FIXUPS:
- loadCommandName = "LC_DYLD_CHAINED_FIXUPS";
- break;
- case LC_FILESET_ENTRY:
- loadCommandName = "LC_FILESET_ENTRY";
- break;
- default:
- break;
- }
-
- printf(" %s\n", loadCommandName);
- });
-
- diag.assertNoError();
- });
-
- break;
- }
- case modeCacheHeader: {
- __block uint32_t cacheIndex = 0;
- dyldCache->forEachCache(^(const DyldSharedCache *cache, bool &stopCache) {
- printf("Cache #%d\n", cacheIndex);
-
- uuid_string_t uuidString;
- uuid_unparse_upper(dyldCache->header.uuid, uuidString);
-
- uuid_string_t symbolFileUUIDString;
- uuid_unparse_upper(dyldCache->header.symbolFileUUID, symbolFileUUIDString);
-
- printf(" - magic: %s\n", dyldCache->header.magic);
- printf(" - mappingOffset: 0x%llx\n", (uint64_t)dyldCache->header.mappingOffset);
- printf(" - mappingCount: 0x%llx\n", (uint64_t)dyldCache->header.mappingCount);
- printf(" - imagesOffsetOld: 0x%llx\n", (uint64_t)dyldCache->header.imagesOffsetOld);
- printf(" - imagesCountOld: 0x%llx\n", (uint64_t)dyldCache->header.imagesCountOld);
- printf(" - dyldBaseAddress: 0x%llx\n", (uint64_t)dyldCache->header.dyldBaseAddress);
- printf(" - codeSignatureOffset: 0x%llx\n", (uint64_t)dyldCache->header.codeSignatureOffset);
- printf(" - codeSignatureSize: 0x%llx\n", (uint64_t)dyldCache->header.codeSignatureSize);
- printf(" - slideInfoOffsetUnused: 0x%llx\n", (uint64_t)dyldCache->header.slideInfoOffsetUnused);
- printf(" - slideInfoSizeUnused: 0x%llx\n", (uint64_t)dyldCache->header.slideInfoSizeUnused);
- printf(" - localSymbolsOffset: 0x%llx\n", (uint64_t)dyldCache->header.localSymbolsOffset);
- printf(" - localSymbolsSize: 0x%llx\n", (uint64_t)dyldCache->header.localSymbolsSize);
- printf(" - uuid: %s\n", uuidString);
- printf(" - cacheType: 0x%llx\n", (uint64_t)dyldCache->header.cacheType);
- printf(" - branchPoolsOffset: 0x%llx\n", (uint64_t)dyldCache->header.branchPoolsOffset);
- printf(" - branchPoolsCount: 0x%llx\n", (uint64_t)dyldCache->header.branchPoolsCount);
- printf(" - dyldInCacheMH: 0x%llx\n", (uint64_t)dyldCache->header.dyldInCacheMH);
- printf(" - dyldInCacheEntry: 0x%llx\n", (uint64_t)dyldCache->header.dyldInCacheEntry);
- printf(" - imagesTextOffset: 0x%llx\n", (uint64_t)dyldCache->header.imagesTextOffset);
- printf(" - imagesTextCount: 0x%llx\n", (uint64_t)dyldCache->header.imagesTextCount);
- printf(" - patchInfoAddr: 0x%llx\n", (uint64_t)dyldCache->header.patchInfoAddr);
- printf(" - patchInfoSize: 0x%llx\n", (uint64_t)dyldCache->header.patchInfoSize);
- printf(" - otherImageGroupAddrUnused: 0x%llx\n", (uint64_t)dyldCache->header.otherImageGroupAddrUnused);
- printf(" - otherImageGroupSizeUnused: 0x%llx\n", (uint64_t)dyldCache->header.otherImageGroupSizeUnused);
- printf(" - progClosuresAddr: 0x%llx\n", (uint64_t)dyldCache->header.progClosuresAddr);
- printf(" - progClosuresSize: 0x%llx\n", (uint64_t)dyldCache->header.progClosuresSize);
- printf(" - progClosuresTrieAddr: 0x%llx\n", (uint64_t)dyldCache->header.progClosuresTrieAddr);
- printf(" - progClosuresTrieSize: 0x%llx\n", (uint64_t)dyldCache->header.progClosuresTrieSize);
- printf(" - platform: 0x%llx\n", (uint64_t)dyldCache->header.platform);
- printf(" - formatVersion: 0x%llx\n", (uint64_t)dyldCache->header.formatVersion);
- printf(" - dylibsExpectedOnDisk: 0x%llx\n", (uint64_t)dyldCache->header.dylibsExpectedOnDisk);
- printf(" - simulator: 0x%llx\n", (uint64_t)dyldCache->header.simulator);
- printf(" - locallyBuiltCache: 0x%llx\n", (uint64_t)dyldCache->header.locallyBuiltCache);
- printf(" - builtFromChainedFixups: 0x%llx\n", (uint64_t)dyldCache->header.builtFromChainedFixups);
- printf(" - padding: 0x%llx\n", (uint64_t)dyldCache->header.padding);
- printf(" - sharedRegionStart: 0x%llx\n", (uint64_t)dyldCache->header.sharedRegionStart);
- printf(" - sharedRegionSize: 0x%llx\n", (uint64_t)dyldCache->header.sharedRegionSize);
- printf(" - maxSlide: 0x%llx\n", (uint64_t)dyldCache->header.maxSlide);
- printf(" - dylibsImageArrayAddr: 0x%llx\n", (uint64_t)dyldCache->header.dylibsImageArrayAddr);
- printf(" - dylibsImageArraySize: 0x%llx\n", (uint64_t)dyldCache->header.dylibsImageArraySize);
- printf(" - dylibsTrieAddr: 0x%llx\n", (uint64_t)dyldCache->header.dylibsTrieAddr);
- printf(" - dylibsTrieSize: 0x%llx\n", (uint64_t)dyldCache->header.dylibsTrieSize);
- printf(" - otherImageArrayAddr: 0x%llx\n", (uint64_t)dyldCache->header.otherImageArrayAddr);
- printf(" - otherImageArraySize: 0x%llx\n", (uint64_t)dyldCache->header.otherImageArraySize);
- printf(" - otherTrieAddr: 0x%llx\n", (uint64_t)dyldCache->header.otherTrieAddr);
- printf(" - otherTrieSize: 0x%llx\n", (uint64_t)dyldCache->header.otherTrieSize);
- printf(" - mappingWithSlideOffset: 0x%llx\n", (uint64_t)dyldCache->header.mappingWithSlideOffset);
- printf(" - mappingWithSlideCount: 0x%llx\n", (uint64_t)dyldCache->header.mappingWithSlideCount);
- printf(" - dylibsPBLStateArrayAddrUnused: 0x%llx\n", (uint64_t)dyldCache->header.dylibsPBLStateArrayAddrUnused);
- printf(" - dylibsPBLSetAddr: 0x%llx\n", (uint64_t)dyldCache->header.dylibsPBLSetAddr);
- printf(" - programsPBLSetPoolAddr: 0x%llx\n", (uint64_t)dyldCache->header.programsPBLSetPoolAddr);
- printf(" - programsPBLSetPoolSize: 0x%llx\n", (uint64_t)dyldCache->header.programsPBLSetPoolSize);
- printf(" - programTrieAddr: 0x%llx\n", (uint64_t)dyldCache->header.programTrieAddr);
- printf(" - programTrieSize: 0x%llx\n", (uint64_t)dyldCache->header.programTrieSize);
- printf(" - osVersion: 0x%llx\n", (uint64_t)dyldCache->header.osVersion);
- printf(" - altPlatform: 0x%llx\n", (uint64_t)dyldCache->header.altPlatform);
- printf(" - altOsVersion: 0x%llx\n", (uint64_t)dyldCache->header.altOsVersion);
- printf(" - swiftOptsOffset: 0x%llx\n", (uint64_t)dyldCache->header.swiftOptsOffset);
- printf(" - swiftOptsSize: 0x%llx\n", (uint64_t)dyldCache->header.swiftOptsSize);
- printf(" - subCacheArrayOffset: 0x%llx\n", (uint64_t)dyldCache->header.subCacheArrayOffset);
- printf(" - subCacheArrayCount: 0x%llx\n", (uint64_t)dyldCache->header.subCacheArrayCount);
- printf(" - symbolFileUUID: %s\n", symbolFileUUIDString);
- printf(" - rosettaReadOnlyAddr: 0x%llx\n", (uint64_t)dyldCache->header.rosettaReadOnlyAddr);
- printf(" - rosettaReadOnlySize: 0x%llx\n", (uint64_t)dyldCache->header.rosettaReadOnlySize);
- printf(" - rosettaReadWriteAddr: 0x%llx\n", (uint64_t)dyldCache->header.rosettaReadWriteAddr);
- printf(" - rosettaReadWriteSize: 0x%llx\n", (uint64_t)dyldCache->header.rosettaReadWriteSize);
- printf(" - imagesOffset: 0x%llx\n", (uint64_t)dyldCache->header.imagesOffset);
- printf(" - imagesCount: 0x%llx\n", (uint64_t)dyldCache->header.imagesCount);
- printf(" - cacheSubType: 0x%llx\n", (uint64_t)dyldCache->header.cacheSubType);
- printf(" - objcOptsOffset: 0x%llx\n", (uint64_t)dyldCache->header.objcOptsOffset);
- printf(" - objcOptsSize: 0x%llx\n", (uint64_t)dyldCache->header.objcOptsSize);
-
- ++cacheIndex;
- });
- break;
- }
- case modeDylibSymbols:
- {
- dyldCache->forEachImage(^(const mach_header* mh, const char* installName) {
- const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
- Diagnostics diag;
-
- printf("%s globals:\n", installName);
- ma->forEachGlobalSymbol(diag, ^(const char *symbolName, uint64_t n_value, uint8_t n_type, uint8_t n_sect, uint16_t n_desc, bool &stop) {
- printf(" 0x%08llX: %s\n", n_value, symbolName);
- });
- printf("%s locals:\n", installName);
- ma->forEachLocalSymbol(diag, ^(const char *symbolName, uint64_t n_value, uint8_t n_type, uint8_t n_sect, uint16_t n_desc, bool &stop) {
- printf(" 0x%08llX: %s\n", n_value, symbolName);
- });
- printf("%s undefs:\n", installName);
- ma->forEachImportedSymbol(diag, ^(const char *symbolName, uint64_t n_value, uint8_t n_type, uint8_t n_sect, uint16_t n_desc, bool &stop) {
- printf(" undef: %s\n", symbolName);
- });
- });
- break;
- }
- case modeFunctionStarts: {
- dyldCache->forEachImage(^(const mach_header* mh, const char* installName) {
- printf("%s:\n", installName);
-
- const dyld3::MachOAnalyzer* ma = (dyld3::MachOAnalyzer*)mh;
- uint64_t loadAddress = ma->preferredLoadAddress();
- Diagnostics diag;
- ma->forEachFunctionStart(^(uint64_t runtimeOffset) {
- uint64_t targetVMAddr = loadAddress + runtimeOffset;
- printf(" 0x%08llX\n", targetVMAddr);
- });
- });
- break;
- }
- case modeDuplicates:
- case modeDuplicatesSummary:
- {
- __block std::map<std::string, std::vector<const char*>> symbolsToInstallNames;
- __block std::set<std::string> weakDefSymbols;
- 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) ) {
- for (const ExportInfoTrie::Entry& entry: exports) {
- if ( (entry.info.flags & EXPORT_SYMBOL_FLAGS_REEXPORT) == 0 ) {
- symbolsToInstallNames[entry.name].push_back(installName);
- if ( entry.info.flags & EXPORT_SYMBOL_FLAGS_WEAK_DEFINITION ) {
- weakDefSymbols.insert(entry.name);
- }
- }
- }
- }
- }
- });
- // filter out unzippered twins
- std::set<std::string> okTwinSymbols;
- for (const auto& pos : symbolsToInstallNames) {
- const std::vector<const char*>& paths = pos.second;
- if ( paths.size() == 2 ) {
- // ignore unzippered twins
- const char* one = paths[0];
- const char* two = paths[1];
- if ( (strncmp(one, "/System/iOSSupport/", 19) == 0) || (strncmp(two, "/System/iOSSupport/", 19) == 0) ) {
- if ( const char* tailOne = Utils::strrstr(one, ".framework/") ) {
- if ( const char* tailTwo = Utils::strrstr(two, ".framework/") ) {
- if ( strcmp(tailOne, tailTwo) == 0 )
- okTwinSymbols.insert(pos.first);
- }
- }
- }
- }
- }
- std::erase_if(symbolsToInstallNames, [&](auto const& pos) { return okTwinSymbols.count(pos.first); });
-
- if ( options.mode == modeDuplicatesSummary ) {
- __block std::map<std::string, int> dylibDuplicatesCount;
- for (const auto& pos : symbolsToInstallNames) {
- const std::vector<const char*>& paths = pos.second;
- if ( paths.size() <= 1 )
- continue;
- for (const char* path : paths) {
- dylibDuplicatesCount[path] += 1;
- }
- }
- struct DupCount { const char* path; int count; };
- std::vector<DupCount> summary;
- for (const auto& pos : dylibDuplicatesCount) {
- summary.push_back({pos.first.c_str(), pos.second});
- }
- std::sort(summary.begin(), summary.end(), [](const DupCount& l, const DupCount& r) -> bool {
- return (l.count > r.count);
- });
- for ( const DupCount& entry : summary)
- printf("% 5d %s\n", entry.count, entry.path);
- }
- else {
- for (const auto& pos : symbolsToInstallNames) {
- const std::vector<const char*>& paths = pos.second;
- if ( paths.size() > 1 ) {
- bool isWeakDef = (weakDefSymbols.count(pos.first) != 0);
- printf("%s%s\n", pos.first.c_str(), (isWeakDef ? " [weak-def]" : ""));
- for (const char* path : paths)
- printf(" %s\n", path);
- }
- }
- }
- }
- break;
-
case modeNone:
case modeInfo:
- case modeTPROInfo:
- case modeStats:
case modeSlideInfo:
case modeVerboseSlideInfo:
- case modeFixupsInDylib:
case modeTextInfo:
case modeLocalSymbols:
case modeJSONMap:
- case modeVerboseJSONMap:
case modeJSONDependents:
case modeSectionSizes:
case modeStrings:
@@ -4012,9 +2275,6 @@
case modeObjCProtocols:
case modeObjCImpCaches:
case modeObjCClasses:
- case modeObjCClassLayout:
- case modeObjCClassMethodLists:
- case modeObjCClassHashTable:
case modeObjCSelectors:
case modeSwiftProtocolConformances:
case modeExtract: