Loading...
--- dyld/dyld-732.8/src/ImageLoader.cpp
+++ dyld/dyld-421.1/src/ImageLoader.cpp
@@ -34,12 +34,7 @@
#include <sys/mman.h>
#include <sys/param.h>
#include <sys/mount.h>
-#include <sys/sysctl.h>
#include <libkern/OSAtomic.h>
-
-#include <atomic>
-
-#include "Tracing.h"
#include "ImageLoader.h"
@@ -56,6 +51,7 @@
uint32_t ImageLoader::fgTotalPossibleLazyBindFixups = 0;
uint32_t ImageLoader::fgTotalSegmentsMapped = 0;
uint64_t ImageLoader::fgTotalBytesMapped = 0;
+uint64_t ImageLoader::fgTotalBytesPreFetched = 0;
uint64_t ImageLoader::fgTotalLoadLibrariesTime;
uint64_t ImageLoader::fgTotalObjCSetupTime = 0;
uint64_t ImageLoader::fgTotalDebuggerPausedTime = 0;
@@ -73,10 +69,10 @@
ImageLoader::ImageLoader(const char* path, unsigned int libCount)
- : fPath(path), fRealPath(NULL), fDevice(0), fInode(0), fLastModified(0),
+ : fPath(path), fRealPath(NULL), fDevice(0), fInode(0), fLastModified(0),
fPathHash(0), fDlopenReferenceCount(0), fInitializerRecursiveLock(NULL),
- fLoadOrder(fgLoadOrdinal++), fDepth(0), fObjCMappedNotified(false), fState(0), fLibraryCount(libCount),
- fMadeReadOnly(false), fAllLibraryChecksumsAndLoadAddressesMatch(false), fLeaveMapped(false), fNeverUnload(false),
+ fDepth(0), fLoadOrder(fgLoadOrdinal++), fState(0), fLibraryCount(libCount),
+ fAllLibraryChecksumsAndLoadAddressesMatch(false), fLeaveMapped(false), fNeverUnload(false),
fHideSymbols(false), fMatchByInstallName(false),
fInterposed(false), fRegisteredDOF(false), fAllLazyPointersBound(false),
fBeingRemoved(false), fAddFuncNotified(false),
@@ -137,16 +133,13 @@
void ImageLoader::setPath(const char* path)
{
- if ( fPathOwnedByImage && (fPath != NULL) )
+ if ( fPathOwnedByImage && (fPath != NULL) )
delete [] fPath;
fPath = new char[strlen(path)+1];
strcpy((char*)fPath, path);
fPathOwnedByImage = true; // delete fPath when this image is destructed
fPathHash = hash(fPath);
- if ( fRealPath != NULL ) {
- delete [] fRealPath;
- fRealPath = NULL;
- }
+ fRealPath = NULL;
}
void ImageLoader::setPathUnowned(const char* path)
@@ -155,7 +148,7 @@
delete [] fPath;
}
fPath = path;
- fPathOwnedByImage = false;
+ fPathOwnedByImage = false;
fPathHash = hash(fPath);
}
@@ -166,14 +159,14 @@
strcpy((char*)fRealPath, realPath);
}
-
-const char* ImageLoader::getRealPath() const
-{
- if ( fRealPath != NULL )
+const char* ImageLoader::getRealPath() const
+{
+ if ( fRealPath != NULL )
return fRealPath;
else
- return fPath;
-}
+ return fPath;
+}
+
uint32_t ImageLoader::hash(const char* path)
{
@@ -375,7 +368,6 @@
// this is called by initializeMainExecutable() to interpose on the initial set of images
void ImageLoader::applyInterposing(const LinkContext& context)
{
- dyld3::ScopedTimer timer(DBG_DYLD_TIMING_APPLY_INTERPOSING, 0, 0, 0);
if ( fgInterposingTuples.size() != 0 )
this->recursiveApplyInterposing(context);
}
@@ -396,61 +388,6 @@
}
}
return address;
-}
-
-void ImageLoader::applyInterposingToDyldCache(const LinkContext& context) {
- if (!context.dyldCache)
- return;
-#if !__arm64e__ // until arm64e cache builder sets builtFromChainedFixups
- if (!context.dyldCache->header.builtFromChainedFixups)
- return;
-#endif
- if (fgInterposingTuples.empty())
- return;
- // For each of the interposed addresses, see if any of them are in the shared cache. If so, find
- // that image and apply its patch table to all uses.
- uintptr_t cacheStart = (uintptr_t)context.dyldCache;
- for (std::vector<InterposeTuple>::iterator it=fgInterposingTuples.begin(); it != fgInterposingTuples.end(); it++) {
- if ( context.verboseInterposing )
- dyld::log("dyld: interpose: Trying to interpose address 0x%08llx\n", (uint64_t)it->replacee);
- uint32_t imageIndex;
- uint32_t cacheOffsetOfReplacee = (uint32_t)(it->replacee - cacheStart);
- if (!context.dyldCache->addressInText(cacheOffsetOfReplacee, &imageIndex))
- continue;
- dyld3::closure::ImageNum imageInCache = imageIndex+1;
- if ( context.verboseInterposing )
- dyld::log("dyld: interpose: Found shared cache image %d for 0x%08llx\n", imageInCache, (uint64_t)it->replacee);
- context.dyldCache->forEachPatchableExport(imageIndex, ^(uint32_t cacheOffsetOfImpl, const char* exportName) {
- // Skip patching anything other than this symbol
- if (cacheOffsetOfImpl != cacheOffsetOfReplacee)
- return;
- if ( context.verboseInterposing ) {
- const dyld3::closure::Image* image = context.dyldCache->cachedDylibsImageArray()->imageForNum(imageInCache);
- dyld::log("dyld: interpose: Patching uses of symbol %s in shared cache binary at %s\n", exportName, image->path());
- }
- uintptr_t newLoc = it->replacement;
- context.dyldCache->forEachPatchableUseOfExport(imageIndex, cacheOffsetOfImpl, ^(dyld_cache_patchable_location patchLocation) {
- uintptr_t* loc = (uintptr_t*)(cacheStart+patchLocation.cacheOffset);
-#if __has_feature(ptrauth_calls)
- if ( patchLocation.authenticated ) {
- dyld3::MachOLoaded::ChainedFixupPointerOnDisk ptr = *(dyld3::MachOLoaded::ChainedFixupPointerOnDisk*)loc;
- ptr.arm64e.authRebase.auth = true;
- ptr.arm64e.authRebase.addrDiv = patchLocation.usesAddressDiversity;
- ptr.arm64e.authRebase.diversity = patchLocation.discriminator;
- ptr.arm64e.authRebase.key = patchLocation.key;
- *loc = ptr.arm64e.signPointer(loc, newLoc + DyldSharedCache::getAddend(patchLocation));
- if ( context.verboseInterposing )
- dyld::log("dyld: interpose: *%p = %p (JOP: diversity 0x%04X, addr-div=%d, key=%s)\n",
- loc, (void*)*loc, patchLocation.discriminator, patchLocation.usesAddressDiversity, DyldSharedCache::keyName(patchLocation));
- return;
- }
-#endif
- if ( context.verboseInterposing )
- dyld::log("dyld: interpose: *%p = 0x%0llX (dyld cache patch) to %s\n", loc, newLoc + DyldSharedCache::getAddend(patchLocation), exportName);
- *loc = newLoc + (uintptr_t)DyldSharedCache::getAddend(patchLocation);
- });
- });
- }
}
void ImageLoader::addDynamicInterposingTuples(const struct dyld_interpose_tuple array[], size_t count)
@@ -471,26 +408,6 @@
}
}
-// <rdar://problem/29099600> dyld should tell the kernel when it is doing root fix-ups
-void ImageLoader::vmAccountingSetSuspended(const LinkContext& context, bool suspend)
-{
-#if __arm__ || __arm64__
- static bool sVmAccountingSuspended = false;
- if ( suspend == sVmAccountingSuspended )
- return;
- if ( context.verboseBind )
- dyld::log("set vm.footprint_suspend=%d\n", suspend);
- int newValue = suspend ? 1 : 0;
- int oldValue = 0;
- size_t newlen = sizeof(newValue);
- size_t oldlen = sizeof(oldValue);
- int ret = sysctlbyname("vm.footprint_suspend", &oldValue, &oldlen, &newValue, newlen);
- if ( context.verboseBind && (ret != 0) )
- dyld::log("vm.footprint_suspend => %d, errno=%d\n", ret, errno);
- sVmAccountingSuspended = suspend;
-#endif
-}
-
void ImageLoader::link(const LinkContext& context, bool forceLazysBound, bool preflightOnly, bool neverUnload, const RPathChain& loaderRPaths, const char* imagePath)
{
@@ -506,49 +423,36 @@
// we only do the loading step for preflights
if ( preflightOnly )
return;
-
+
uint64_t t1 = mach_absolute_time();
context.clearAllDepths();
this->recursiveUpdateDepth(context.imageCount());
- __block uint64_t t2, t3, t4, t5;
- {
- dyld3::ScopedTimer(DBG_DYLD_TIMING_APPLY_FIXUPS, 0, 0, 0);
- t2 = mach_absolute_time();
- this->recursiveRebaseWithAccounting(context);
- context.notifyBatch(dyld_image_state_rebased, false);
-
- t3 = mach_absolute_time();
- if ( !context.linkingMainExecutable )
- this->recursiveBindWithAccounting(context, forceLazysBound, neverUnload);
-
- t4 = mach_absolute_time();
- if ( !context.linkingMainExecutable )
- this->weakBind(context);
- t5 = mach_absolute_time();
- }
+ uint64_t t2 = mach_absolute_time();
+ this->recursiveRebase(context);
+ context.notifyBatch(dyld_image_state_rebased, false);
+
+ uint64_t t3 = mach_absolute_time();
+ this->recursiveBind(context, forceLazysBound, neverUnload);
+
+ uint64_t t4 = mach_absolute_time();
+ if ( !context.linkingMainExecutable )
+ this->weakBind(context);
+ uint64_t t5 = mach_absolute_time();
+
+ context.notifyBatch(dyld_image_state_bound, false);
+ uint64_t t6 = mach_absolute_time();
+
+ std::vector<DOFInfo> dofs;
+ this->recursiveGetDOFSections(context, dofs);
+ context.registerDOFs(dofs);
+ uint64_t t7 = mach_absolute_time();
// interpose any dynamically loaded images
if ( !context.linkingMainExecutable && (fgInterposingTuples.size() != 0) ) {
- dyld3::ScopedTimer timer(DBG_DYLD_TIMING_APPLY_INTERPOSING, 0, 0, 0);
this->recursiveApplyInterposing(context);
}
-
- // now that all fixups are done, make __DATA_CONST segments read-only
- if ( !context.linkingMainExecutable )
- this->recursiveMakeDataReadOnly(context);
-
- if ( !context.linkingMainExecutable )
- context.notifyBatch(dyld_image_state_bound, false);
- uint64_t t6 = mach_absolute_time();
-
- if ( context.registerDOFs != NULL ) {
- std::vector<DOFInfo> dofs;
- this->recursiveGetDOFSections(context, dofs);
- context.registerDOFs(dofs);
- }
- uint64_t t7 = mach_absolute_time();
-
+
// clear error strings
(*context.setErrorStrings)(0, NULL, NULL, NULL);
@@ -592,7 +496,7 @@
// Calling recursive init on all images in images list, building a new list of
// uninitialized upward dependencies.
for (uintptr_t i=0; i < images.count; ++i) {
- images.imagesAndPaths[i].first->recursiveInitialization(context, thisThread, images.imagesAndPaths[i].second, timingInfo, ups);
+ images.images[i]->recursiveInitialization(context, thisThread, images.images[i]->getPath(), timingInfo, ups);
}
// If any upward dependencies remain, init them.
if ( ups.count > 0 )
@@ -606,7 +510,7 @@
mach_port_t thisThread = mach_thread_self();
ImageLoader::UninitedUpwards up;
up.count = 1;
- up.imagesAndPaths[0] = { this, this->getPath() };
+ up.images[0] = this;
processInitializers(context, thisThread, timingInfo, up);
context.notifyBatch(dyld_image_state_initialized, false);
mach_port_deallocate(mach_task_self(), thisThread);
@@ -711,13 +615,17 @@
for(unsigned int i=0; i < fLibraryCount; ++i){
ImageLoader* dependentLib;
bool depLibReExported = false;
+ bool depLibRequired = false;
+ bool depLibCheckSumsMatch = false;
DependentLibraryInfo& requiredLibInfo = libraryInfos[i];
+#if DYLD_SHARED_CACHE_SUPPORT
if ( preflightOnly && context.inSharedCache(requiredLibInfo.name) ) {
// <rdar://problem/5910137> dlopen_preflight() on image in shared cache leaves it loaded but not objc initialized
// in preflight mode, don't even load dylib that are in the shared cache because they will never be unloaded
setLibImage(i, NULL, false, false);
continue;
}
+#endif
try {
unsigned cacheIndex;
dependentLib = context.loadLibrary(requiredLibInfo.name, true, this->getPath(), &thisRPaths, cacheIndex);
@@ -735,6 +643,8 @@
dependentLib->fIsReferencedDownward = true;
}
LibraryInfo actualInfo = dependentLib->doGetLibraryInfo(requiredLibInfo.info);
+ depLibRequired = requiredLibInfo.required;
+ depLibCheckSumsMatch = ( actualInfo.checksum == requiredLibInfo.info.checksum );
depLibReExported = requiredLibInfo.reExported;
if ( ! depLibReExported ) {
// for pre-10.5 binaries that did not use LC_REEXPORT_DYLIB
@@ -742,8 +652,7 @@
}
// check found library version is compatible
// <rdar://problem/89200806> 0xFFFFFFFF is wildcard that matches any version
- if ( (requiredLibInfo.info.minVersion != 0xFFFFFFFF) && (actualInfo.minVersion < requiredLibInfo.info.minVersion)
- && ((dyld3::MachOFile*)(dependentLib->machHeader()))->enforceCompatVersion() ) {
+ if ( (requiredLibInfo.info.minVersion != 0xFFFFFFFF) && (actualInfo.minVersion < requiredLibInfo.info.minVersion) ) {
// record values for possible use by CrashReporter or Finder
dyld::throwf("Incompatible library version: %s requires version %d.%d.%d or later, but %s provides version %d.%d.%d",
this->getShortName(), requiredLibInfo.info.minVersion >> 16, (requiredLibInfo.info.minVersion >> 8) & 0xff, requiredLibInfo.info.minVersion & 0xff,
@@ -823,13 +732,6 @@
}
}
-
-void ImageLoader::recursiveRebaseWithAccounting(const LinkContext& context)
-{
- this->recursiveRebase(context);
- vmAccountingSetSuspended(context, false);
-}
-
void ImageLoader::recursiveRebase(const LinkContext& context)
{
if ( fState < dyld_image_state_rebased ) {
@@ -884,36 +786,7 @@
}
}
-void ImageLoader::recursiveMakeDataReadOnly(const LinkContext& context)
-{
- if ( ! fMadeReadOnly ) {
- // break cycles
- fMadeReadOnly = true;
-
- try {
- // handle lower level libraries first
- for(unsigned int i=0; i < libraryCount(); ++i) {
- ImageLoader* dependentImage = libImage(i);
- if ( dependentImage != NULL )
- dependentImage->recursiveMakeDataReadOnly(context);
- }
-
- // if this image has __DATA_CONST, make that segment read-only
- makeDataReadOnly();
- }
- catch (const char* msg) {
- fMadeReadOnly = false;
- throw;
- }
- }
-}
-
-
-void ImageLoader::recursiveBindWithAccounting(const LinkContext& context, bool forceLazysBound, bool neverUnload)
-{
- this->recursiveBind(context, forceLazysBound, neverUnload);
- vmAccountingSetSuspended(context, false);
-}
+
void ImageLoader::recursiveBind(const LinkContext& context, bool forceLazysBound, bool neverUnload)
{
@@ -952,23 +825,6 @@
}
}
-
-
-// These are mangled symbols for all the variants of operator new and delete
-// which a main executable can define (non-weak) and override the
-// weak-def implementation in the OS.
-static const char* const sTreatAsWeak[] = {
- "__Znwm", "__ZnwmRKSt9nothrow_t",
- "__Znam", "__ZnamRKSt9nothrow_t",
- "__ZdlPv", "__ZdlPvRKSt9nothrow_t", "__ZdlPvm",
- "__ZdaPv", "__ZdaPvRKSt9nothrow_t", "__ZdaPvm",
- "__ZnwmSt11align_val_t", "__ZnwmSt11align_val_tRKSt9nothrow_t",
- "__ZnamSt11align_val_t", "__ZnamSt11align_val_tRKSt9nothrow_t",
- "__ZdlPvSt11align_val_t", "__ZdlPvSt11align_val_tRKSt9nothrow_t", "__ZdlPvmSt11align_val_t",
- "__ZdaPvSt11align_val_t", "__ZdaPvSt11align_val_tRKSt9nothrow_t", "__ZdaPvmSt11align_val_t"
-};
-
-
void ImageLoader::weakBind(const LinkContext& context)
{
if ( context.verboseWeakBind )
@@ -991,69 +847,6 @@
// don't need to do any coalescing if only one image has overrides, or all have already been done
if ( (countOfImagesWithWeakDefinitionsNotInSharedCache > 0) && (countNotYetWeakBound > 0) ) {
-#if __MAC_OS_X_VERSION_MIN_REQUIRED
- // only do alternate algorithm for dlopen(). Use traditional algorithm for launch
- if ( !context.linkingMainExecutable ) {
- // for all images that need weak binding
- for (int i=0; i < count; ++i) {
- ImageLoader* imageBeingFixedUp = imagesNeedingCoalescing[i];
- if ( imageBeingFixedUp->weakSymbolsBound(imageIndexes[i]) )
- continue; // weak binding already completed
- bool imageBeingFixedUpInCache = imageBeingFixedUp->inSharedCache();
-
- if ( context.verboseWeakBind )
- dyld::log("dyld: checking for weak symbols in %s\n", imageBeingFixedUp->getPath());
- // for all symbols that need weak binding in this image
- ImageLoader::CoalIterator coalIterator;
- imageBeingFixedUp->initializeCoalIterator(coalIterator, i, imageIndexes[i]);
- while ( !imageBeingFixedUp->incrementCoalIterator(coalIterator) ) {
- const char* nameToCoalesce = coalIterator.symbolName;
- uintptr_t targetAddr = 0;
- const ImageLoader* targetImage;
- // scan all images looking for definition to use
- for (int j=0; j < count; ++j) {
- const ImageLoader* anImage = imagesNeedingCoalescing[j];
- bool anImageInCache = anImage->inSharedCache();
- // <rdar://problem/47986398> Don't look at images in dyld cache because cache is
- // already coalesced. Only images outside cache can potentially override something in cache.
- if ( anImageInCache && imageBeingFixedUpInCache )
- continue;
-
- //dyld::log("looking for %s in %s\n", nameToCoalesce, anImage->getPath());
- const ImageLoader* foundIn;
- const Symbol* sym = anImage->findExportedSymbol(nameToCoalesce, false, &foundIn);
- if ( sym != NULL ) {
- if ( (foundIn->getExportedSymbolInfo(sym) & ImageLoader::kWeakDefinition) == 0 ) {
- // found non-weak def, use it and stop looking
- targetAddr = foundIn->getExportedSymbolAddress(sym, context);
- targetImage = foundIn;
- if ( context.verboseWeakBind )
- dyld::log("dyld: found strong %s at 0x%lX in %s\n", nameToCoalesce, targetAddr, foundIn->getPath());
- break;
- }
- else {
- // found weak-def, only use if no weak found yet
- if ( targetAddr == 0 ) {
- targetAddr = foundIn->getExportedSymbolAddress(sym, context);
- targetImage = foundIn;
- if ( context.verboseWeakBind )
- dyld::log("dyld: found weak %s at 0x%lX in %s\n", nameToCoalesce, targetAddr, foundIn->getPath());
- }
- }
- }
- }
- if ( (targetAddr != 0) && (coalIterator.image != targetImage) ) {
- coalIterator.image->updateUsesCoalIterator(coalIterator, targetAddr, (ImageLoader*)targetImage, 0, context);
- if ( context.verboseWeakBind )
- dyld::log("dyld: adjusting uses of %s in %s to use definition from %s\n", nameToCoalesce, coalIterator.image->getPath(), targetImage->getPath());
- }
- }
- imageBeingFixedUp->setWeakSymbolsBound(imageIndexes[i]);
- }
- }
- else
-#endif // __MAC_OS_X_VERSION_MIN_REQUIRED
- {
// make symbol iterators for each
ImageLoader::CoalIterator iterators[count];
ImageLoader::CoalIterator* sortedIts[count];
@@ -1138,46 +931,15 @@
}
}
}
-
- }
- }
-
- for (int i=0; i < count; ++i) {
- if ( imagesNeedingCoalescing[i]->weakSymbolsBound(imageIndexes[i]) )
- continue; // skip images already processed
-
- if ( imagesNeedingCoalescing[i]->usesChainedFixups() ) {
- // during binding of references to weak-def symbols, the dyld cache was patched
- // but if main executable has non-weak override of operator new or delete it needs is handled here
- for (const char* weakSymbolName : sTreatAsWeak) {
- const ImageLoader* dummy;
- imagesNeedingCoalescing[i]->resolveWeak(context, weakSymbolName, true, false, &dummy);
- }
- }
-#if __arm64e__
- else {
- // support traditional arm64 app on an arm64e device
- // look for weak def symbols in this image which may override the cache
- ImageLoader::CoalIterator coaler;
- imagesNeedingCoalescing[i]->initializeCoalIterator(coaler, i, 0);
- imagesNeedingCoalescing[i]->incrementCoalIterator(coaler);
- while ( !coaler.done ) {
- const ImageLoader* dummy;
- // a side effect of resolveWeak() is to patch cache
- imagesNeedingCoalescing[i]->resolveWeak(context, coaler.symbolName, true, false, &dummy);
- imagesNeedingCoalescing[i]->incrementCoalIterator(coaler);
- }
- }
-#endif
- }
-
+
+ }
+ }
+
// mark all as having all weak symbols bound
for(int i=0; i < count; ++i) {
imagesNeedingCoalescing[i]->setWeakSymbolsBound(imageIndexes[i]);
}
- }
- }
-
+ }
uint64_t t2 = mach_absolute_time();
fgTotalWeakBindTime += t2 - t1;
@@ -1221,16 +983,13 @@
{
// try to set image's ivar fInitializerRecursiveLock to point to this lock_info
// keep trying until success (spin)
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
while ( ! OSAtomicCompareAndSwapPtrBarrier(NULL, &rlock, (void**)&fInitializerRecursiveLock) ) {
// if fInitializerRecursiveLock already points to a different lock_info, if it is for
// the same thread we are on, the increment the lock count, otherwise continue to spin
if ( (fInitializerRecursiveLock != NULL) && (fInitializerRecursiveLock->thread == rlock.thread) )
break;
}
-#pragma clang diagnostic pop
- ++(fInitializerRecursiveLock->count);
+ ++(fInitializerRecursiveLock->count);
}
void ImageLoader::recursiveSpinUnLock()
@@ -1269,7 +1028,7 @@
if ( dependentImage != NULL ) {
// don't try to initialize stuff "above" me yet
if ( libIsUpward(i) ) {
- uninitUps.imagesAndPaths[uninitUps.count] = { dependentImage, libPath(i) };
+ uninitUps.images[uninitUps.count] = dependentImage;
uninitUps.count++;
}
else if ( dependentImage->fDepth >= fDepth ) {
@@ -1281,7 +1040,7 @@
// record termination order
if ( this->needsTermination() )
context.terminationRecorder(this);
-
+
// let objc know we are about to initialize this image
uint64_t t1 = mach_absolute_time();
fState = dyld_image_state_dependents_initialized;
@@ -1318,9 +1077,9 @@
static uint64_t sUnitsPerSecond = 0;
if ( sUnitsPerSecond == 0 ) {
struct mach_timebase_info timeBaseInfo;
- if ( mach_timebase_info(&timeBaseInfo) != KERN_SUCCESS )
- return;
- sUnitsPerSecond = 1000000000ULL * timeBaseInfo.denom / timeBaseInfo.numer;
+ if ( mach_timebase_info(&timeBaseInfo) == KERN_SUCCESS ) {
+ sUnitsPerSecond = 1000000000ULL * timeBaseInfo.denom / timeBaseInfo.numer;
+ }
}
if ( partTime < sUnitsPerSecond ) {
uint32_t milliSecondsTimesHundred = (uint32_t)((partTime*100000)/sUnitsPerSecond);
@@ -1396,7 +1155,7 @@
printTime(" total time", totalTime, totalTime);
dyld::log(" total images loaded: %d (%u from dyld shared cache)\n", imageCount, fgImagesUsedFromSharedCache);
- dyld::log(" total segments mapped: %u, into %llu pages\n", fgTotalSegmentsMapped, fgTotalBytesMapped/4096);
+ dyld::log(" total segments mapped: %u, into %llu pages with %llu pages pre-fetched\n", fgTotalSegmentsMapped, fgTotalBytesMapped/4096, fgTotalBytesPreFetched/4096);
printTime(" total images loading time", fgTotalLoadLibrariesTime, totalTime);
printTime(" total load time in ObjC", fgTotalObjCSetupTime, totalTime);
printTime(" total debugger pause time", fgTotalDebuggerPausedTime, totalTime);
@@ -1558,7 +1317,7 @@
bit += 7;
}
} while (*p++ & 0x80);
- return (uintptr_t)result;
+ return result;
}
@@ -1576,8 +1335,8 @@
} while (byte & 0x80);
// sign extend negative numbers
if ( (byte & 0x40) != 0 )
- result |= (~0ULL) << bit;
- return (intptr_t)result;
+ result |= (-1LL) << bit;
+ return result;
}