Loading...
--- dyld/dyld-852.2/src/dyldNew.cpp
+++ dyld/dyld-45.3/src/dyldNew.cpp
@@ -1,6 +1,6 @@
/* -*- mode: C++; c-basic-offset: 4; tab-width: 4 -*-
*
- * Copyright (c) 2004-2008 Apple Inc. All rights reserved.
+ * Copyright (c) 2004-2005 Apple Computer, Inc. All rights reserved.
*
* @APPLE_LICENSE_HEADER_START@
*
@@ -22,169 +22,53 @@
* @APPLE_LICENSE_HEADER_END@
*/
+#include <new>
+#include <malloc/malloc.h>
+//#include <stdio.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <string.h>
-#include <mach/mach.h>
-#include <sys/mman.h>
-
-extern "C" void* __dso_handle;
-
-#include "dyld2.h"
-#include "dyldLibSystemInterface.h"
//
-// dyld initially allocates all memory from a pool inside dyld.
-// Once libSystem.dylib is initialized, dyld uses libSystem's malloc/free.
+// dyld does not use malloc anywhere, instead C++ new is used.
+// All dyld allocations go in dyld-only zone so as to be not co-mingled with target proccess's allocations
+//
+//
//
-#if __LP64__
- // room for about ~1000 initial dylibs
- #define DYLD_POOL_CHUNK_SIZE 200*1024
-#else
- // room for about ~900 initial dylibs
- #define DYLD_POOL_CHUNK_SIZE 150*1024
-#endif
-
-struct dyld_static_pool {
- dyld_static_pool* previousPool;
- uint8_t* current;
- uint8_t* end;
-
- // libunwind, and probably others, need the pool to be 16-byte aligned as malloc guarantees that
- __attribute__((__aligned__(16)))
- uint8_t pool[1];
-};
-
-// allocate initial pool independently of pool header to take less space on disk
-static uint8_t initialPoolContent[DYLD_POOL_CHUNK_SIZE] __attribute__((__aligned__(16)));
-static dyld_static_pool initialPool = { NULL, initialPoolContent, &initialPoolContent[DYLD_POOL_CHUNK_SIZE] };
-static dyld_static_pool* currentPool = &initialPool;
+static malloc_zone_t* sZone = NULL; // could be initialized to malloc_create_zone, but that would require careful ordering of initializers
-void* malloc(size_t size)
+void* operator new(std::size_t len) throw (std::bad_alloc)
{
- if ( (dyld::gLibSystemHelpers != NULL) && dyld::gProcessInfo->libSystemInitialized ) {
- void* p = dyld::gLibSystemHelpers->malloc(size);
- //dyld::log("malloc(%lu) => %p from libSystem\n", size, p);
- return p;
+ if ( sZone == NULL ) {
+ sZone = malloc_create_zone(40960, 0);
+ malloc_set_zone_name(sZone, "dyld heap");
}
- else {
- // keep allocations 16-byte aligned
- size = ((size + 15) & -16);
+ //fprintf(stderr, "new(%d)\n", len);
+ return malloc_zone_malloc(sZone, len);
+}
- if ( size > DYLD_POOL_CHUNK_SIZE ) {
- dyld::log("dyld malloc overflow: size=%lu\n", size);
- dyld::halt("dyld malloc overflow\n");
- }
- size = (size+sizeof(void*)-1) & (-sizeof(void*)); // pointer align
- uint8_t* result = currentPool->current;
- currentPool->current += size;
- if ( currentPool->current > currentPool->end ) {
- vm_address_t addr = 0;
- kern_return_t r = vm_allocate(mach_task_self(), &addr, DYLD_POOL_CHUNK_SIZE, VM_FLAGS_ANYWHERE);
- if ( r != KERN_SUCCESS ) {
- dyld::halt("out of address space for dyld memory pool\n");
- }
- dyld_static_pool* newPool = (dyld_static_pool*)addr;
- newPool->previousPool = NULL;
- newPool->current = newPool->pool;
- newPool->end = (uint8_t*)(addr + DYLD_POOL_CHUNK_SIZE);
- newPool->previousPool = currentPool;
- currentPool = newPool;
- if ( (currentPool->current + size) > currentPool->end ) {
- dyld::log("dyld memory pool exhausted: size=%lu\n", size);
- dyld::halt("dyld memory pool exhausted\n");
- }
- result = currentPool->current;
- currentPool->current += size;
- }
- //dyld::log("%p = malloc(%3lu) from pool %p, free space = %lu\n", result, size, currentPool, (long)(currentPool->end - currentPool->current));
- return result;
+void* operator new[](std::size_t len) throw (std::bad_alloc)
+{
+ if ( sZone == NULL ) {
+ sZone = malloc_create_zone(40960, 0);
+ malloc_set_zone_name(sZone, "dyld heap");
}
+ //fprintf(stderr, "new[](%d)\n", len);
+ return malloc_zone_malloc(sZone, len);
}
-void free(void* ptr)
+void operator delete(void* obj) throw()
{
- // 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) ) {
- // do nothing, pool entries can't be reclaimed
- //dyld::log("free(%p) from dynamic pool\n", ptr);
- return;
- }
- }
-
- //dyld::log("free(%p) from libSystem\n", ptr);
- return dyld::gLibSystemHelpers->free(ptr);
- }
- else {
- // do nothing, pool entries can't be reclaimed
- //dyld::log("free(%p) from static pool\n", ptr);
- }
+ //fprintf(stderr, "delete(%p)\n", obj);
+ malloc_zone_free(sZone, obj);
}
-void* calloc(size_t count, size_t size)
+void operator delete[](void* obj) throw()
{
- // Check for overflow of integer multiplication
- size_t total = count * size;
- if ( total/count != size ) {
- dyld::log("dyld calloc overflow: count=%zu, size=%zu\n", count, size);
- dyld::halt("dyld calloc overflow");
- }
- if ( dyld::gLibSystemHelpers != NULL ) {
- void* result = dyld::gLibSystemHelpers->malloc(total);
- if ( result != NULL )
- bzero(result, total);
- return result;
- }
- else {
- // this allocates out of static buffer which is already zero filled
- return malloc(total);
- }
+ //fprintf(stderr, "delete[](%p)\n", obj);
+ malloc_zone_free(sZone, obj);
}
-void* realloc(void *ptr, size_t size)
-{
- void* result = malloc(size);
- memcpy(result, ptr, size);
- return result;
-}
-
-// void* reallocf(void *ptr, size_t size);
-// void* valloc(size_t size);
-
-// needed __libc_init()
-extern "C" int _malloc_lock;
-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);
- }
-}
-
-
-