Loading...
--- dyld/dyld-1340/cache_builder/Optimizers.cpp
+++ dyld/dyld-1122.1/cache_builder/Optimizers.cpp
@@ -31,7 +31,7 @@
// MARK: --- StubOptimizer methods ---
//
-// These are functions that are interposed by Instruments.app or ASan or libRPAC.dylib
+// These are functions that are interposed by Instruments.app or ASan
const char* const neverStubEliminateSymbols[] = {
"___bzero",
"___cxa_atexit",
@@ -71,7 +71,6 @@
"_dispatch_sync_f",
"_dlclose",
"_dlopen",
- "_dlsym",
"_dup",
"_dup2",
"_endgrent",
@@ -170,7 +169,6 @@
"_modf",
"_modff",
"_modfl",
- "_mprotect",
"_munlock",
"_munlockall",
"_objc_autoreleasePoolPop",
@@ -250,25 +248,6 @@
"_sigwait",
"_snprintf",
"_sprintf",
- "_sqlite3_close",
- "_sqlite3_close_v2",
- "_sqlite3_exec",
- "_sqlite3_exec_b",
- "_sqlite3_finalize",
- "_sqlite3_open",
- "_sqlite3_open16",
- "_sqlite3_open_v2",
- "_sqlite3_prepare",
- "_sqlite3_prepare16",
- "_sqlite3_prepare16_v2",
- "_sqlite3_prepare16_v3",
- "_sqlite3_prepare_v2",
- "_sqlite3_prepare_v3",
- "_sqlite3_step",
- "_sqlite3_wal_autocheckpoint",
- "_sqlite3_wal_checkpoint",
- "_sqlite3_wal_checkpoint_v2",
- "_sqlite3_wal_hook",
"_sscanf",
"_stat",
"_statfs",
@@ -331,8 +310,6 @@
"_write$NOCANCEL",
"_writev$NOCANCEL",
"_xpc_connection_send_message_with_reply_sync",
- "__dyld_register_func_for_add_image",
- "__dyld_register_func_for_remove_image",
// <rdar://problem/22050956> always use stubs for C++ symbols that can be overridden
"__ZdaPv",
"__ZdlPv",
@@ -373,14 +350,11 @@
return (stubVMAddr & (-4096)) + adrpValue*4096 + ldrValue*8;
}
-void StubOptimizer::generateArm64StubTo(uint8_t* stubBuffer, uint64_t stubVMAddr,
- uint64_t gotVMAddr, uint64_t targetVMAddr)
+void StubOptimizer::generateArm64StubTo(uint8_t* stubBuffer,
+ uint64_t stubVMAddr, uint64_t targetVMAddr)
{
int64_t adrpDelta = (targetVMAddr & -4096) - (stubVMAddr & -4096);
- if ( std::abs(adrpDelta) > 0xFFFFE000 ) {
- generateArm64StubToGOT(stubBuffer, stubVMAddr, gotVMAddr);
- return;
- }
+
uint32_t immhi = (adrpDelta >> 9) & (0x00FFFFE0);
uint32_t immlo = (adrpDelta << 17) & (0x60000000);
uint32_t newADRP = (0x90000010) | immlo | immhi;
@@ -394,14 +368,14 @@
}
void StubOptimizer::generateArm64StubToGOT(uint8_t* stubBuffer,
- uint64_t stubVMAddr, uint64_t gotVMAddr)
-{
- int64_t adrpDelta = (gotVMAddr & -4096) - (stubVMAddr & -4096);
+ uint64_t stubVMAddr, uint64_t targetVMAddr)
+{
+ int64_t adrpDelta = (targetVMAddr & -4096) - (stubVMAddr & -4096);
uint32_t immhi = (adrpDelta >> 9) & (0x00FFFFE0);
uint32_t immlo = (adrpDelta << 17) & (0x60000000);
uint32_t newADRP = (0x90000010) | immlo | immhi;
- uint32_t off12 = (gotVMAddr & 0xFFF) >> 3;
+ uint32_t off12 = (targetVMAddr & 0xFFF) >> 3;
uint32_t newLDR = (0xF9400210) | (off12 << 10);
uint32_t* stubInstructions = (uint32_t*)stubBuffer;
@@ -451,14 +425,14 @@
}
void StubOptimizer::generateArm64_32StubToGOT(uint8_t* stubBuffer,
- uint64_t stubVMAddr, uint64_t gotVMAddr)
-{
- int64_t adrpDelta = (gotVMAddr & -4096) - (stubVMAddr & -4096);
+ uint64_t stubVMAddr, uint64_t targetVMAddr)
+{
+ int64_t adrpDelta = (targetVMAddr & -4096) - (stubVMAddr & -4096);
uint32_t immhi = (adrpDelta >> 9) & (0x00FFFFE0);
uint32_t immlo = (adrpDelta << 17) & (0x60000000);
uint32_t newADRP = (0x90000010) | immlo | immhi;
- uint32_t off12 = (gotVMAddr & 0xFFF) >> 2;
+ uint32_t off12 = (targetVMAddr & 0xFFF) >> 2;
uint32_t newLDR = (0xB9400210) | (off12 << 10);
uint32_t* stubInstructions = (uint32_t*)stubBuffer;
@@ -500,14 +474,11 @@
return (stubVMAddr & (-4096)) + adrpValue*4096 + addValue;
}
-void StubOptimizer::generateArm64eStubTo(uint8_t* stubBuffer, uint64_t stubVMAddr,
- uint64_t gotVMAddr, uint64_t targetVMAddr)
+void StubOptimizer::generateArm64eStubTo(uint8_t* stubBuffer,
+ uint64_t stubVMAddr, uint64_t targetVMAddr)
{
int64_t adrpDelta = (targetVMAddr & -4096) - (stubVMAddr & -4096);
- if ( std::abs(adrpDelta) > 0xFFFFE000 ) {
- generateArm64eStubToGOT(stubBuffer, stubVMAddr, gotVMAddr);
- return;
- }
+
uint32_t immhi = (adrpDelta >> 9) & (0x00FFFFE0);
uint32_t immlo = (adrpDelta << 17) & (0x60000000);
uint32_t newADRP = (0x90000010) | immlo | immhi;
@@ -522,14 +493,14 @@
}
void StubOptimizer::generateArm64eStubToGOT(uint8_t* stubBuffer,
- uint64_t stubVMAddr, uint64_t gotVMAddr)
-{
- int64_t adrpDelta = (gotVMAddr & -4096) - (stubVMAddr & -4096);
+ uint64_t stubVMAddr, uint64_t targetVMAddr)
+{
+ int64_t adrpDelta = (targetVMAddr & -4096) - (stubVMAddr & -4096);
uint32_t immhi = (adrpDelta >> 9) & (0x00FFFFE0);
uint32_t immlo = (adrpDelta << 17) & (0x60000000);
uint32_t newADRP = (0x90000011) | immlo | immhi;
- uint32_t off12 = (gotVMAddr & 0xFFF);
+ uint32_t off12 = (targetVMAddr & 0xFFF);
uint32_t newADD = (0x91000231) | (off12 << 10);
uint32_t* stubInstructions = (uint32_t*)stubBuffer;
@@ -538,14 +509,3 @@
stubInstructions[2] = 0xF9400230; // LDR X16, [X17]
stubInstructions[3] = 0xD71F0A11; // BRAA X16, X17
}
-
-//
-// MARK: --- UniquedGOTsOptimizer methods ---
-//
-void UniquedGOTsOptimizer::forEachFunctionVariant(void (^callback)(const CoalescedGOTSection::FunctionVariantInfo& tv, uint64_t gotVMAddr,
- dyld3::MachOFile::PointerMetaData pmd)) const
-{
- this->regularGOTs.forEachFunctionVariant(callback);
- this->authGOTs.forEachFunctionVariant(callback);
- this->authPtrs.forEachFunctionVariant(callback);
-}