Loading...
--- dyld/dyld-95.3/src/ImageLoader.cpp
+++ dyld/dyld-44.17/src/ImageLoader.cpp
@@ -1,6 +1,6 @@
/* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*-
*
- * Copyright (c) 2004-2006 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2005 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -33,72 +33,64 @@
#include <sys/mman.h>
#include <sys/param.h>
#include <sys/mount.h>
-#include <libkern/OSAtomic.h>
#include "ImageLoader.h"
-// in libc.a
-extern "C" void _spin_lock(uint32_t*);
-extern "C" void _spin_unlock(uint32_t*);
-
-uint32_t ImageLoader::fgImagesUsedFromSharedCache = 0;
+
uint32_t ImageLoader::fgImagesWithUsedPrebinding = 0;
-uint32_t ImageLoader::fgImagesRequiringNoFixups = 0;
uint32_t ImageLoader::fgTotalRebaseFixups = 0;
uint32_t ImageLoader::fgTotalBindFixups = 0;
-uint32_t ImageLoader::fgTotalBindSymbolsResolved = 0;
-uint32_t ImageLoader::fgTotalBindImageSearches = 0;
uint32_t ImageLoader::fgTotalLazyBindFixups = 0;
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::fgTotalRebaseTime;
uint64_t ImageLoader::fgTotalBindTime;
+uint64_t ImageLoader::fgTotalNotifyTime;
uint64_t ImageLoader::fgTotalInitTime;
uintptr_t ImageLoader::fgNextSplitSegAddress = 0x90000000;
-uint16_t ImageLoader::fgLoadOrdinal = 0;
-uintptr_t Segment::fgNextPIEDylibAddress = 0;
-
+uintptr_t Segment::fgNextNonSplitSegAddress = 0x8FE00000;
+
+
+
+__attribute__((noreturn))
+void throwf(const char* format, ...)
+{
+ va_list list;
+ char* p;
+ va_start(list, format);
+ vasprintf(&p, format, list);
+ va_end(list);
+
+ const char* t = p;
+ throw t;
+}
void ImageLoader::init(const char* path, uint64_t offsetInFat, dev_t device, ino_t inode, time_t modDate)
{
fPathHash = 0;
- fPath = path;
+ fPath = NULL;
+ if ( path != NULL )
+ this->setPath(path);
fLogicalPath = NULL;
fDevice = device;
fInode = inode;
fLastModified = modDate;
fOffsetInFatFile = offsetInFat;
+ //fSegments = NULL;
fLibraries = NULL;
fLibrariesCount = 0;
- fDlopenReferenceCount = 0;
- fStaticReferenceCount = 0;
- fDynamicReferenceCount = 0;
- fDynamicReferences = NULL;
- fDepth = 0;
- fLoadOrder = fgLoadOrdinal++;
- fState = 0;
+ fReferenceCount = 0;
fAllLibraryChecksumsAndLoadAddressesMatch = false;
fLeaveMapped = false;
- fNeverUnload = false;
fHideSymbols = false;
fMatchByInstallName = false;
- fRegisteredDOF = false;
-#if IMAGE_NOTIFY_SUPPORT
+ fLibrariesLoaded = false;
+ fBased = false;
+ fBoundAllNonLazy = false;
+ fBoundAllLazy = false;
fAnnounced = false;
-#endif
- fAllLazyPointersBound = false;
- fBeingRemoved = false;
- fPathOwnedByImage = false;
-#if RECURSIVE_INITIALIZER_LOCK
- fInitializerRecursiveLock = NULL;
-#else
- fInitializerLock = 0;
-#endif
- if ( fPath != NULL )
- fPathHash = hash(fPath);
+ fInitialized = false;
+ fNextAddImageIndex = 0;
}
@@ -115,77 +107,29 @@
ImageLoader::~ImageLoader()
{
- if ( fPathOwnedByImage && (fPath != NULL) )
+ // need to read up on STL and see if this is right way to destruct vector contents
+ const unsigned int segmentCount = fSegments.size();
+ for(unsigned int i=0; i < segmentCount; ++i){
+ Segment* seg = fSegments[i];
+ delete seg;
+ }
+ if ( fPath != NULL )
delete [] fPath;
if ( fLogicalPath != NULL )
delete [] fLogicalPath;
- if ( fLibraries != NULL ) {
- for (uint32_t i = 0; i < fLibrariesCount; ++i) {
- if ( fLibraries[i].image != NULL )
- fLibraries[i].image->fStaticReferenceCount--;
- }
- delete [] fLibraries;
- }
- if ( fDynamicReferences != NULL ) {
- for (std::set<const ImageLoader*>::iterator it = fDynamicReferences->begin(); it != fDynamicReferences->end(); ++it ) {
- const_cast<ImageLoader*>(*it)->fDynamicReferenceCount--;
- }
- delete fDynamicReferences;
- }
-}
-
-void ImageLoader::setMapped(const LinkContext& context)
-{
- fState = dyld_image_state_mapped;
- context.notifySingle(dyld_image_state_mapped, this->machHeader(), fPath, fLastModified);
-}
-
-void ImageLoader::addDynamicReference(const ImageLoader* target)
-{
- if ( fDynamicReferences == NULL )
- fDynamicReferences = new std::set<const ImageLoader*>();
- if ( fDynamicReferences->count(target) == 0 ) {
- fDynamicReferences->insert(target);
- const_cast<ImageLoader*>(target)->fDynamicReferenceCount++;
- }
- //dyld::log("dyld: addDynamicReference() from %s to %s, fDynamicReferences->size()=%lu\n", this->getPath(), target->getPath(), fDynamicReferences->size());
-}
-
-int ImageLoader::compare(const ImageLoader* right) const
-{
- if ( this->fDepth == right->fDepth ) {
- if ( this->fLoadOrder == right->fLoadOrder )
- return 0;
- else if ( this->fLoadOrder < right->fLoadOrder )
- return -1;
- else
- return 1;
- }
- else {
- if ( this->fDepth < right->fDepth )
- return -1;
- else
- return 1;
- }
-}
-
+}
+
+
void ImageLoader::setPath(const char* path)
{
- if ( fPathOwnedByImage && (fPath != NULL) )
+ if ( fPath != NULL ) {
+ // if duplicate path, do nothing
+ if ( strcmp(path, fPath) == 0 )
+ return;
delete [] fPath;
+ }
fPath = new char[strlen(path)+1];
strcpy((char*)fPath, path);
- fPathOwnedByImage = true; // delete fPath when this image is destructed
- fPathHash = hash(fPath);
-}
-
-void ImageLoader::setPathUnowned(const char* path)
-{
- if ( fPathOwnedByImage && (fPath != NULL) ) {
- delete [] fPath;
- }
- fPath = path;
- fPathOwnedByImage = false;
fPathHash = hash(fPath);
}
@@ -258,6 +202,10 @@
void ImageLoader::setLeaveMapped()
{
fLeaveMapped = true;
+ const unsigned int segmentCount = fSegments.size();
+ for(unsigned int i=0; i < segmentCount; ++i){
+ fSegments[i]->setUnMapWhenDestructed(false);
+ }
}
void ImageLoader::setHideExports(bool hide)
@@ -272,21 +220,20 @@
bool ImageLoader::isLinked() const
{
- return (fState >= dyld_image_state_bound);
-}
-
-time_t ImageLoader::lastModified() const
+ return fBoundAllNonLazy;
+}
+
+time_t ImageLoader::lastModified()
{
return fLastModified;
}
bool ImageLoader::containsAddress(const void* addr) const
{
- if ( ! this->isLinked() )
- return false;
- for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
- Segment* seg = *it;
- const uint8_t* start = (const uint8_t*)seg->getActualLoadAddress(this);
+ const unsigned int segmentCount = fSegments.size();
+ for(unsigned int i=0; i < segmentCount; ++i){
+ Segment* seg = fSegments[i];
+ const uint8_t* start = (const uint8_t*)seg->getActualLoadAddress();
const uint8_t* end = start + seg->getSize();
if ( (start <= addr) && (addr < end) && !seg->unaccessible() )
return true;
@@ -294,61 +241,45 @@
return false;
}
-bool ImageLoader::overlapsWithAddressRange(const void* start, const void* end) const
-{
- for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
- Segment* seg = *it;
- const uint8_t* segStart = (const uint8_t*)(seg->getActualLoadAddress(this));
- const uint8_t* segEnd = segStart + seg->getSize();
- if ( (start <= segStart) && (segStart < end) )
- return true;
- if ( (start <= segEnd) && (segEnd < end) )
- return true;
- if ( (segStart < start) && (end < segEnd) )
- return true;
- }
- return false;
-}
-
-void ImageLoader::getMappedRegions(MappedRegion*& regions) const
-{
- for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
- Segment* seg = *it;
+void ImageLoader::addMappedRegions(RegionsVector& regions) const
+{
+ const unsigned int segmentCount = fSegments.size();
+ for(unsigned int i=0; i < segmentCount; ++i){
+ Segment* seg = fSegments[i];
MappedRegion region;
- region.address = seg->getActualLoadAddress(this);
+ region.address = seg->getActualLoadAddress();
region.size = seg->getSize();
- *regions++ = region;
- }
-}
-
-
-static bool notInImgageList(const ImageLoader* image, const ImageLoader** dsiStart, const ImageLoader** dsiCur)
-{
- for (const ImageLoader** p = dsiStart; p < dsiCur; ++p)
- if ( *p == image )
- return false;
- return true;
-}
-
+ regions.push_back(region);
+ }
+}
+
+
+void ImageLoader::incrementReferenceCount()
+{
+ ++fReferenceCount;
+}
+
+bool ImageLoader::decrementReferenceCount()
+{
+ return ( --fReferenceCount == 0 );
+}
// private method that handles circular dependencies by only search any image once
-const ImageLoader::Symbol* ImageLoader::findExportedSymbolInDependentImagesExcept(const char* name,
- const ImageLoader** dsiStart, const ImageLoader**& dsiCur, const ImageLoader** dsiEnd, const ImageLoader** foundIn) const
+const ImageLoader::Symbol* ImageLoader::findExportedSymbolInDependentImagesExcept(const char* name, std::set<const ImageLoader*>& dontSearchImages, ImageLoader** foundIn) const
{
const ImageLoader::Symbol* sym;
-
// search self
- if ( notInImgageList(this, dsiStart, dsiCur) ) {
+ if ( dontSearchImages.count(this) == 0 ) {
sym = this->findExportedSymbol(name, NULL, false, foundIn);
if ( sym != NULL )
return sym;
- *dsiCur++ = this;
+ dontSearchImages.insert(this);
}
// search directly dependent libraries
for (uint32_t i=0; i < fLibrariesCount; ++i) {
ImageLoader* dependentImage = fLibraries[i].image;
- if ( (dependentImage != NULL) && notInImgageList(dependentImage, dsiStart, dsiCur) ) {
+ if ( (dependentImage != NULL) && (dontSearchImages.count(dependentImage) == 0) ) {
const ImageLoader::Symbol* sym = dependentImage->findExportedSymbol(name, NULL, false, foundIn);
if ( sym != NULL )
return sym;
@@ -358,11 +289,11 @@
// search indirectly dependent libraries
for (uint32_t i=0; i < fLibrariesCount; ++i) {
ImageLoader* dependentImage = fLibraries[i].image;
- if ( (dependentImage != NULL) && notInImgageList(dependentImage, dsiStart, dsiCur) ) {
- *dsiCur++ = dependentImage;
- const ImageLoader::Symbol* sym = dependentImage->findExportedSymbolInDependentImagesExcept(name, dsiStart, dsiCur, dsiEnd, foundIn);
+ if ( (dependentImage != NULL) && (dontSearchImages.count(dependentImage) == 0) ) {
+ const ImageLoader::Symbol* sym = dependentImage->findExportedSymbolInDependentImagesExcept(name, dontSearchImages, foundIn);
if ( sym != NULL )
return sym;
+ dontSearchImages.insert(dependentImage);
}
}
@@ -370,132 +301,90 @@
}
-const ImageLoader::Symbol* ImageLoader::findExportedSymbolInDependentImages(const char* name, const LinkContext& context, const ImageLoader** foundIn) const
-{
- unsigned int imageCount = context.imageCount();
- const ImageLoader* dontSearchImages[imageCount];
- dontSearchImages[0] = this; // don't search this image
- const ImageLoader** cur = &dontSearchImages[1];
- return this->findExportedSymbolInDependentImagesExcept(name, &dontSearchImages[0], cur, &dontSearchImages[imageCount], foundIn);
-}
-
-const ImageLoader::Symbol* ImageLoader::findExportedSymbolInImageOrDependentImages(const char* name, const LinkContext& context, const ImageLoader** foundIn) const
-{
- unsigned int imageCount = context.imageCount();
- const ImageLoader* dontSearchImages[imageCount];
- const ImageLoader** cur = &dontSearchImages[0];
- return this->findExportedSymbolInDependentImagesExcept(name, &dontSearchImages[0], cur, &dontSearchImages[imageCount], foundIn);
-}
-
-
-void ImageLoader::link(const LinkContext& context, bool forceLazysBound, bool preflightOnly, const RPathChain& loaderRPaths)
-{
- //dyld::log("ImageLoader::link(%s) refCount=%d, neverUnload=%d\n", this->getPath(), fStaticReferenceCount, fNeverUnload);
-
- uint64_t t0 = mach_absolute_time();
- this->recursiveLoadLibraries(context,loaderRPaths);
- context.notifyBatch(dyld_image_state_dependents_mapped);
-
- // we only do the loading step for preflights
- if ( preflightOnly )
- return;
-
+const ImageLoader::Symbol* ImageLoader::findExportedSymbolInDependentImages(const char* name, ImageLoader** foundIn) const
+{
+ std::set<const ImageLoader*> dontSearchImages;
+ dontSearchImages.insert(this); // don't search this image
+ return this->findExportedSymbolInDependentImagesExcept(name, dontSearchImages, foundIn);
+}
+
+const ImageLoader::Symbol* ImageLoader::findExportedSymbolInImageOrDependentImages(const char* name, ImageLoader** foundIn) const
+{
+ std::set<const ImageLoader*> dontSearchImages;
+ return this->findExportedSymbolInDependentImagesExcept(name, dontSearchImages, foundIn);
+}
+
+
+void ImageLoader::link(const LinkContext& context, BindingLaziness bindness, InitializerRunning inits, uint32_t notifyCount)
+{
uint64_t t1 = mach_absolute_time();
- context.clearAllDepths();
- this->recursiveUpdateDepth(context.imageCount());
-
+ this->recursiveLoadLibraries(context);
+
uint64_t t2 = mach_absolute_time();
this->recursiveRebase(context);
- context.notifyBatch(dyld_image_state_rebased);
uint64_t t3 = mach_absolute_time();
- this->recursiveBind(context, forceLazysBound);
- context.notifyBatch(dyld_image_state_bound);
-
+ this->recursiveBind(context, bindness);
+
uint64_t t4 = mach_absolute_time();
- std::vector<DOFInfo> dofs;
- this->recursiveGetDOFSections(context, dofs);
- context.registerDOFs(dofs);
-
-
- fgTotalLoadLibrariesTime += t1 - t0;
+ this->recursiveImageNotification(context, notifyCount);
+
+ if ( (inits == kRunInitializers) || (inits == kDontRunInitializersButTellObjc) ) {
+ std::vector<ImageLoader*> newImages;
+ this->recursiveImageAnnouncement(context, newImages); // build bottom up list images being added
+ context.notifyAdding(newImages); // tell gdb or anyone who cares about these
+ }
+
+ uint64_t t5 = mach_absolute_time();
+ if ( inits == kRunInitializers ) {
+ this->recursiveInitialization(context);
+ uint64_t t6 = mach_absolute_time();
+ fgTotalInitTime += t6 - t5;
+ }
+ fgTotalLoadLibrariesTime += t2 - t1;
fgTotalRebaseTime += t3 - t2;
fgTotalBindTime += t4 - t3;
-
- // done with initial dylib loads
- Segment::fgNextPIEDylibAddress = 0;
-}
-
-
-void ImageLoader::printReferenceCounts()
-{
- dyld::log(" dlopen=%d, static=%d, dynamic=%d for %s\n",
- fDlopenReferenceCount, fStaticReferenceCount, fDynamicReferenceCount, getPath() );
-}
-
-
-bool ImageLoader::decrementDlopenReferenceCount()
-{
- if ( fDlopenReferenceCount == 0 )
- return true;
- --fDlopenReferenceCount;
- return false;
-}
-
+ fgTotalNotifyTime += t5 - t4;
+}
+
+
+// only called pre-main on main executable
+// if crt.c is ever cleaned up, this could go away
void ImageLoader::runInitializers(const LinkContext& context)
{
-#if IMAGE_NOTIFY_SUPPORT
- ImageLoader* newImages[context.imageCount()];
- ImageLoader** end = newImages;
- this->recursiveImageAnnouncement(context, end); // build bottom up list images being added
- context.notifyAdding(newImages, end-newImages); // tell anyone who cares about these
-#endif
-
- uint64_t t1 = mach_absolute_time();
- this->recursiveInitialization(context, mach_thread_self());
- context.notifyBatch(dyld_image_state_initialized);
- uint64_t t2 = mach_absolute_time();
- fgTotalInitTime += (t2 - t1);
-}
-
-
-void ImageLoader::bindAllLazyPointers(const LinkContext& context, bool recursive)
-{
- if ( ! fAllLazyPointersBound ) {
- fAllLazyPointersBound = true;
-
- if ( recursive ) {
- // bind lower level libraries first
- for(unsigned int i=0; i < fLibrariesCount; ++i){
- DependentLibrary& libInfo = fLibraries[i];
- if ( libInfo.image != NULL )
- libInfo.image->bindAllLazyPointers(context, recursive);
- }
- }
- // bind lazys in this image
- this->doBind(context, true);
- }
+ std::vector<ImageLoader*> newImages;
+ this->recursiveImageAnnouncement(context, newImages); // build bottom up list images being added
+ context.notifyAdding(newImages); // tell gdb or anyone who cares about these
+
+ this->recursiveInitialization(context);
+}
+
+// called inside _dyld_register_func_for_add_image()
+void ImageLoader::runNotification(const LinkContext& context, uint32_t notifyCount)
+{
+ this->recursiveImageNotification(context, notifyCount);
}
intptr_t ImageLoader::assignSegmentAddresses(const LinkContext& context)
{
// preflight and calculate slide if needed
+ const unsigned int segmentCount = fSegments.size();
intptr_t slide = 0;
if ( this->segmentsCanSlide() && this->segmentsMustSlideTogether() ) {
bool needsToSlide = false;
uintptr_t lowAddr = UINTPTR_MAX;
uintptr_t highAddr = 0;
- for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
- Segment* seg = *it;
+ for(unsigned int i=0; i < segmentCount; ++i){
+ Segment* seg = fSegments[i];
const uintptr_t segLow = seg->getPreferredLoadAddress();
- const uintptr_t segHigh = (segLow + seg->getSize() + 4095) & -4096;
+ const uintptr_t segHigh = segLow + seg->getSize();
if ( segLow < lowAddr )
lowAddr = segLow;
if ( segHigh > highAddr )
highAddr = segHigh;
- if ( !seg->hasPreferredLoadAddress() || !Segment::reserveAddressRange(seg->getPreferredLoadAddress(), seg->getSize()) )
+ if ( context.slideAndPackDylibs || !seg->hasPreferredLoadAddress() || !Segment::reserveAddressRange(seg->getPreferredLoadAddress(), seg->getSize()) )
needsToSlide = true;
}
if ( needsToSlide ) {
@@ -505,8 +394,8 @@
}
}
else if ( ! this->segmentsCanSlide() ) {
- for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
- Segment* seg = *it;
+ for(unsigned int i=0; i < segmentCount; ++i){
+ Segment* seg = fSegments[i];
if ( strcmp(seg->getName(), "__PAGEZERO") == 0 )
continue;
if ( !Segment::reserveAddressRange(seg->getPreferredLoadAddress(), seg->getSize()) )
@@ -523,35 +412,42 @@
void ImageLoader::mapSegments(int fd, uint64_t offsetInFat, uint64_t lenInFat, uint64_t fileLen, const LinkContext& context)
{
if ( context.verboseMapping )
- dyld::log("dyld: Mapping %s\n", this->getPath());
+ fprintf(stderr, "dyld: Mapping %s\n", this->getPath());
// find address range for image
intptr_t slide = this->assignSegmentAddresses(context);
// map in all segments
- for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
- Segment* seg = *it;
- seg->map(fd, offsetInFat, slide, this, context);
+ const unsigned int segmentCount = fSegments.size();
+ for(unsigned int i=0; i < segmentCount; ++i){
+ Segment* seg = fSegments[i];
+ seg->map(fd, offsetInFat, slide, context);
}
// update slide to reflect load location
this->setSlide(slide);
+
+ // now that it is mapped and slide is set, mark that we should unmap it when done
+ for(unsigned int i=0; i < segmentCount; ++i){
+ fSegments[i]->setUnMapWhenDestructed(true);
+ }
}
void ImageLoader::mapSegments(const void* memoryImage, uint64_t imageLen, const LinkContext& context)
{
if ( context.verboseMapping )
- dyld::log("dyld: Mapping memory %p\n", memoryImage);
+ fprintf(stderr, "dyld: Mapping memory %p\n", memoryImage);
// find address range for image
intptr_t slide = this->assignSegmentAddresses(context);
// map in all segments
- for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
- Segment* seg = *it;
- seg->map(memoryImage, slide, this, context);
+ const unsigned int segmentCount = fSegments.size();
+ for(unsigned int i=0; i < segmentCount; ++i){
+ Segment* seg = fSegments[i];
+ seg->map(memoryImage, slide, context);
}
// update slide to reflect load location
this->setSlide(slide);
// set R/W permissions on all segments at slide location
- for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
- Segment* seg = *it;
- seg->setPermissions(context, this);
+ for(unsigned int i=0; i < segmentCount; ++i){
+ Segment* seg = fSegments[i];
+ seg->setPermissions();
}
}
@@ -561,81 +457,35 @@
}
-unsigned int ImageLoader::recursiveUpdateDepth(unsigned int maxDepth)
-{
- // the purpose of this phase is to make the images sortable such that
- // in a sort list of images, every image that an image depends on
- // occurs in the list before it.
- if ( fDepth == 0 ) {
+void ImageLoader::recursiveLoadLibraries(const LinkContext& context)
+{
+ if ( ! fLibrariesLoaded ) {
// break cycles
- fDepth = maxDepth;
-
- // get depth of dependents
- unsigned int minDependentDepth = maxDepth;
- for(unsigned int i=0; i < fLibrariesCount; ++i) {
- DependentLibrary& libInfo = fLibraries[i];
- if ( libInfo.image != NULL ) {
- unsigned int d = libInfo.image->recursiveUpdateDepth(maxDepth);
- if ( d < minDependentDepth )
- minDependentDepth = d;
- }
- }
-
- // make me less deep then all my dependents
- fDepth = minDependentDepth - 1;
- }
-
- return fDepth;
-}
-
-
-void ImageLoader::recursiveLoadLibraries(const LinkContext& context, const RPathChain& loaderRPaths)
-{
- if ( fState < dyld_image_state_dependents_mapped ) {
- // break cycles
- fState = dyld_image_state_dependents_mapped;
+ fLibrariesLoaded = true;
// get list of libraries this image needs
fLibrariesCount = this->doGetDependentLibraryCount();
fLibraries = new DependentLibrary[fLibrariesCount];
- bzero(fLibraries, sizeof(DependentLibrary)*fLibrariesCount);
- DependentLibraryInfo libraryInfos[fLibrariesCount];
- this->doGetDependentLibraries(libraryInfos);
-
- // get list of rpaths that this image adds
- std::vector<const char*> rpathsFromThisImage;
- this->getRPaths(context, rpathsFromThisImage);
- const RPathChain thisRPaths(&loaderRPaths, &rpathsFromThisImage);
+ this->doGetDependentLibraries(fLibraries);
// try to load each
bool canUsePrelinkingInfo = true;
for(unsigned int i=0; i < fLibrariesCount; ++i){
DependentLibrary& requiredLib = fLibraries[i];
- DependentLibraryInfo& requiredLibInfo = libraryInfos[i];
try {
- bool depNamespace = false;
- requiredLib.image = context.loadLibrary(requiredLibInfo.name, true, depNamespace, this->getPath(), &thisRPaths);
+ requiredLib.image = context.loadLibrary(requiredLib.name, true, this->getPath(), NULL);
if ( requiredLib.image == this ) {
// found circular reference, perhaps DYLD_LIBARY_PATH is causing this rdar://problem/3684168
- requiredLib.image = context.loadLibrary(requiredLibInfo.name, false, depNamespace, NULL, NULL);
+ requiredLib.image = context.loadLibrary(requiredLib.name, false, NULL, NULL);
if ( requiredLib.image != this )
- dyld::warn("DYLD_ setting caused circular dependency in %s\n", this->getPath());
+ fprintf(stderr, "dyld: warning DYLD_ setting caused circular dependency in %s\n", this->getPath());
}
- if ( fNeverUnload )
- requiredLib.image->setNeverUnload();
- requiredLib.image->fStaticReferenceCount += 1;
LibraryInfo actualInfo = requiredLib.image->doGetLibraryInfo();
- requiredLib.required = requiredLibInfo.required;
- requiredLib.checksumMatches = ( actualInfo.checksum == requiredLibInfo.info.checksum );
- requiredLib.isReExported = requiredLibInfo.reExported;
- if ( ! requiredLib.isReExported ) {
- requiredLib.isSubFramework = requiredLib.image->isSubframeworkOf(context, this);
- requiredLib.isReExported = requiredLib.isSubFramework || this->hasSubLibrary(context, requiredLib.image);
- }
+ requiredLib.checksumMatches = ( actualInfo.checksum == requiredLib.info.checksum );
// check found library version is compatible
- if ( actualInfo.minVersion < requiredLibInfo.info.minVersion ) {
- 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,
+ if ( actualInfo.minVersion < requiredLib.info.minVersion ) {
+ throwf("Incompatible library version: %s requires version %d.%d.%d or later, but %s provides version %d.%d.%d",
+ this->getShortName(), requiredLib.info.minVersion >> 16, (requiredLib.info.minVersion >> 8) & 0xff, requiredLib.info.minVersion & 0xff,
requiredLib.image->getShortName(), actualInfo.minVersion >> 16, (actualInfo.minVersion >> 8) & 0xff, actualInfo.minVersion & 0xff);
}
// prebinding for this image disabled if any dependent library changed or slid
@@ -643,8 +493,7 @@
canUsePrelinkingInfo = false;
//if ( context.verbosePrebinding ) {
// if ( !requiredLib.checksumMatches )
- // fprintf(stderr, "dyld: checksum mismatch, (%u v %u) for %s referencing %s\n",
- // requiredLibInfo.info.checksum, actualInfo.checksum, this->getPath(), requiredLib.image->getPath());
+ // fprintf(stderr, "dyld: checksum mismatch, (%lld v %lld) for %s referencing %s\n", requiredLib.info.checksum, actualInfo.checksum, this->getPath(), requiredLib.image->getPath());
// if ( requiredLib.image->getSlide() != 0 )
// fprintf(stderr, "dyld: dependent library slid for %s referencing %s\n", this->getPath(), requiredLib.image->getPath());
//}
@@ -652,9 +501,13 @@
catch (const char* msg) {
//if ( context.verbosePrebinding )
// fprintf(stderr, "dyld: exception during processing for %s referencing %s\n", this->getPath(), requiredLib.image->getPath());
- if ( requiredLibInfo.required ) {
- fState = dyld_image_state_mapped;
- dyld::throwf("Library not loaded: %s\n Referenced from: %s\n Reason: %s", requiredLibInfo.name, this->getPath(), msg);
+ if ( requiredLib.required ) {
+ const char* formatString = "Library not loaded: %s\n Referenced from: %s\n Reason: %s";
+ const char* referencedFrom = this->getPath();
+ char buf[strlen(requiredLib.name)+strlen(referencedFrom)+strlen(formatString)+strlen(msg)+2];
+ sprintf(buf, formatString, requiredLib.name, referencedFrom, msg);
+ fLibrariesLoaded = false;
+ throw strdup(buf); // this is a leak if exception doesn't halt program
}
// ok if weak library not found
requiredLib.image = NULL;
@@ -665,9 +518,13 @@
// tell each to load its dependents
for(unsigned int i=0; i < fLibrariesCount; ++i){
- DependentLibrary& lib = fLibraries[i];
- if ( lib.image != NULL ) {
- lib.image->recursiveLoadLibraries(context, thisRPaths);
+ DependentLibrary& libInfo = fLibraries[i];
+ if ( libInfo.image != NULL ) {
+ libInfo.isSubFramework = libInfo.image->isSubframeworkOf(context, this);
+ libInfo.isReExported = libInfo.isSubFramework || this->hasSubLibrary(context, libInfo.image);
+ //if ( libInfo.isReExported )
+ // fprintf(stderr, "%s re-exports %s\n", strrchr(this->getPath(), '/'), strrchr(libInfo.image->getPath(),'/'));
+ libInfo.image->recursiveLoadLibraries(context);
}
}
@@ -682,20 +539,14 @@
}
}
- // free rpaths (getRPaths() malloc'ed each string)
- for(std::vector<const char*>::iterator it=rpathsFromThisImage.begin(); it != rpathsFromThisImage.end(); ++it) {
- const char* str = *it;
- free((void*)str);
- }
-
}
}
void ImageLoader::recursiveRebase(const LinkContext& context)
{
- if ( fState < dyld_image_state_rebased ) {
+ if ( ! fBased ) {
// break cycles
- fState = dyld_image_state_rebased;
+ fBased = true;
try {
// rebase lower level libraries first
@@ -707,58 +558,101 @@
// rebase this image
doRebase(context);
-
- // notify
- context.notifySingle(dyld_image_state_rebased, this->machHeader(), fPath, fLastModified);
}
catch (const char* msg) {
// this image is not rebased
- fState = dyld_image_state_dependents_mapped;
- throw;
- }
- }
-}
-
-
-
-
-void ImageLoader::recursiveBind(const LinkContext& context, bool forceLazysBound)
-{
- // Normally just non-lazy pointers are bound immediately.
- // The exceptions are:
- // 1) DYLD_BIND_AT_LAUNCH will cause lazy pointers to be bound immediately
- // 2) some API's (e.g. RTLD_NOW) can cause lazy pointers to be bound immediately
- if ( fState < dyld_image_state_bound ) {
+ fBased = false;
+ throw msg;
+ }
+ }
+}
+
+
+
+
+void ImageLoader::recursiveBind(const LinkContext& context, BindingLaziness bindness)
+{
+ // normally just non-lazy pointers are bound up front,
+ // but DYLD_BIND_AT_LAUNCH will cause lazy pointers to be bound up from
+ // and some dyld API's bind all lazys at runtime
+ bool nonLazy = false;
+ bool lazy = false;
+ switch( bindness ) {
+ case kNonLazyOnly:
+ nonLazy = true;
+ break;
+ case kLazyAndNonLazy:
+ nonLazy = true;
+ lazy = true;
+ break;
+ case kLazyOnly:
+ case kLazyOnlyNoDependents:
+ lazy = true;
+ break;
+ }
+ const bool doNonLazy = nonLazy && !fBoundAllNonLazy;
+ const bool doLazy = lazy && !fBoundAllLazy;
+ if ( doNonLazy || doLazy ) {
// break cycles
- fState = dyld_image_state_bound;
-
+ bool oldBoundAllNonLazy = fBoundAllNonLazy;
+ bool oldBoundAllLazy = fBoundAllLazy;
+ fBoundAllNonLazy = fBoundAllNonLazy || nonLazy;
+ fBoundAllLazy = fBoundAllLazy || lazy;
+
try {
// bind lower level libraries first
- for(unsigned int i=0; i < fLibrariesCount; ++i){
- DependentLibrary& libInfo = fLibraries[i];
- if ( libInfo.image != NULL )
- libInfo.image->recursiveBind(context, forceLazysBound);
+ if ( bindness != kLazyOnlyNoDependents ) {
+ for(unsigned int i=0; i < fLibrariesCount; ++i){
+ DependentLibrary& libInfo = fLibraries[i];
+ if ( libInfo.image != NULL )
+ libInfo.image->recursiveBind(context, bindness);
+ }
}
// bind this image
- this->doBind(context, forceLazysBound);
- this->doUpdateMappingPermissions(context);
- // mark if lazys are also bound
- if ( forceLazysBound || this->usablePrebinding(context) )
- fAllLazyPointersBound = true;
-
- context.notifySingle(dyld_image_state_bound, this->machHeader(), fPath, fLastModified);
+ if ( doLazy && !doNonLazy )
+ doBind(context, kLazyOnly);
+ else if ( !doLazy && doNonLazy )
+ doBind(context, kNonLazyOnly);
+ else
+ doBind(context, kLazyAndNonLazy);
}
catch (const char* msg) {
// restore state
- fState = dyld_image_state_rebased;
- throw;
- }
- }
-}
-
-
-#if IMAGE_NOTIFY_SUPPORT
-void ImageLoader::recursiveImageAnnouncement(const LinkContext& context, ImageLoader**& newImages)
+ fBoundAllNonLazy = oldBoundAllNonLazy;
+ fBoundAllLazy = oldBoundAllLazy;
+ throw msg;
+ }
+ }
+}
+
+//
+// This is complex because _dyld_register_func_for_add_image() is defined to not only
+// notify you of future image loads, but also of all currently loaded images. Therefore
+// each image needs to track that all add-image-funcs have been notified about it.
+// Since add-image-funcs cannot be removed, each has a unique index and each image
+// records the thru which index notificiation has already been done.
+//
+void ImageLoader::recursiveImageNotification(const LinkContext& context, uint32_t addImageCount)
+{
+ if ( fNextAddImageIndex < addImageCount ) {
+ // break cycles
+ const uint32_t initIndex = fNextAddImageIndex;
+ fNextAddImageIndex = addImageCount;
+
+ // notify all requestors about this image
+ context.imageNotification(this, initIndex);
+
+ // notify about lower level libraries first
+ for(unsigned int i=0; i < fLibrariesCount; ++i){
+ DependentLibrary& libInfo = fLibraries[i];
+ if ( libInfo.image != NULL )
+ libInfo.image->recursiveImageNotification(context, addImageCount);
+ }
+ }
+}
+
+
+void ImageLoader::recursiveImageAnnouncement(const LinkContext& context, std::vector<ImageLoader*>& newImages)
{
if ( ! fAnnounced ) {
// break cycles
@@ -771,110 +665,195 @@
libInfo.image->recursiveImageAnnouncement(context, newImages);
}
- // add to list of images to notify about
- *newImages++ = this;
- //dyld::log("next size = %d\n", newImages.size());
+ // add to list of images to notify gdb about
+ newImages.push_back(this);
+ //fprintf(stderr, "next size = %d\n", newImages.size());
// remember that this image wants to be notified about other images
if ( this->hasImageNotification() )
context.addImageNeedingNotification(this);
}
}
-#endif
-
-void ImageLoader::recursiveGetDOFSections(const LinkContext& context, std::vector<DOFInfo>& dofs)
-{
- if ( ! fRegisteredDOF ) {
+
+
+
+void ImageLoader::recursiveInitialization(const LinkContext& context)
+{
+ if ( ! fInitialized ) {
// break cycles
- fRegisteredDOF = true;
-
- // gather lower level libraries first
- for(unsigned int i=0; i < fLibrariesCount; ++i){
- DependentLibrary& libInfo = fLibraries[i];
- if ( libInfo.image != NULL )
- libInfo.image->recursiveGetDOFSections(context, dofs);
- }
- this->doGetDOFSections(context, dofs);
- }
-}
-
-
-void ImageLoader::recursiveSpinLock(recursive_lock& rlock)
-{
- // try to set image's ivar fInitializerRecursiveLock to point to this lock_info
- // keep trying until success (spin)
- 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;
- }
- ++(fInitializerRecursiveLock->count);
-}
-
-void ImageLoader::recursiveSpinUnLock()
-{
- if ( --(fInitializerRecursiveLock->count) == 0 )
- fInitializerRecursiveLock = NULL;
-}
-
-
-void ImageLoader::recursiveInitialization(const LinkContext& context, mach_port_t this_thread)
-{
-#if RECURSIVE_INITIALIZER_LOCK
- recursive_lock lock_info(this_thread);
- recursiveSpinLock(lock_info);
-#else
- _spin_lock(&fInitializerLock);
-#endif
-
- if ( fState < dyld_image_state_dependents_initialized-1 ) {
- uint8_t oldState = fState;
- // break cycles
- fState = dyld_image_state_dependents_initialized-1;
+ fInitialized = true;
try {
// initialize lower level libraries first
for(unsigned int i=0; i < fLibrariesCount; ++i){
DependentLibrary& libInfo = fLibraries[i];
- // don't try to initialize stuff "above" me
- if ( (libInfo.image != NULL) && (libInfo.image->fDepth >= fDepth) )
- libInfo.image->recursiveInitialization(context, this_thread);
+ if ( libInfo.image != NULL )
+ libInfo.image->recursiveInitialization(context);
}
// record termination order
if ( this->needsTermination() )
context.terminationRecorder(this);
- // let objc know we are about to initalize this image
- fState = dyld_image_state_dependents_initialized;
- oldState = fState;
- context.notifySingle(dyld_image_state_dependents_initialized, this->machHeader(), fPath, fLastModified);
-
// initialize this image
this->doInitialization(context);
- // let anyone know we finished initalizing this image
- fState = dyld_image_state_initialized;
- oldState = fState;
- context.notifySingle(dyld_image_state_initialized, this->machHeader(), fPath, fLastModified);
}
catch (const char* msg) {
// this image is not initialized
- fState = oldState;
- #if RECURSIVE_INITIALIZER_LOCK
- recursiveSpinUnLock();
- #else
- _spin_unlock(&fInitializerLock);
- #endif
- throw;
- }
- }
-
-#if RECURSIVE_INITIALIZER_LOCK
- recursiveSpinUnLock();
-#else
- _spin_unlock(&fInitializerLock);
-#endif
+ fInitialized = false;
+ throw msg;
+ }
+ }
+}
+
+void ImageLoader::reprebindCommit(const LinkContext& context, bool commit, bool unmapOld)
+{
+ // do nothing on unprebound images
+ if ( ! this->isPrebindable() )
+ return;
+
+ // do nothing if prebinding is up to date
+ if ( this->usablePrebinding(context) )
+ return;
+
+ // make sure we are not replacing a symlink with a file
+ char realFilePath[PATH_MAX];
+ if ( realpath(this->getPath(), realFilePath) == NULL ) {
+ throwf("realpath() failed on %s, errno=%d", this->getPath(), errno);
+ }
+ // recreate temp file name
+ char tempFilePath[strlen(realFilePath)+strlen("_redoprebinding")+2];
+ ImageLoader::addSuffix(realFilePath, "_redoprebinding", tempFilePath);
+
+ if ( commit ) {
+ // all files successfully reprebound, so do swap
+ int result = rename(tempFilePath, realFilePath);
+ if ( result != 0 ) {
+ // if there are two dylibs with the same install path, the second will fail to prebind
+ // because the _redoprebinding temp file is gone. In that case, log and go on.
+ if ( errno == ENOENT )
+ fprintf(stderr, "update_prebinding: temp file missing: %s\n", tempFilePath);
+ else
+ throwf("can't swap temporary re-prebound file: rename(%s,%s) returned errno=%d", tempFilePath, realFilePath, errno);
+ }
+ else if ( unmapOld ) {
+ this->prebindUnmap(context);
+ }
+ }
+ else {
+ // something went wrong during prebinding, delete the temp files
+ unlink(tempFilePath);
+ }
+}
+
+uint64_t ImageLoader::reprebind(const LinkContext& context, time_t timestamp)
+{
+ // do nothing on unprebound images
+ if ( ! this->isPrebindable() )
+ return INT64_MAX;
+
+ // do nothing if prebinding is up to date
+ if ( this->usablePrebinding(context) ) {
+ if ( context.verbosePrebinding )
+ fprintf(stderr, "dyld: no need to re-prebind: %s\n", this->getPath());
+ return INT64_MAX;
+ }
+ // recreate temp file name
+ char realFilePath[PATH_MAX];
+ if ( realpath(this->getPath(), realFilePath) == NULL ) {
+ throwf("realpath() failed on %s, errno=%d", this->getPath(), errno);
+ }
+ char tempFilePath[strlen(realFilePath)+strlen("_redoprebinding")+2];
+ ImageLoader::addSuffix(realFilePath, "_redoprebinding", tempFilePath);
+
+ // make copy of file and map it in
+ uint8_t* fileToPrebind;
+ uint64_t fileToPrebindSize;
+ uint64_t freespace = this->copyAndMap(tempFilePath, &fileToPrebind, &fileToPrebindSize);
+
+ // do format specific prebinding
+ this->doPrebinding(context, timestamp, fileToPrebind);
+
+ // flush and swap files
+ int result = msync(fileToPrebind, fileToPrebindSize, MS_ASYNC);
+ if ( result != 0 )
+ throw "error syncing re-prebound file";
+ result = munmap(fileToPrebind, fileToPrebindSize);
+ if ( result != 0 )
+ throw "error unmapping re-prebound file";
+
+ // log
+ if ( context.verbosePrebinding )
+ fprintf(stderr, "dyld: re-prebound: %p %s\n", this->machHeader(), this->getPath());
+
+ return freespace;
+}
+
+uint64_t ImageLoader::copyAndMap(const char* tempFile, uint8_t** fileToPrebind, uint64_t* fileToPrebindSize)
+{
+ // reopen dylib
+ int src = open(this->getPath(), O_RDONLY);
+ if ( src == -1 )
+ throw "can't open image";
+ struct stat stat_buf;
+ if ( fstat(src, &stat_buf) == -1)
+ throw "can't stat image";
+ if ( stat_buf.st_mtime != fLastModified )
+ throw "image file changed since it was loaded";
+
+ // create new file with all same permissions to hold copy of dylib
+ unlink(tempFile);
+ int dst = open(tempFile, O_CREAT | O_RDWR | O_TRUNC, stat_buf.st_mode);
+ if ( dst == -1 )
+ throw "can't create temp image";
+
+ // mark source as "don't cache"
+ (void)fcntl(src, F_NOCACHE, 1);
+ // we want to cache the dst because we are about to map it in and modify it
+
+ // copy permission bits
+ if ( chmod(tempFile, stat_buf.st_mode & 07777) == -1 )
+ throwf("can't chmod temp image. errno=%d for %s", errno, this->getPath());
+ if ( chown(tempFile, stat_buf.st_uid, stat_buf.st_gid) == -1)
+ throwf("can't chown temp image. errno=%d for %s", errno, this->getPath());
+
+ // copy contents
+ ssize_t len;
+ const uint32_t kBufferSize = 128*1024;
+ static uint8_t* buffer = NULL;
+ if ( buffer == NULL ) {
+ vm_address_t addr = 0;
+ if ( vm_allocate(mach_task_self(), &addr, kBufferSize, true /*find range*/) == KERN_SUCCESS )
+ buffer = (uint8_t*)addr;
+ else
+ throw "can't allcoate copy buffer";
+ }
+ while ( (len = read(src, buffer, kBufferSize)) > 0 ) {
+ if ( write(dst, buffer, len) == -1 )
+ throwf("write failure copying dylib errno=%d for %s", errno, this->getPath());
+ }
+
+ // map in dst file
+ *fileToPrebindSize = stat_buf.st_size - fOffsetInFatFile; // this may map in too much, but it does not matter
+ *fileToPrebind = (uint8_t*)mmap(NULL, *fileToPrebindSize, PROT_READ | PROT_WRITE, MAP_FILE | MAP_SHARED, dst, fOffsetInFatFile);
+ if ( *fileToPrebind == (uint8_t*)(-1) )
+ throw "can't mmap temp image";
+
+ // get free space remaining on dst volume
+ struct statfs statfs_buf;
+ if ( fstatfs(dst, &statfs_buf) != 0 )
+ throwf("can't fstatfs(), errno=%d for %s", errno, tempFile);
+ uint64_t freespace = (uint64_t)statfs_buf.f_bavail * (uint64_t)statfs_buf.f_bsize;
+
+ // closing notes:
+ // ok to close file after mapped in
+ // ok to throw above without closing file because the throw will terminate update_prebinding
+ int result1 = close(dst);
+ int result2 = close(src);
+ if ( (result1 != 0) || (result2 != 0) )
+ throw "can't close file";
+
+ return freespace;
}
@@ -884,7 +863,7 @@
if ( sUnitsPerSecond == 0 ) {
struct mach_timebase_info timeBaseInfo;
if ( mach_timebase_info(&timeBaseInfo) == KERN_SUCCESS ) {
- sUnitsPerSecond = 1000000000ULL * timeBaseInfo.denom / timeBaseInfo.numer;
+ sUnitsPerSecond = timeBaseInfo.denom;
}
}
if ( partTime < sUnitsPerSecond ) {
@@ -892,62 +871,49 @@
uint32_t milliSeconds = milliSecondsTimeTen/10;
uint32_t percentTimesTen = (partTime*1000)/totalTime;
uint32_t percent = percentTimesTen/10;
- dyld::log("%s: %u.%u milliseconds (%u.%u%%)\n", msg, milliSeconds, milliSecondsTimeTen-milliSeconds*10, percent, percentTimesTen-percent*10);
+ fprintf(stderr, "%s: %u.%u milliseconds (%u.%u%%)\n", msg, milliSeconds, milliSecondsTimeTen-milliSeconds*10, percent, percentTimesTen-percent*10);
}
else {
uint32_t secondsTimeTen = (partTime*10)/sUnitsPerSecond;
- uint32_t seconds = secondsTimeTen/10;
+ uint32_t seconds = secondsTimeTen/100;
uint32_t percentTimesTen = (partTime*1000)/totalTime;
uint32_t percent = percentTimesTen/10;
- dyld::log("%s: %u.%u seconds (%u.%u%%)\n", msg, seconds, secondsTimeTen-seconds*10, percent, percentTimesTen-percent*10);
+ fprintf(stderr, "%s: %u.%u seconds (%u.%u%%)\n", msg, seconds, secondsTimeTen-seconds*10, percent, percentTimesTen-percent*10);
}
}
static char* commatize(uint64_t in, char* out)
{
- uint64_t div10 = in / 10;
- uint8_t delta = in - div10*10;
- char* s = &out[32];
- int digitCount = 1;
- *s = '\0';
- *(--s) = '0' + delta;
- in = div10;
- while ( in != 0 ) {
- if ( (digitCount % 3) == 0 )
- *(--s) = ',';
- div10 = in / 10;
- delta = in - div10*10;
- *(--s) = '0' + delta;
- in = div10;
- ++digitCount;
- }
- return s;
-}
-
+ char* result = out;
+ char rawNum[30];
+ sprintf(rawNum, "%llu", in);
+ const int rawNumLen = strlen(rawNum);
+ for(int i=0; i < rawNumLen-1; ++i) {
+ *out++ = rawNum[i];
+ if ( ((rawNumLen-i) % 3) == 1 )
+ *out++ = ',';
+ }
+ *out++ = rawNum[rawNumLen-1];
+ *out = '\0';
+ return result;
+}
void ImageLoader::printStatistics(unsigned int imageCount)
{
- uint64_t totalTime = fgTotalLoadLibrariesTime + fgTotalRebaseTime + fgTotalBindTime + fgTotalInitTime;
+ uint64_t totalTime = fgTotalLoadLibrariesTime + fgTotalRebaseTime + fgTotalBindTime + fgTotalNotifyTime + fgTotalInitTime;
char commaNum1[40];
char commaNum2[40];
printTime("total time", totalTime, totalTime);
- dyld::log("total images loaded: %d (%u from dyld shared cache, %u needed no fixups)\n", imageCount, fgImagesUsedFromSharedCache, fgImagesRequiringNoFixups);
- dyld::log("total segments mapped: %u, into %llu pages with %llu pages pre-fetched\n", fgTotalSegmentsMapped, fgTotalBytesMapped/4096, fgTotalBytesPreFetched/4096);
+ fprintf(stderr, "total images loaded: %d (%d used prebinding)\n", imageCount, fgImagesWithUsedPrebinding);
printTime("total images loading time", fgTotalLoadLibrariesTime, totalTime);
- dyld::log("total rebase fixups: %s\n", commatize(fgTotalRebaseFixups, commaNum1));
- printTime("total rebase fixups time", fgTotalRebaseTime, totalTime);
- dyld::log("total binding fixups: %s\n", commatize(fgTotalBindFixups, commaNum1));
- if ( fgTotalBindSymbolsResolved != 0 ) {
- uint32_t avgTimesTen = (fgTotalBindImageSearches * 10) / fgTotalBindSymbolsResolved;
- uint32_t avgInt = fgTotalBindImageSearches / fgTotalBindSymbolsResolved;
- uint32_t avgTenths = avgTimesTen - (avgInt*10);
- dyld::log("total binding symbol lookups: %s, average images searched per symbol: %u.%u\n",
- commatize(fgTotalBindSymbolsResolved, commaNum1), avgInt, avgTenths);
- }
+ fprintf(stderr, "total rebase fixups: %s\n", commatize(fgTotalRebaseFixups, commaNum1));
+ printTime("total rebase fixups time", fgTotalRebaseFixups, totalTime);
+ fprintf(stderr, "total binding fixups: %s\n", commatize(fgTotalBindFixups, commaNum1));
printTime("total binding fixups time", fgTotalBindTime, totalTime);
- dyld::log("total bindings lazily fixed up: %s of %s\n", commatize(fgTotalLazyBindFixups, commaNum1), commatize(fgTotalPossibleLazyBindFixups, commaNum2));
+ fprintf(stderr, "total bindings lazily fixed up: %s of %s\n", commatize(fgTotalLazyBindFixups, commaNum1), commatize(fgTotalPossibleLazyBindFixups, commaNum2));
+ printTime("total notify time time", fgTotalNotifyTime, totalTime);
printTime("total init time time", fgTotalInitTime, totalTime);
}
@@ -982,7 +948,7 @@
}
-void Segment::map(int fd, uint64_t offsetInFatWrapper, intptr_t slide, const ImageLoader* image, const ImageLoader::LinkContext& context)
+void Segment::map(int fd, uint64_t offsetInFatWrapper, intptr_t slide, const ImageLoader::LinkContext& context)
{
vm_offset_t fileOffset = this->getFileOffset() + offsetInFatWrapper;
vm_size_t size = this->getFileSize();
@@ -996,26 +962,15 @@
if ( this->writeable() )
protection |= PROT_WRITE;
}
-#if __i386__
- // initially map __IMPORT segments R/W so dyld can update them
- if ( this->readOnlyImportStubs() )
- protection |= PROT_WRITE;
-#endif
- // wholly zero-fill segments have nothing to mmap() in
- if ( size > 0 ) {
- void* loadAddress = mmap(requestedLoadAddress, size, protection, MAP_FIXED | MAP_PRIVATE, fd, fileOffset);
- if ( loadAddress == ((void*)(-1)) )
- dyld::throwf("mmap() error %d at address=0x%08lX, size=0x%08lX segment=%s in Segment::map() mapping %s", errno, (uintptr_t)requestedLoadAddress, (uintptr_t)size, this->getName(), image->getPath());
- }
- // update stats
- ++ImageLoader::fgTotalSegmentsMapped;
- ImageLoader::fgTotalBytesMapped += size;
+ void* loadAddress = mmap(requestedLoadAddress, size, protection, MAP_FILE | MAP_FIXED | MAP_PRIVATE, fd, fileOffset);
+ if ( loadAddress == ((void*)(-1)) )
+ throwf("mmap() error %d at address=0x%08lX, size=0x%08lX in Segment::map() mapping %s", errno, (uintptr_t)requestedLoadAddress, (uintptr_t)size, this->getImage()->getPath());
+
if ( context.verboseMapping )
- dyld::log("%18s at %p->%p with permissions %c%c%c\n", this->getName(), requestedLoadAddress, (char*)requestedLoadAddress+this->getFileSize()-1,
- (protection & PROT_READ) ? 'r' : '.', (protection & PROT_WRITE) ? 'w' : '.', (protection & PROT_EXEC) ? 'x' : '.' );
-}
-
-void Segment::map(const void* memoryImage, intptr_t slide, const ImageLoader* image, const ImageLoader::LinkContext& context)
+ fprintf(stderr, "%18s at %p->%p\n", this->getName(), loadAddress, (char*)loadAddress+this->getFileSize()-1);
+}
+
+void Segment::map(const void* memoryImage, intptr_t slide, const ImageLoader::LinkContext& context)
{
vm_address_t loadAddress = this->getPreferredLoadAddress() + slide;
vm_address_t srcAddr = (uintptr_t)memoryImage + this->getFileOffset();
@@ -1025,10 +980,10 @@
throw "can't map segment";
if ( context.verboseMapping )
- dyld::log("%18s at %p->%p\n", this->getName(), (char*)loadAddress, (char*)loadAddress+this->getFileSize()-1);
-}
-
-void Segment::setPermissions(const ImageLoader::LinkContext& context, const ImageLoader* image)
+ fprintf(stderr, "%18s at %p->%p\n", this->getName(), (char*)loadAddress, (char*)loadAddress+this->getFileSize()-1);
+}
+
+void Segment::setPermissions()
{
vm_prot_t protection = 0;
if ( !this->unaccessible() ) {
@@ -1039,33 +994,22 @@
if ( this->writeable() )
protection |= VM_PROT_WRITE;
}
- vm_address_t addr = this->getActualLoadAddress(image);
+ vm_address_t addr = this->getActualLoadAddress();
vm_size_t size = this->getSize();
const bool setCurrentPermissions = false;
kern_return_t r = vm_protect(mach_task_self(), addr, size, setCurrentPermissions, protection);
if ( r != KERN_SUCCESS )
throw "can't set vm permissions for mapped segment";
- if ( context.verboseMapping ) {
- dyld::log("%18s at %p->%p altered permissions to %c%c%c\n", this->getName(), (char*)addr, (char*)addr+this->getFileSize()-1,
- (protection & PROT_READ) ? 'r' : '.', (protection & PROT_WRITE) ? 'w' : '.', (protection & PROT_EXEC) ? 'x' : '.' );
- }
}
-void Segment::tempWritable(const ImageLoader::LinkContext& context, const ImageLoader* image)
-{
- vm_address_t addr = this->getActualLoadAddress(image);
+void Segment::tempWritable()
+{
+ vm_address_t addr = this->getActualLoadAddress();
vm_size_t size = this->getSize();
const bool setCurrentPermissions = false;
- vm_prot_t protection = VM_PROT_WRITE | VM_PROT_READ;
- if ( this->executable() )
- protection |= VM_PROT_EXECUTE;
- kern_return_t r = vm_protect(mach_task_self(), addr, size, setCurrentPermissions, protection);
+ kern_return_t r = vm_protect(mach_task_self(), addr, size, setCurrentPermissions, VM_PROT_WRITE | VM_PROT_READ);
if ( r != KERN_SUCCESS )
throw "can't set vm permissions for mapped segment";
- if ( context.verboseMapping ) {
- dyld::log("%18s at %p->%p altered permissions to %c%c%c\n", this->getName(), (char*)addr, (char*)addr+this->getFileSize()-1,
- (protection & PROT_READ) ? 'r' : '.', (protection & PROT_WRITE) ? 'w' : '.', (protection & PROT_EXEC) ? 'x' : '.' );
- }
}
@@ -1079,20 +1023,18 @@
{
vm_address_t addr = 0;
vm_size_t size = length;
- // in PIE programs, load initial dylibs after main executable so they don't have fixed addresses either
- if ( fgNextPIEDylibAddress != 0 ) {
- addr = fgNextPIEDylibAddress + (arc4random() & 0x3) * 4096; // add small random padding between dylibs
- kern_return_t r = vm_allocate(mach_task_self(), &addr, size, VM_FLAGS_FIXED);
- if ( r == KERN_SUCCESS ) {
- fgNextPIEDylibAddress = addr + size;
- return addr;
- }
- fgNextPIEDylibAddress = 0;
- }
- kern_return_t r = vm_allocate(mach_task_self(), &addr, size, VM_FLAGS_ANYWHERE);
- if ( r != KERN_SUCCESS )
- throw "out of address space";
-
+ if ( context.slideAndPackDylibs ) {
+ addr = (fgNextNonSplitSegAddress - length) & (-4096); // page align
+ kern_return_t r = vm_allocate(mach_task_self(), &addr, size, false /*use this range*/);
+ if ( r != KERN_SUCCESS )
+ throw "out of address space";
+ fgNextNonSplitSegAddress = addr;
+ }
+ else {
+ kern_return_t r = vm_allocate(mach_task_self(), &addr, size, true /*find range*/);
+ if ( r != KERN_SUCCESS )
+ throw "out of address space";
+ }
return addr;
}