Changeset 401 for trunk/Cocoa

Timestamp:

02/24/08 09:41:47 (17 years ago)

Author:

Nicholas Riley

Message:

Update mach_inject to build and run on Leopard without #define DARWIN_UNIX03 0.

Location:

trunk/Cocoa/F-Script Anywhere/Source/mach_inject

Files:

• mach_inject.c (modified) (4 diffs)
• mach_inject.h (modified) (1 diff)

trunk/Cocoa/F-Script Anywhere/Source/mach_inject/mach_inject.c

@@ -18 +18 @@
 #include <mach-o/fat.h> // for fat structure decoding
 #include <mach-o/arch.h> // to know which is local arch
-#include <fcntl.h> // for open/close
+#include <fcntl.h> // for open()
+#include <unistd.h> // for close()
 // for mmap()
 #include <sys/types.h>
@@ -146 +147 @@
                 
                 ASSERT_CAST( unsigned int, remoteCode );
-                remoteThreadState.srr0 = (unsigned int) remoteCode;
-                remoteThreadState.srr0 += threadEntryOffset;
-                assert( remoteThreadState.srr0 < (remoteCode + imageSize) );
+                remoteThreadState.__srr0 = (unsigned int) remoteCode;
+                remoteThreadState.__srr0 += threadEntryOffset;
+                assert( remoteThreadState.__srr0 < (remoteCode + imageSize) );
                 
                 ASSERT_CAST( unsigned int, remoteStack );
-                remoteThreadState.r1 = (unsigned int) remoteStack;
+                remoteThreadState.__r1 = (unsigned int) remoteStack;
                 
                 ASSERT_CAST( unsigned int, imageOffset );
-                remoteThreadState.r3 = (unsigned int) imageOffset;
+                remoteThreadState.__r3 = (unsigned int) imageOffset;
                 
                 ASSERT_CAST( unsigned int, remoteParamBlock );
-                remoteThreadState.r4 = (unsigned int) remoteParamBlock;
+                remoteThreadState.__r4 = (unsigned int) remoteParamBlock;
                 
                 ASSERT_CAST( unsigned int, paramSize );
-                remoteThreadState.r5 = (unsigned int) paramSize;
+                remoteThreadState.__r5 = (unsigned int) paramSize;
                 
                 ASSERT_CAST( unsigned int, 0xDEADBEEF );
-                remoteThreadState.lr = (unsigned int) 0xDEADBEEF;
+                remoteThreadState.__lr = (unsigned int) 0xDEADBEEF;
                 
 #if 0
                 printf( "remoteCode start: %p\n", (void*) remoteCode );
                 printf( "remoteCode size: %ld\n", imageSize );
-                printf( "remoteCode pc: %p\n", (void*) remoteThreadState.srr0 );
+                printf( "remoteCode pc: %p\n", (void*) remoteThreadState.__srr0 );
                 printf( "remoteCode end: %p\n",
                         (void*) (((char*)remoteCode)+imageSize) );
@@ -207 +208 @@
                 
                 // set remote Program Counter
-                remoteThreadState.eip = (unsigned int) (remoteCode);
-                remoteThreadState.eip += threadEntryOffset;  
+                remoteThreadState.__eip = (unsigned int) (remoteCode);
+                remoteThreadState.__eip += threadEntryOffset;  
                 
                 // set remote Stack Pointer
                 ASSERT_CAST( unsigned int, remoteStack );
-                remoteThreadState.esp = (unsigned int) remoteStack;
+                remoteThreadState.__esp = (unsigned int) remoteStack;
                 
 #if 0
@@ -289 +290 @@
                                 int fd = open (imageName, O_RDONLY);
                                 size_t mapSize = *size;
-                                char * fileImage = mmap (NULL, mapSize, PROT_READ, MAP_FILE, fd, 0);
+                                void *fileImage = mmap(NULL, mapSize, PROT_READ, MAP_PRIVATE | MAP_FILE, fd, 0);
+                                if (fileImage == (void *)-1) {
+                                        fprintf(stderr, "mmap failed: %s (%s)\n", imageName, strerror(errno));
+                                        return err_threadEntry_image_not_found;
+                                }
                                 
                                 struct fat_header* fatHeader = (struct fat_header *)fileImage;

trunk/Cocoa/F-Script Anywhere/Source/mach_inject/mach_inject.h

@@ -19 +19 @@
 #ifndef         _mach_inject_
 #define         _mach_inject_
-#define __DARWIN_UNIX03 0
 #include <sys/types.h>
 #include <mach/error.h>