Lion x86 compatibility for mach_override

third_party/mach_override/mach_override.c

 /*******************************************************************************
         mach_override.c
                 Copyright (c) 2003-2009 Jonathan 'Wolf' Rentzsch: <http://rentzsch.com>
                 Some rights reserved: <http://opensource.org/licenses/mit-license.php>
 
         ***************************************************************************/
 
 #include "mach_override.h"
 
 #include <mach-o/dyld.h>
@@ skipping 127 matching lines @@
 #endif
 
 /*******************************************************************************
 *       
 *       Interface
 *       
 *******************************************************************************/
 #pragma mark    -
 #pragma mark    (Interface)
 
-#if defined(__x86_64__)
+#if defined(__i386__) || defined(__x86_64__)
 mach_error_t makeIslandExecutable(void *address) {
         mach_error_t err = err_none;
     vm_size_t pageSize;
     host_page_size( mach_host_self(), &pageSize );
-    uint64_t page = (uint64_t)address & ~(uint64_t)(pageSize-1);
+    uintptr_t page = (uintptr_t)address & ~(uintptr_t)(pageSize-1);
     int e = err_none;
     e |= mprotect((void *)page, pageSize, PROT_EXEC | PROT_READ | PROT_WRITE);
     e |= msync((void *)page, pageSize, MS_INVALIDATE );
     if (e) {
         err = err_cannot_override;
     }
     return err;
 }
 #endif
 
@@ skipping 130 matching lines @@
         // Note that on i386, we do not support someone else changing the code under our feet
         if ( !err ) {
                 if( reentryIsland )
                         err = setBranchIslandTarget_i386( reentryIsland,
                                                                                  (void*) ((char *)originalFunctionPtr+eatenCount), originalInstructions );
                 if ( !err )
                         atomic_mov64((uint64_t *)originalFunctionPtr, jumpRelativeInstruction);
         }
 #endif
         
+#if defined(__i386__) || defined(__x86_64__)
+        if ( !err )
+                err = makeIslandExecutable( escapeIsland );
+        if ( !err && reentryIsland )
+                err = makeIslandExecutable( reentryIsland );
+#endif
+        
         //      Clean up on error.
         if( err ) {
                 if( reentryIsland )
                         freeBranchIsland( reentryIsland );
                 if( escapeIsland )
                         freeBranchIsland( escapeIsland );
         }
 
-#if defined(__x86_64__)
-        err = makeIslandExecutable(escapeIsland);
-        err = makeIslandExecutable(reentryIsland);
-#endif
-        
         return err;
 }
 
 /*******************************************************************************
 *       
 *       Implementation
 *       
 *******************************************************************************/
 #pragma mark    -
 #pragma mark    (Implementation)
@@ skipping 21 matching lines @@
         
         if( allocateHigh ) {
                 vm_size_t pageSize;
                 err = host_page_size( mach_host_self(), &pageSize );
                 if( !err ) {
                         assert( sizeof( BranchIsland ) <= pageSize );
 #if defined(__x86_64__)
                         vm_address_t first = (uint64_t)originalFunctionAddress & ~(uint64_t)(((uint64_t)1 << 31) - 1) | ((uint64_t)1 << 31); // start in the middle of the page?
                         vm_address_t last = 0x0;
 #else
-                        vm_address_t first = 0xfeffffff;
-                        vm_address_t last = 0xfe000000 + pageSize;
+                        vm_address_t first = 0xffc00000;
+                        vm_address_t last = 0xfffe0000;
 #endif
 
                         vm_address_t page = first;
                         int allocated = 0;
                         vm_map_t task_self = mach_task_self();
                         
                         while( !err && !allocated && page != last ) {
 
                                 err = vm_allocate( task_self, &page, pageSize, 0 );
                                 if( err == err_none )
@@ skipping 303 matching lines @@
 );
 #elif defined(__x86_64__)
 void atomic_mov64(
                 uint64_t *targetAddress,
                 uint64_t value )
 {
     *targetAddress = value;
 }
 #endif
 #endif