Loading...
src/ImageLoader.cpp dyld-132.13 dyld-95.3
--- dyld/dyld-132.13/src/ImageLoader.cpp
+++ dyld/dyld-95.3/src/ImageLoader.cpp
@@ -37,12 +37,13 @@
 
 #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::fgImagesRequiringCoalescing = 0;
-uint32_t								ImageLoader::fgImagesHasWeakDefinitions = 0;
 uint32_t								ImageLoader::fgTotalRebaseFixups = 0;
 uint32_t								ImageLoader::fgTotalBindFixups = 0;
 uint32_t								ImageLoader::fgTotalBindSymbolsResolved = 0;
@@ -55,39 +56,60 @@
 uint64_t								ImageLoader::fgTotalLoadLibrariesTime;
 uint64_t								ImageLoader::fgTotalRebaseTime;
 uint64_t								ImageLoader::fgTotalBindTime;
-uint64_t								ImageLoader::fgTotalWeakBindTime;
-uint64_t								ImageLoader::fgTotalDOF;
 uint64_t								ImageLoader::fgTotalInitTime;
+uintptr_t								ImageLoader::fgNextSplitSegAddress = 0x90000000;
 uint16_t								ImageLoader::fgLoadOrdinal = 0;
-uintptr_t								ImageLoader::fgNextPIEDylibAddress = 0;
-
-
-
-ImageLoader::ImageLoader(const char* path, unsigned int libCount)
-	: fPath(path), fDevice(0), fInode(0), fLastModified(0), 
-	fPathHash(0), fDlopenReferenceCount(0), fStaticReferenceCount(0),
-	fDynamicReferenceCount(0), fDynamicReferences(NULL), fInitializerRecursiveLock(NULL), 
-	fDepth(0), fLoadOrder(0), fState(0), fLibraryCount(libCount), 
-	fAllLibraryChecksumsAndLoadAddressesMatch(false), fLeaveMapped(false), fNeverUnload(false),
-	fHideSymbols(false), fMatchByInstallName(false),
-	fRegisteredDOF(false), fAllLazyPointersBound(false), fBeingRemoved(false), fAddFuncNotified(false),
-	fPathOwnedByImage(false), fWeakSymbolsBound(false)
-{
+uintptr_t								Segment::fgNextPIEDylibAddress = 0;
+
+
+void ImageLoader::init(const char* path, uint64_t offsetInFat, dev_t device, ino_t inode, time_t modDate)
+{
+	fPathHash = 0;
+	fPath = path;
+	fLogicalPath = NULL;
+	fDevice = device;
+	fInode = inode;
+	fLastModified = modDate;
+	fOffsetInFatFile = offsetInFat;
+	fLibraries = NULL;
+	fLibrariesCount = 0;
+	fDlopenReferenceCount = 0;
+	fStaticReferenceCount = 0;
+	fDynamicReferenceCount = 0;
+	fDynamicReferences = NULL;
+	fDepth = 0;
+	fLoadOrder = fgLoadOrdinal++;
+	fState = 0;
+	fAllLibraryChecksumsAndLoadAddressesMatch = false;
+	fLeaveMapped = false;
+	fNeverUnload = false;
+	fHideSymbols = false;
+	fMatchByInstallName = false;
+	fRegisteredDOF = false;
+#if IMAGE_NOTIFY_SUPPORT
+	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);
 }
 
 
-void ImageLoader::deleteImage(ImageLoader* image)
-{
-	// this cannot be done in destructor because libImage() is implemented
-	// in a subclass
-	for(unsigned int i=0; i < image->libraryCount(); ++i) {
-		ImageLoader* lib = image->libImage(i);
-		if ( lib != NULL )
-			lib->fStaticReferenceCount--;
-	}
-	delete image;
+ImageLoader::ImageLoader(const char* path, uint64_t offsetInFat, const struct stat& info)
+{
+	init(path, offsetInFat, info.st_dev, info.st_ino, info.st_mtime);
+}
+
+ImageLoader::ImageLoader(const char* moduleName)
+{
+	init(moduleName, 0, 0, 0, 0);
 }
 
 
@@ -95,6 +117,15 @@
 {
 	if ( fPathOwnedByImage && (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--;
@@ -103,17 +134,10 @@
 	}
 }
 
-void ImageLoader::setFileInfo(dev_t device, ino_t inode, time_t modDate)
-{
-	fDevice = device;
-	fInode = inode;
-	fLastModified = modDate;
-}
-
 void ImageLoader::setMapped(const LinkContext& context)
 {
 	fState = dyld_image_state_mapped;
-	context.notifySingle(dyld_image_state_mapped, this);  // note: can throw exception
+	context.notifySingle(dyld_image_state_mapped, this->machHeader(), fPath, fLastModified);
 }
 
 void ImageLoader::addDynamicReference(const ImageLoader* target)
@@ -165,6 +189,29 @@
 	fPathHash = hash(fPath);
 }
 
+void ImageLoader::setLogicalPath(const char* path)
+{
+	if ( fPath == NULL ) {
+		// no physical path set yet, so use this path as physical
+		this->setPath(path);
+	}
+	else if ( strcmp(path, fPath) == 0 ) {
+		// do not set logical path because it is the same as the physical path
+		fLogicalPath = NULL;
+	}
+	else {
+		fLogicalPath = new char[strlen(path)+1];
+		strcpy((char*)fLogicalPath, path);
+	}
+}
+
+const char* ImageLoader::getLogicalPath() const
+{
+	if ( fLogicalPath != NULL )
+		return fLogicalPath;
+	else
+		return fPath;
+}
 
 uint32_t ImageLoader::hash(const char* path)
 {
@@ -203,6 +250,11 @@
 	return fPath; 
 }
 
+uint64_t ImageLoader::getOffsetInFatFile() const
+{
+	return fOffsetInFatFile;
+}
+
 void ImageLoader::setLeaveMapped()
 {
 	fLeaveMapped = true;
@@ -232,10 +284,11 @@
 {
 	if ( ! this->isLinked() )
 		return false;
-	for(unsigned int i=0, e=segmentCount(); i < e; ++i) {
-		const uint8_t* start = (const uint8_t*)segActualLoadAddress(i);
-		const uint8_t* end = (const uint8_t*)segActualEndAddress(i);
-		if ( (start <= addr) && (addr < end) && !segUnaccessible(i) )
+	for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
+		Segment* seg = *it;
+		const uint8_t* start = (const uint8_t*)seg->getActualLoadAddress(this);
+		const uint8_t* end = start + seg->getSize();
+		if ( (start <= addr) && (addr < end) && !seg->unaccessible() )
 			return true;
 	}
 	return false;
@@ -243,9 +296,10 @@
 
 bool ImageLoader::overlapsWithAddressRange(const void* start, const void* end) const
 {
-	for(unsigned int i=0, e=segmentCount(); i < e; ++i) {
-		const uint8_t* segStart = (const uint8_t*)segActualLoadAddress(i);
-		const uint8_t* segEnd = (const uint8_t*)segActualEndAddress(i);
+	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) )
@@ -258,10 +312,11 @@
 
 void ImageLoader::getMappedRegions(MappedRegion*& regions) const
 {
-	for(unsigned int i=0, e=segmentCount(); i < e; ++i) {
+	for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
+		Segment* seg = *it;
 		MappedRegion region;
-		region.address = segActualLoadAddress(i);
-		region.size = segSize(i);
+		region.address = seg->getActualLoadAddress(this);
+		region.size = seg->getSize();
 		*regions++ = region;
 	}
 }
@@ -284,25 +339,25 @@
 	
 	// search self
 	if ( notInImgageList(this, dsiStart, dsiCur) ) {
-		sym = this->findExportedSymbol(name, false, foundIn);
+		sym = this->findExportedSymbol(name, NULL, false, foundIn);
 		if ( sym != NULL )
 			return sym;
 		*dsiCur++ = this;
 	}
 
 	// search directly dependent libraries
-	for(unsigned int i=0; i < libraryCount(); ++i) {
-		ImageLoader* dependentImage = libImage(i);
+	for (uint32_t i=0; i < fLibrariesCount; ++i) {
+		ImageLoader* dependentImage = fLibraries[i].image;
 		if ( (dependentImage != NULL) && notInImgageList(dependentImage, dsiStart, dsiCur) ) {
-			const ImageLoader::Symbol* sym = dependentImage->findExportedSymbol(name, false, foundIn);
+			const ImageLoader::Symbol* sym = dependentImage->findExportedSymbol(name, NULL, false, foundIn);
 			if ( sym != NULL )
 				return sym;
 		}
 	}
 	
 	// search indirectly dependent libraries
-	for(unsigned int i=0; i < libraryCount(); ++i) {
-		ImageLoader* dependentImage = libImage(i);
+	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);
@@ -338,7 +393,7 @@
 	//dyld::log("ImageLoader::link(%s) refCount=%d, neverUnload=%d\n", this->getPath(), fStaticReferenceCount, fNeverUnload);
 	
 	uint64_t t0 = mach_absolute_time();
-	this->recursiveLoadLibraries(context, preflightOnly, loaderRPaths);
+	this->recursiveLoadLibraries(context,loaderRPaths);
 	context.notifyBatch(dyld_image_state_dependents_mapped);
 	
 	// we only do the loading step for preflights
@@ -355,26 +410,20 @@
 	
 	uint64_t t3 = mach_absolute_time();
  	this->recursiveBind(context, forceLazysBound);
-
-	uint64_t t4 = mach_absolute_time();
-	this->weakBind(context);
 	context.notifyBatch(dyld_image_state_bound);
 
-	uint64_t t5 = mach_absolute_time();	
+	uint64_t t4 = mach_absolute_time();	
 	std::vector<DOFInfo> dofs;
 	this->recursiveGetDOFSections(context, dofs);
 	context.registerDOFs(dofs);
-	uint64_t t6 = mach_absolute_time();	
 
 	
 	fgTotalLoadLibrariesTime += t1 - t0;
 	fgTotalRebaseTime += t3 - t2;
 	fgTotalBindTime += t4 - t3;
-	fgTotalWeakBindTime += t5 - t4;
-	fgTotalDOF += t6 - t5;
 	
 	// done with initial dylib loads
-	fgNextPIEDylibAddress = 0;
+	Segment::fgNextPIEDylibAddress = 0;
 }
 
 
@@ -395,11 +444,16 @@
 
 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();
-	mach_port_t this_thread = mach_thread_self();
-	this->recursiveInitialization(context, this_thread);
+	this->recursiveInitialization(context, mach_thread_self());
 	context.notifyBatch(dyld_image_state_initialized);
-	mach_port_deallocate(mach_task_self(), this_thread);
 	uint64_t t2 = mach_absolute_time();
 	fgTotalInitTime += (t2 - t1);
 }
@@ -412,17 +466,94 @@
 
 		if ( recursive ) {
 			// bind lower level libraries first
-			for(unsigned int i=0; i < libraryCount(); ++i) {
-				ImageLoader* dependentImage = libImage(i);
-				if ( dependentImage != NULL )
-					dependentImage->bindAllLazyPointers(context, recursive);
+			for(unsigned int i=0; i < fLibrariesCount; ++i){
+				DependentLibrary& libInfo = fLibraries[i];
+				if ( libInfo.image != NULL )
+					libInfo.image->bindAllLazyPointers(context, recursive);
 			}
 		}
-		// bind lazies in this image
-		this->doBindJustLazies(context);
-	}
-}
-
+		// bind lazys in this image
+		this->doBind(context, true);
+	}
+}
+
+
+intptr_t ImageLoader::assignSegmentAddresses(const LinkContext& context)
+{
+	// preflight and calculate slide if needed
+	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;
+			const uintptr_t segLow = seg->getPreferredLoadAddress();
+			const uintptr_t segHigh = (segLow + seg->getSize() + 4095) & -4096;
+			if ( segLow < lowAddr )
+				lowAddr = segLow;
+			if ( segHigh > highAddr )
+				highAddr = segHigh;
+				
+			if ( !seg->hasPreferredLoadAddress() || !Segment::reserveAddressRange(seg->getPreferredLoadAddress(), seg->getSize()) )
+				needsToSlide = true;
+		}
+		if ( needsToSlide ) {
+			// find a chunk of address space to hold all segments
+			uintptr_t addr = Segment::reserveAnAddressRange(highAddr-lowAddr, context);
+			slide = addr - lowAddr;
+		}
+	} 
+	else if ( ! this->segmentsCanSlide() ) {
+		for(ImageLoader::SegmentIterator it = this->beginSegments(); it != this->endSegments(); ++it ) {
+			Segment* seg = *it;
+			if ( strcmp(seg->getName(), "__PAGEZERO") == 0 )
+				continue;
+			if ( !Segment::reserveAddressRange(seg->getPreferredLoadAddress(), seg->getSize()) )
+				throw "can't map";
+		}
+	}
+	else {
+		// mach-o does not support independently sliding segments
+	}
+	return slide;
+}
+
+
+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());
+	// 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);		
+	}
+	// update slide to reflect load location			
+	this->setSlide(slide);
+}
+
+void ImageLoader::mapSegments(const void* memoryImage, uint64_t imageLen, const LinkContext& context)
+{
+	if ( context.verboseMapping )
+		dyld::log("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);		
+	}
+	// 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);		
+	}
+}
 
 bool ImageLoader::allDependentLibrariesAsWhenPreBound() const
 {
@@ -441,10 +572,10 @@
 		
 		// get depth of dependents
 		unsigned int minDependentDepth = maxDepth;
-		for(unsigned int i=0; i < libraryCount(); ++i) {
-			ImageLoader* dependentImage = libImage(i);
-			if ( dependentImage != NULL ) {
-				unsigned int d = dependentImage->recursiveUpdateDepth(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;
 			}
@@ -458,15 +589,17 @@
 }
 
 
-void ImageLoader::recursiveLoadLibraries(const LinkContext& context, bool preflightOnly, const RPathChain& loaderRPaths)
+void ImageLoader::recursiveLoadLibraries(const LinkContext& context, const RPathChain& loaderRPaths)
 {
 	if ( fState < dyld_image_state_dependents_mapped ) {
 		// break cycles
 		fState = dyld_image_state_dependents_mapped;
 		
 		// get list of libraries this image needs
-		//dyld::log("ImageLoader::recursiveLoadLibraries() %ld = %d*%ld\n", fLibrariesCount*sizeof(DependentLibrary), fLibrariesCount, sizeof(DependentLibrary));
-		DependentLibraryInfo libraryInfos[fLibraryCount]; 
+		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
@@ -476,85 +609,74 @@
 		
 		// try to load each
 		bool canUsePrelinkingInfo = true; 
-		for(unsigned int i=0; i < fLibraryCount; ++i){
-			ImageLoader* dependentLib;
-			bool depLibReExported = false;
-			bool depLibReRequired = false;
-			bool depLibCheckSumsMatch = false;
+		for(unsigned int i=0; i < fLibrariesCount; ++i){
+			DependentLibrary& requiredLib = fLibraries[i];
 			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);
-				continue;
-			}
-#endif
 			try {
-				dependentLib = context.loadLibrary(requiredLibInfo.name, true, this->getPath(), &thisRPaths);
-				if ( dependentLib == this ) {
+				bool depNamespace = false;
+				requiredLib.image = context.loadLibrary(requiredLibInfo.name, true, depNamespace, this->getPath(), &thisRPaths);
+				if ( requiredLib.image == this ) {
 					// found circular reference, perhaps DYLD_LIBARY_PATH is causing this rdar://problem/3684168 
-					dependentLib = context.loadLibrary(requiredLibInfo.name, false, NULL, NULL);
-					if ( dependentLib != this )
+					requiredLib.image = context.loadLibrary(requiredLibInfo.name, false, depNamespace, NULL, NULL);
+					if ( requiredLib.image != this )
 						dyld::warn("DYLD_ setting caused circular dependency in %s\n", this->getPath());
 				}
 				if ( fNeverUnload )
-					dependentLib->setNeverUnload();
-				dependentLib->fStaticReferenceCount += 1;
-				LibraryInfo actualInfo = dependentLib->doGetLibraryInfo();
-				depLibReRequired = 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
-					depLibReExported = dependentLib->isSubframeworkOf(context, this) || this->hasSubLibrary(context, dependentLib);
+					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);
 				}
 				// 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,
-							dependentLib->getShortName(), actualInfo.minVersion >> 16, (actualInfo.minVersion >> 8) & 0xff, actualInfo.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
-				if ( !depLibCheckSumsMatch || (dependentLib->getSlide() != 0) )
+				if ( !requiredLib.checksumMatches || (requiredLib.image->getSlide() != 0) )
 					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(), 	dependentLib->getPath());		
-				//	if ( dependentLib->getSlide() != 0 )
-				//		fprintf(stderr, "dyld: dependent library slid for %s referencing %s\n", this->getPath(), dependentLib->getPath());		
+				//			requiredLibInfo.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());		
 				//}
 			}
 			catch (const char* msg) {
 				//if ( context.verbosePrebinding )
-				//	fprintf(stderr, "dyld: exception during processing for %s referencing %s\n", this->getPath(), dependentLib->getPath());		
+				//	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);
 				}
 				// ok if weak library not found
-				dependentLib = NULL;
+				requiredLib.image = NULL;
 				canUsePrelinkingInfo = false;  // this disables all prebinding, we may want to just slam import vectors for this lib to zero
 			}
-			setLibImage(i, dependentLib, depLibReExported);
 		}
 		fAllLibraryChecksumsAndLoadAddressesMatch = canUsePrelinkingInfo;
 
 		// tell each to load its dependents
-		for(unsigned int i=0; i < libraryCount(); ++i) {
-			ImageLoader* dependentImage = libImage(i);
-			if ( dependentImage != NULL ) {	
-				dependentImage->recursiveLoadLibraries(context, preflightOnly, thisRPaths);
+		for(unsigned int i=0; i < fLibrariesCount; ++i){
+			DependentLibrary& lib = fLibraries[i];
+			if ( lib.image != NULL ) {	
+				lib.image->recursiveLoadLibraries(context, thisRPaths);
 			}
 		}
 		
 		// do deep prebind check
 		if ( fAllLibraryChecksumsAndLoadAddressesMatch ) {
-			for(unsigned int i=0; i < libraryCount(); ++i){
-				ImageLoader* dependentImage = libImage(i);
-				if ( dependentImage != NULL ) {	
-					if ( !dependentImage->allDependentLibrariesAsWhenPreBound() )
+			for(unsigned int i=0; i < fLibrariesCount; ++i){
+				const DependentLibrary& libInfo = fLibraries[i];
+				if ( libInfo.image != NULL ) {
+					if ( !libInfo.image->allDependentLibrariesAsWhenPreBound() )
 						fAllLibraryChecksumsAndLoadAddressesMatch = false;
 				}
 			}
@@ -577,17 +699,17 @@
 		
 		try {
 			// rebase lower level libraries first
-			for(unsigned int i=0; i < libraryCount(); ++i) {
-				ImageLoader* dependentImage = libImage(i);
-				if ( dependentImage != NULL )
-					dependentImage->recursiveRebase(context);
+			for(unsigned int i=0; i < fLibrariesCount; ++i){
+				DependentLibrary& libInfo = fLibraries[i];
+				if ( libInfo.image != NULL )
+					libInfo.image->recursiveRebase(context);
 			}
 				
 			// rebase this image
 			doRebase(context);
 			
 			// notify
-			context.notifySingle(dyld_image_state_rebased, this);
+			context.notifySingle(dyld_image_state_rebased, this->machHeader(), fPath, fLastModified);
 		}
 		catch (const char* msg) {
 			// this image is not rebased
@@ -612,18 +734,19 @@
 	
 		try {
 			// bind lower level libraries first
-			for(unsigned int i=0; i < libraryCount(); ++i) {
-				ImageLoader* dependentImage = libImage(i);
-				if ( dependentImage != NULL )
-					dependentImage->recursiveBind(context, forceLazysBound);
+			for(unsigned int i=0; i < fLibrariesCount; ++i){
+				DependentLibrary& libInfo = fLibraries[i];
+				if ( libInfo.image != NULL )
+					libInfo.image->recursiveBind(context, forceLazysBound);
 			}
 			// 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);
+			context.notifySingle(dyld_image_state_bound, this->machHeader(), fPath, fLastModified);
 		}
 		catch (const char* msg) {
 			// restore state
@@ -633,116 +756,31 @@
 	}
 }
 
-void ImageLoader::weakBind(const LinkContext& context)
-{
-	if ( context.verboseWeakBind )
-		dyld::log("dyld: weak bind start:\n");
-	// get set of ImageLoaders that participate in coalecsing
-	ImageLoader* imagesNeedingCoalescing[fgImagesRequiringCoalescing];
-	int count = context.getCoalescedImages(imagesNeedingCoalescing);
-	
-	// count how many have not already had weakbinding done
-	int countNotYetWeakBound = 0;
-	int countOfImagesWithWeakDefinitions = 0;
-	for(int i=0; i < count; ++i) {
-		if ( ! imagesNeedingCoalescing[i]->fWeakSymbolsBound )
-			++countNotYetWeakBound;
-		if ( imagesNeedingCoalescing[i]->hasCoalescedExports() )
-			++countOfImagesWithWeakDefinitions;
-	}
-
-	// don't need to do any coalescing if only one image has overrides, or all have already been done
-	if ( (countOfImagesWithWeakDefinitions > 1) && (countNotYetWeakBound > 0) ) {
-		// make symbol iterators for each
-		ImageLoader::CoalIterator iterators[count];
-		ImageLoader::CoalIterator* sortedIts[count];
-		for(int i=0; i < count; ++i) {
-			imagesNeedingCoalescing[i]->initializeCoalIterator(iterators[i], i);
-			sortedIts[i] = &iterators[i];
-			if ( context.verboseWeakBind )
-				dyld::log("dyld: weak bind load order %d/%d for %s\n", i, count, imagesNeedingCoalescing[i]->getPath());
-		}
-		
-		// walk all symbols keeping iterators in sync by 
-		// only ever incrementing the iterator with the lowest symbol 
-		int doneCount = 0;
-		while ( doneCount != count ) {
-			//for(int i=0; i < count; ++i)
-			//	dyld::log("sym[%d]=%s ", sortedIts[i]->loadOrder, sortedIts[i]->symbolName);
-			//dyld::log("\n");
-			// increment iterator with lowest symbol
-			if ( sortedIts[0]->image->incrementCoalIterator(*sortedIts[0]) )
-				++doneCount; 
-			// re-sort iterators
-			for(int i=1; i < count; ++i) {
-				int result = strcmp(sortedIts[i-1]->symbolName, sortedIts[i]->symbolName);
-				if ( result == 0 )
-					sortedIts[i-1]->symbolMatches = true;
-				if ( result > 0 ) {
-					// new one is bigger then next, so swap
-					ImageLoader::CoalIterator* temp = sortedIts[i-1];
-					sortedIts[i-1] = sortedIts[i];
-					sortedIts[i] = temp;
-				}
-				if ( result < 0 )
-					break;
-			}
-			// process all matching symbols just before incrementing the lowest one that matches
-			if ( sortedIts[0]->symbolMatches && !sortedIts[0]->done ) {
-				const char* nameToCoalesce = sortedIts[0]->symbolName;
-				// pick first symbol in load order (and non-weak overrides weak)
-				uintptr_t targetAddr = 0;
-				ImageLoader* targetImage = NULL;
-				for(int i=0; i < count; ++i) {
-					if ( strcmp(iterators[i].symbolName, nameToCoalesce) == 0 ) {
-						if ( context.verboseWeakBind )
-							dyld::log("dyld: weak bind, found %s weak=%d in %s \n", nameToCoalesce, iterators[i].weakSymbol, iterators[i].image->getPath());
-						if ( iterators[i].weakSymbol ) {
-							if ( targetAddr == 0 ) {
-								targetAddr = iterators[i].image->getAddressCoalIterator(iterators[i], context);
-								if ( targetAddr != 0 )
-									targetImage = iterators[i].image;
-							}
-						}
-						else {
-							targetAddr = iterators[i].image->getAddressCoalIterator(iterators[i], context);
-							if ( targetAddr != 0 ) {
-								targetImage = iterators[i].image;
-								// strong implementation found, stop searching
-								break;
-							}
-						}
-					}
-				}
-				if ( context.verboseWeakBind )
-					dyld::log("dyld: weak binding all uses of %s to copy from %s\n", nameToCoalesce, targetImage->getShortName());
-				
-				// tell each to bind to this symbol (unless already bound)
-				if ( targetAddr != 0 ) {
-					for(int i=0; i < count; ++i) {
-						if ( strcmp(iterators[i].symbolName, nameToCoalesce) == 0 ) {
-							if ( context.verboseWeakBind )
-								dyld::log("dyld: weak bind, setting all uses of %s in %s to 0x%lX from %s\n", nameToCoalesce, iterators[i].image->getShortName(), targetAddr, targetImage->getShortName());
-							if ( ! iterators[i].image->fWeakSymbolsBound )
-								iterators[i].image->updateUsesCoalIterator(iterators[i], targetAddr, targetImage, context);
-							iterators[i].symbolMatches = false; 
-						}
-					}
-				}
-				
-			}
-		}
-		
-		// mark all as having all weak symbols bound
-		for(int i=0; i < count; ++i) {
-			imagesNeedingCoalescing[i]->fWeakSymbolsBound = true;
-		}
-	}
-	if ( context.verboseWeakBind )
-		dyld::log("dyld: weak bind end\n");
-}
-
-
+
+#if IMAGE_NOTIFY_SUPPORT
+void ImageLoader::recursiveImageAnnouncement(const LinkContext& context, ImageLoader**& newImages)
+{
+	if ( ! fAnnounced ) {
+		// break cycles
+		fAnnounced = true;
+		
+		// announce lower level libraries first
+		for(unsigned int i=0; i < fLibrariesCount; ++i){
+			DependentLibrary& libInfo = fLibraries[i];
+			if ( libInfo.image != NULL )
+				libInfo.image->recursiveImageAnnouncement(context, newImages);
+		}
+		
+		// add to list of images to notify about
+		*newImages++ = this;
+		//dyld::log("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)
 {
@@ -751,10 +789,10 @@
 		fRegisteredDOF = true;
 		
 		// gather lower level libraries first
-		for(unsigned int i=0; i < libraryCount(); ++i) {
-			ImageLoader* dependentImage = libImage(i);
-			if ( dependentImage != NULL )
-				dependentImage->recursiveGetDOFSections(context, dofs);
+		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);
 	}
@@ -783,21 +821,25 @@
 
 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;
+
 		try {
 			// initialize lower level libraries first
-			for(unsigned int i=0; i < libraryCount(); ++i) {
-				ImageLoader* dependentImage = libImage(i);
-				if ( dependentImage != NULL )
+			for(unsigned int i=0; i < fLibrariesCount; ++i){
+				DependentLibrary& libInfo = fLibraries[i];
 				// don't try to initialize stuff "above" me
-				if ( (dependentImage != NULL) && (dependentImage->fDepth >= fDepth) )
-					dependentImage->recursiveInitialization(context, this_thread);
+				if ( (libInfo.image != NULL) && (libInfo.image->fDepth >= fDepth) )
+					libInfo.image->recursiveInitialization(context, this_thread);
 			}
 			
 			// record termination order
@@ -807,25 +849,32 @@
 			// 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);
+			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);
+			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
 }
 
 
@@ -839,11 +888,11 @@
 		}
 	}
 	if ( partTime < sUnitsPerSecond ) {
-		uint32_t milliSecondsTimesHundred = (partTime*100000)/sUnitsPerSecond;
-		uint32_t milliSeconds = milliSecondsTimesHundred/100;
+		uint32_t milliSecondsTimeTen = (partTime*10000)/sUnitsPerSecond;
+		uint32_t milliSeconds = milliSecondsTimeTen/10;
 		uint32_t percentTimesTen = (partTime*1000)/totalTime;
 		uint32_t percent = percentTimesTen/10;
-		dyld::log("%s: %u.%02u milliseconds (%u.%u%%)\n", msg, milliSeconds, milliSecondsTimesHundred-milliSeconds*100, percent, percentTimesTen-percent*10);
+		dyld::log("%s: %u.%u milliseconds (%u.%u%%)\n", msg, milliSeconds, milliSecondsTimeTen-milliSeconds*10, percent, percentTimesTen-percent*10);
 	}
 	else {
 		uint32_t secondsTimeTen = (partTime*10)/sUnitsPerSecond;
@@ -876,9 +925,10 @@
 }
 
 
+
 void ImageLoader::printStatistics(unsigned int imageCount)
 {
-	uint64_t totalTime = fgTotalLoadLibrariesTime + fgTotalRebaseTime + fgTotalBindTime + fgTotalWeakBindTime + fgTotalDOF + fgTotalInitTime;
+	uint64_t totalTime = fgTotalLoadLibrariesTime + fgTotalRebaseTime + fgTotalBindTime + fgTotalInitTime;
 	char commaNum1[40];
 	char commaNum2[40];
 
@@ -886,7 +936,6 @@
 	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);
 	printTime("total images loading time", fgTotalLoadLibrariesTime, totalTime);
-	printTime("total dtrace DOF registration time", fgTotalDOF, 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));
@@ -898,9 +947,8 @@
 				commatize(fgTotalBindSymbolsResolved, commaNum1), avgInt, avgTenths);
 	}
 	printTime("total binding fixups time", fgTotalBindTime, totalTime);
-	printTime("total weak binding fixups time", fgTotalWeakBindTime, totalTime);
 	dyld::log("total bindings lazily fixed up: %s of %s\n", commatize(fgTotalLazyBindFixups, commaNum1), commatize(fgTotalPossibleLazyBindFixups, commaNum2));
-	printTime("total initializer time", fgTotalInitTime, totalTime);
+	printTime("total init time time", fgTotalInitTime, totalTime);
 }
 
 
@@ -934,5 +982,129 @@
 }
 
 
-
-
+void Segment::map(int fd, uint64_t offsetInFatWrapper, intptr_t slide, const ImageLoader* image, const ImageLoader::LinkContext& context)
+{
+	vm_offset_t fileOffset = this->getFileOffset() + offsetInFatWrapper;
+	vm_size_t size = this->getFileSize();
+	void* requestedLoadAddress = (void*)(this->getPreferredLoadAddress() + slide);
+	int protection = 0;
+	if ( !this->unaccessible() ) {
+		if ( this->executable() )
+			protection   |= PROT_EXEC;
+		if ( this->readable() )
+			protection   |= PROT_READ;
+		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;
+	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)
+{
+	vm_address_t loadAddress = this->getPreferredLoadAddress() + slide;
+	vm_address_t srcAddr = (uintptr_t)memoryImage + this->getFileOffset();
+	vm_size_t size = this->getFileSize();
+	kern_return_t r = vm_copy(mach_task_self(), srcAddr, size, loadAddress);
+	if ( r != KERN_SUCCESS ) 
+		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)
+{
+	vm_prot_t protection = 0;
+	if ( !this->unaccessible() ) {
+		if ( this->executable() )
+			protection   |= VM_PROT_EXECUTE;
+		if ( this->readable() )
+			protection   |= VM_PROT_READ;
+		if ( this->writeable() )
+			protection   |= VM_PROT_WRITE;
+	}
+	vm_address_t addr = this->getActualLoadAddress(image);
+	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);
+	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);
+	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' : '.' );
+	}
+}
+
+
+bool Segment::hasTrailingZeroFill()
+{
+	return ( this->writeable() && (this->getSize() > this->getFileSize()) );
+}
+
+
+uintptr_t Segment::reserveAnAddressRange(size_t length, const ImageLoader::LinkContext& context)
+{
+	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";
+	
+	return addr;
+}
+
+bool Segment::reserveAddressRange(uintptr_t start, size_t length)
+{
+	vm_address_t addr = start;
+	vm_size_t size = length;
+	kern_return_t r = vm_allocate(mach_task_self(), &addr, size, false /*only this range*/);
+	if ( r != KERN_SUCCESS ) 
+		return false;
+	return true;
+}
+
+
+