dyld-851.27.tar.gz

[apple/dyld.git] / src / dyldNew.cpp

diff --git a/src/dyldNew.cpp b/src/dyldNew.cpp
index 1511a517ba0a0e3d08f1eda3abce4c94e82efe38..2bdafba21da777798b99a917f906e6d5e87d7811 100644 (file)
--- a/src/dyldNew.cpp
+++ b/src/dyldNew.cpp
@@ -31,7 +31,7 @@
 
 extern "C" void* __dso_handle;
 
 
 extern "C" void* __dso_handle;
 

-#include "dyld.h"
+#include "dyld2.h"

 #include "dyldLibSystemInterface.h"
 
 //
 #include "dyldLibSystemInterface.h"
 
 //


@@ -51,7 +51,10 @@ struct dyld_static_pool {
        dyld_static_pool*       previousPool;
        uint8_t*                        current;
        uint8_t*                        end;
        dyld_static_pool*       previousPool;
        uint8_t*                        current;
        uint8_t*                        end;

-       uint8_t                         pool[1]; 
+
+    // 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
 };
 
 // allocate initial pool independently of pool header to take less space on disk


@@ -68,6 +71,9 @@ void* malloc(size_t size)
                return p;
        }
        else {
                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");
                if ( size > DYLD_POOL_CHUNK_SIZE ) {
                        dyld::log("dyld malloc overflow: size=%lu\n", size);
                        dyld::halt("dyld malloc overflow\n");