Loading...
--- dyld/dyld-353.2.3/src/dyldNew.cpp
+++ dyld/dyld-210.2.3/src/dyldNew.cpp
@@ -27,7 +27,6 @@
#include <stdint.h>
#include <string.h>
#include <mach/mach.h>
-#include <sys/mman.h>
extern "C" void* __dso_handle;
@@ -102,8 +101,8 @@
// ignore any pointer within dyld (i.e. stuff from pool or static strings)
if ( (dyld::gLibSystemHelpers != NULL) && ((ptr < &__dso_handle) || (ptr >= &initialPoolContent[DYLD_POOL_CHUNK_SIZE])) ) {
// ignore stuff in any dynamically alloated dyld pools
- for (dyld_static_pool* p = currentPool; p != NULL; p = p->previousPool) {
- if ( (p->pool <= ptr) && (ptr < p->end) ) {
+ for (dyld_static_pool* p = initialPool.previousPool; p != NULL; p = p->previousPool) {
+ if ( (p->pool < ptr) && (ptr < p->end) ) {
// do nothing, pool entries can't be reclaimed
//dyld::log("free(%p) from dynamic pool\n", ptr);
return;
@@ -148,26 +147,3 @@
int _malloc_lock = 0;
-// <rdar://problem/12857033> dyld calls this which uses libSystem.dylib's vm_allocate if available
-int vm_alloc(vm_address_t* addr, vm_size_t size, uint32_t flags)
-{
- if ( (dyld::gLibSystemHelpers != NULL) && (dyld::gLibSystemHelpers->version >= 12) ) {
- return dyld::gLibSystemHelpers->vm_alloc(mach_task_self(), addr, size, flags);
- }
- else {
- return ::vm_allocate(mach_task_self(), addr, size, flags);
- }
-}
-
-void* xmmap(void* addr, size_t len, int prot, int flags, int fd, off_t offset)
-{
- if ( (dyld::gLibSystemHelpers != NULL) && (dyld::gLibSystemHelpers->version >= 12) ) {
- return dyld::gLibSystemHelpers->mmap(addr, len, prot, flags, fd, offset);
- }
- else {
- return ::mmap(addr, len, prot, flags, fd, offset);
- }
-}
-
-
-