X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fppc-darwin-os.c;h=dfec5c5c1295fcc1e184b74d7b5f66d25da08762;hb=2529c316d05494f2bcdeccf98c3a6298ecd08d7d;hp=f9ab445bf9837c5b7a880e6f92fdb383a306e78c;hpb=1bc8fbfb6cdc0e2d39ec00402c9430b9e364f87b;p=sbcl.git

diff --git a/src/runtime/ppc-darwin-os.c b/src/runtime/ppc-darwin-os.c
index f9ab445..dfec5c5 100644
--- a/src/runtime/ppc-darwin-os.c
+++ b/src/runtime/ppc-darwin-os.c
@@ -21,7 +21,8 @@
 #include <ucontext.h>
 #include <limits.h>
 #include <mach-o/dyld.h>
-#include "bsd-os.h"
+#include "arch.h"
+#include "interr.h"                     /* for declaration of lose */
 
 #ifdef LISP_FEATURE_SB_THREAD
 #error "Define threading support functions"
@@ -40,82 +41,84 @@ os_context_register_addr(os_context_t *context, int offset)
     ppc_saved_state_t *state = &context->uc_mcontext->ss;
     switch(offset) {
     case 0:
-        return &state->r0;
+        return (os_context_register_t *) &state->r0;
     case 1:
-        return &state->r1;
+        return (os_context_register_t *) &state->r1;
     case 2:
-        return &state->r2;
+        return (os_context_register_t *) &state->r2;
     case 3:
-        return &state->r3;
+        return (os_context_register_t *) &state->r3;
     case 4:
-        return &state->r4;
+        return (os_context_register_t *) &state->r4;
     case 5:
-        return &state->r5;
+        return (os_context_register_t *) &state->r5;
     case 6:
-        return &state->r6;
+        return (os_context_register_t *) &state->r6;
     case 7:
-        return &state->r7;
+        return (os_context_register_t *) &state->r7;
     case 8:
-        return &state->r8;
+        return (os_context_register_t *) &state->r8;
     case 9:
-        return &state->r9;
+        return (os_context_register_t *) &state->r9;
     case 10:
-        return &state->r10;
+        return (os_context_register_t *) &state->r10;
     case 11:
-        return &state->r11;
+        return (os_context_register_t *) &state->r11;
     case 12:
-        return &state->r12;
+        return (os_context_register_t *) &state->r12;
     case 13:
-        return &state->r13;
+        return (os_context_register_t *) &state->r13;
     case 14:
-        return &state->r14;
+        return (os_context_register_t *) &state->r14;
     case 15:
-        return &state->r15;
+        return (os_context_register_t *) &state->r15;
     case 16:
-        return &state->r16;
+        return (os_context_register_t *) &state->r16;
     case 17:
-        return &state->r17;
+        return (os_context_register_t *) &state->r17;
     case 18:
-        return &state->r18;
+        return (os_context_register_t *) &state->r18;
     case 19:
-        return &state->r19;
+        return (os_context_register_t *) &state->r19;
     case 20:
-        return &state->r20;
+        return (os_context_register_t *) &state->r20;
     case 21:
-        return &state->r21;
+        return (os_context_register_t *) &state->r21;
     case 22:
-        return &state->r22;
+        return (os_context_register_t *) &state->r22;
     case 23:
-        return &state->r23;
+        return (os_context_register_t *) &state->r23;
     case 24:
-        return &state->r24;
+        return (os_context_register_t *) &state->r24;
     case 25:
-        return &state->r25;
+        return (os_context_register_t *) &state->r25;
     case 26:
-        return &state->r26;
+        return (os_context_register_t *) &state->r26;
     case 27:
-        return &state->r27;
+        return (os_context_register_t *) &state->r27;
     case 28:
-        return &state->r28;
+        return (os_context_register_t *) &state->r28;
     case 29:
-        return &state->r29;
+        return (os_context_register_t *) &state->r29;
     case 30:
-        return &state->r30;
+        return (os_context_register_t *) &state->r30;
     case 31:
-        return &state->r31;
+        return (os_context_register_t *) &state->r31;
     case 41:
         /* PT_DAR */
-        return &context->uc_mcontext->es.dar;
+        return (os_context_register_t *) &context->uc_mcontext->es.dar;
     case 42:
         /* PT_DSISR */
-        return &context->uc_mcontext->es.dsisr;
+        return (os_context_register_t *) &context->uc_mcontext->es.dsisr;
+    default:
+        lose("bad offset to os_context_register_addr");
     }
 }
 
 os_context_register_t *
 os_context_lr_addr(os_context_t *context)
 {
-    return &context->uc_mcontext->ss.lr;
+    return (os_context_register_t *) &context->uc_mcontext->ss.lr;
 }
 
 os_context_register_t *