Changeset 217 for trunk/Cocoa/F-Script Anywhere/Source/SCPatch/SCPatchController/SCPatchLoader.c

Timestamp:

05/09/06 05:56:05 (18 years ago)

Author:

rchin

Message:

• Updated to new mach_inject with support for x86
• Updated nib files to 10.2+ format so that future updates to the f-script framework won't break fsa
• Adjusted some code to work with the new x86 mach_inject (sends an additional argument)
• Updates code to work with newer defines in cctools

File:

• trunk/Cocoa/F-Script Anywhere/Source/SCPatch/SCPatchController/SCPatchLoader.c (modified) (2 diffs)

trunk/Cocoa/F-Script Anywhere/Source/SCPatch/SCPatchController/SCPatchLoader.c

@@ -199 +199 @@
 
 //-------------------------------------------------------------------------------------------------------------
-mach_error_t INJECT_ENTRY( ptrdiff_t codeOffset, void *paramBlock, size_t paramSize )
+mach_error_t INJECT_ENTRY( ptrdiff_t codeOffset, void *paramBlock, size_t paramSize, char *dummy_pthread_struct  )
 {
         pthread_t                       thread;
@@ -205 +205 @@
         struct sched_param      sched;
         int                                     policy;
-        
+#if defined (__i386__)
+        // On intel, per-pthread data is a zone of data that must be allocated.
+        // if not, all function trying to access per-pthread data (all mig functions for instance)
+        // will crash. 
+        extern void __pthread_set_self(char*);
+        __pthread_set_self(dummy_pthread_struct);
+#endif
     // We need to fix up function addresses in gcc code, but not for code generated by CW.
-#ifdef __MWERKS__
+        // It turns out that this is not needed for gcc 4.0
+//#ifdef __MWERKS__
     codeOffset = 0;
-#endif
+//#endif
     // Stash the code offset where we can get at it later.
     ((SCPatchLoaderParams *)paramBlock)->codeOffset = codeOffset;