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

diff --git a/src/code/ppc-vm.lisp b/src/code/ppc-vm.lisp
index a9297a6..79ddf31 100644
--- a/src/code/ppc-vm.lisp
+++ b/src/code/ppc-vm.lisp
@@ -2,9 +2,6 @@
 ;;;
 (in-package "SB!VM")
 
-(defvar *number-of-signals* 64)
-(defvar *bits-per-word* 32)
-
 (define-alien-type os-context-t (struct os-context-t-struct))
 
 
@@ -89,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))
@@ -115,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)))
@@ -162,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))