Loading...
--- dyld/dyld-655.1.1/dyld3/libdyldEntryVector.cpp
+++ dyld/dyld-519.2.1/dyld3/libdyldEntryVector.cpp
@@ -26,14 +26,12 @@
#include "dyld_priv.h"
#include "libdyldEntryVector.h"
#include "AllImages.h"
-#include "Array.h"
-#include "Loading.h"
#include "Logging.h"
#include "PathOverrides.h"
-#include "StartGlue.h"
-#include "dyld_process_info_internal.h"
+#include "LaunchCacheFormat.h"
-extern "C" char start;
+extern "C" void start();
+
VIS_HIDDEN const char** appleParams;
@@ -91,38 +89,32 @@
gAllImages.setOldAllImageInfo(old);
}
-static void entry_setNotifyMonitoringDyldMain(void (*notifyMonitoringDyldMain)()) {
- setNotifyMonitoringDyldMain(notifyMonitoringDyldMain);
-}
-
-static void entry_setNotifyMonitoringDyld(void (*notifyMonitoringDyld)(bool unloading,unsigned imageCount,
- const struct mach_header* loadAddresses[],
- const char* imagePaths[])) {
- setNotifyMonitoringDyld(notifyMonitoringDyld);
-}
-
-static void entry_setInitialImageList(const closure::LaunchClosure* closure,
- const DyldSharedCache* dyldCacheLoadAddress, const char* dyldCachePath,
- const Array<LoadedImage>& initialImages, const LoadedImage& libSystem)
+static void entry_setInitialImageList(const launch_cache::binary_format::Closure* closure,
+ const void* dyldCacheLoadAddress, const char* dyldCachePath,
+ const dyld3::launch_cache::DynArray<loader::ImageInfo>& initialImages,
+ const mach_header* libSystemMH, const launch_cache::binary_format::Image* libSystemImage)
{
gAllImages.init(closure, dyldCacheLoadAddress, dyldCachePath, initialImages);
- gAllImages.applyInterposingToDyldCache(closure);
+ gAllImages.applyInterposingToDyldCache(closure, initialImages);
const char* mainPath = _simple_getenv(appleParams, "executable_path");
if ( (mainPath != nullptr) && (mainPath[0] == '/') )
gAllImages.setMainPath(mainPath);
+ // ok to call before malloc is ready because 4 slots are reserved.
+ gAllImages.setInitialGroups();
+
// run initializer for libSytem.B.dylib
// this calls back into _dyld_initializer which calls gAllIimages.addImages()
- gAllImages.runLibSystemInitializer(libSystem);
+ gAllImages.runLibSystemInitializer(libSystemMH, libSystemImage);
// now that malloc is available, parse DYLD_ env vars
- closure::gPathOverrides.setEnvVars((const char**)environ, gAllImages.mainExecutable(), gAllImages.mainExecutableImage()->path());
+ gPathOverrides.setEnvVars((const char**)environ);
}
static void entry_runInitialzersBottomUp(const mach_header* mainExecutableImageLoadAddress)
{
- gAllImages.runStartupInitialzers();
+ gAllImages.runInitialzersBottomUp(mainExecutableImageLoadAddress);
gAllImages.notifyMonitorMain();
}
@@ -131,25 +123,17 @@
sChildForkFunction = func;
}
-static void entry_setRestrictions(bool allowAtPaths, bool allowEnvPaths)
-{
- gAllImages.setRestrictions(allowAtPaths, allowEnvPaths);
-}
-
const LibDyldEntryVector entryVectorForDyld = {
LibDyldEntryVector::kCurrentVectorVersion,
- closure::kFormatVersion,
+ launch_cache::binary_format::kFormatVersion,
&entry_setVars,
&entry_setHaltFunction,
&entry_setOldAllImageInfo,
&entry_setInitialImageList,
&entry_runInitialzersBottomUp,
- (__typeof(LibDyldEntryVector::startFunc))address_of_start,
+ &start,
&entry_setChildForkFunction,
&entry_setLogFunction,
- &entry_setRestrictions,
- &entry_setNotifyMonitoringDyldMain,
- &entry_setNotifyMonitoringDyld
};
VIS_HIDDEN void _dyld_fork_child()