X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fppc-vm.lisp;h=79ddf319dcd2eea94dfe80a90889ccbfca87caec;hb=e67cc0f952040723f7d0f37ddb88fe895f4b1464;hp=1024998c21e50d699e807768d855585dc0da54cf;hpb=b7a8f5313a83dea33ce60551a4fb987b415c2cc6;p=sbcl.git

diff --git a/src/code/ppc-vm.lisp b/src/code/ppc-vm.lisp
index 1024998..79ddf31 100644
--- a/src/code/ppc-vm.lisp
+++ b/src/code/ppc-vm.lisp
@@ -86,6 +86,13 @@
   (declare (type (alien (* os-context-t)) context))
   (deref (context-register-addr context index)))
 
+(define-alien-routine ("os_context_lr_addr" context-lr-addr) (* unsigned-long)
+  (context (* os-context-t)))
+
+(defun context-lr (context)
+  (declare (type (alien (* os-context-t)) context))
+  (int-sap (deref (context-lr-addr context))))
+
 (defun %set-context-register (context index new)
 (declare (type (alien (* os-context-t)) context))
 (setf (deref (context-register-addr context index))
@@ -112,6 +119,9 @@
 
 ;;; Given a signal context, return the floating point modes word in
 ;;; the same format as returned by FLOATING-POINT-MODES.
+;;;
+;;; FIXME: surely this must be accessible somewhere under Darwin?
+#!-darwin
 (define-alien-routine ("os_context_fp_control" context-floating-point-modes)
     (sb!alien:unsigned 32)
   (context (* os-context-t)))
@@ -159,10 +169,7 @@
     (declare (type system-area-pointer pc)
 	     (type (unsigned-byte 8) length)
 	     (type (simple-array (unsigned-byte 8) (*)) vector))
-    (copy-from-system-area pc (* sb!vm:n-byte-bits 5)
-			   vector (* sb!vm:n-word-bits
-				     sb!vm:vector-data-offset)
-			   (* length sb!vm:n-byte-bits))
+    (copy-ub8-from-system-area pc 5 vector 0 length)
     (let* ((index 0)
 	   (error-number (sb!c:read-var-integer vector index)))
       (collect ((sc-offsets))