Ticket #1022: boinc_6_10_58_darwin_10_6_4.patch

lib/mac/QBacktrace.c

@@ -1036 +1036 @@
         
     err = 0;
     switch (context->threadStateFlavor) {
+#if defined(__DARWIN_UNIX03)
+        case PPC_THREAD_STATE:
+            pc = ((const ppc_thread_state_t *) context->threadState)->__srr0;
+            lr = ((const ppc_thread_state_t *) context->threadState)->__lr;
+            r1 = ((const ppc_thread_state_t *) context->threadState)->__r1;
+            break;
+        case PPC_THREAD_STATE64:
+            pc = ((const ppc_thread_state64_t *) context->threadState)->__srr0;
+            lr = ((const ppc_thread_state64_t *) context->threadState)->__lr;
+            r1 = ((const ppc_thread_state64_t *) context->threadState)->__r1;
+            break;
+#else
         case PPC_THREAD_STATE:
             pc = ((const ppc_thread_state_t *) context->threadState)->srr0;
             lr = ((const ppc_thread_state_t *) context->threadState)->lr;
@@ -1046 +1058 @@
             lr = ((const ppc_thread_state64_t *) context->threadState)->lr;
             r1 = ((const ppc_thread_state64_t *) context->threadState)->r1;
             break;
+#endif
 
         default:
             err = EINVAL;
@@ -1571 +1584 @@
         
     err = 0;
     switch (context->threadStateFlavor) {
-#ifdef __LP64__
+#if defined(__LP64__) || defined(__DARWIN_UNIX03)
         case x86_THREAD_STATE64:
 
             pc = ((const x86_thread_state64_t *) context->threadState)->__rip;
@@ -2475 +2488 @@
         flavor = x86_THREAD_STATE32;
         state = (x86_thread_state32_t *) calloc(1, sizeof(*state));
         if (state != NULL) {
+#if defined(__DARWIN_UNIX03)
+            state->__eip = (uintptr_t) pc;
+            state->__ebp = (uintptr_t) fp;
+#else
             state->eip = (uintptr_t) pc;
             state->ebp = (uintptr_t) fp;
+#endif
         }
     #elif TARGET_CPU_X86_64
         x86_thread_state64_t *  state;

lib/mac/QCrashReport.c

@@ -870 +870 @@
    r28: 0x0188d650  r29: 0x01be92d8  r30: 0xbffff900  r31: 0x01be92e0
 */
         fprintf(f, "%s crashed with PPC Thread State:\n", threadID);
-#ifndef __LP64__
+#if !defined(__LP64__) && !defined(__DARWIN_UNIX03)
         fprintf(f, "  srr0: 0x%08x srr1: 0x%08x                vrsave: 0x%08x\n", state->srr0, state->srr1, state->vrsave);
         fprintf(f, "   xer: 0x%08x   lr: 0x%08x  ctr: 0x%08x   mq: 0x%08x\n", state->xer, state->lr, state->ctr, state->mq);
 
@@ -934 +934 @@
 */
 
         fprintf(f, "%s crashed with PPC Thread State:\n", threadID);
-#ifndef __LP64__
+#if !defined(__LP64__) && !defined(__DARWIN_UNIX03)
         fprintf(f, "  srr0: 0x%016llx srr1: 0x%016llx                        vrsave: 0x%016x\n", state->srr0, state->srr1, state->vrsave);
         fprintf(f, "    cr: 0x%08x          xer: 0x%016llx   lr: 0x%016llx  ctr: 0x%016llx\n", state->cr, state->xer, state->lr, state->ctr);
 
@@ -998 +998 @@
    ds: 0x0000001f     es: 0x0000001f  fs: 0x00000000  gs: 0x00000037
 */
         fprintf(f, "%s crashed with X86 Thread State (32-bit):\n", threadID);
-#ifndef __LP64__
+#if !defined(__LP64__) && !defined(__DARWIN_UNIX03)
         regBase = (const unsigned int *) &state->eax;
 #else
         regBase = (const unsigned int *) &state->__eax;
@@ -1054 +1054 @@
   rip: 0x000000010000f1fe  rfl: 0x0000000000010202
 */
         fprintf(f, "%s crashed with X86 Thread State (64-bit):\n", threadID);
-#ifndef __LP64__
+#if !defined(__LP64__) && !defined(__DARWIN_UNIX03)
         regBase = (const unsigned long long *) &state->rax;
 #else
         regBase = (const unsigned long long *) &state->__rax;