Loading...
--- dyld/dyld-852.2/src/dyldNew.cpp
+++ dyld/dyld-551.3/src/dyldNew.cpp
@@ -31,7 +31,7 @@
extern "C" void* __dso_handle;
-#include "dyld2.h"
+#include "dyld.h"
#include "dyldLibSystemInterface.h"
//
@@ -51,10 +51,7 @@
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];
+ uint8_t pool[1];
};
// allocate initial pool independently of pool header to take less space on disk
@@ -71,12 +68,9 @@
return p;
}
else {
- // keep allocations 16-byte aligned
- size = ((size + 15) & -16);
-
if ( size > DYLD_POOL_CHUNK_SIZE ) {
- dyld::log("dyld malloc overflow: size=%lu\n", size);
- dyld::halt("dyld malloc overflow\n");
+ dyld::log("dyld malloc overflow: size=%zu\n", size);
+ exit(1);
}
size = (size+sizeof(void*)-1) & (-sizeof(void*)); // pointer align
uint8_t* result = currentPool->current;
@@ -85,7 +79,8 @@
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::log("out of address space for dyld memory pool\n");
+ exit(1);
}
dyld_static_pool* newPool = (dyld_static_pool*)addr;
newPool->previousPool = NULL;
@@ -95,7 +90,7 @@
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");
+ exit(1);
}
result = currentPool->current;
currentPool->current += size;