From eb1b842c51aa530f218edb95e20c24e32099b7de Mon Sep 17 00:00:00 2001 From: wlott <wlott> Date: Fri, 21 Feb 1992 23:24:16 +0000 Subject: [PATCH] Had the order of arguments wrong in the replacement for sap-ref-32. --- code/bit-bash.lisp | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/code/bit-bash.lisp b/code/bit-bash.lisp index 698c2ba6d..8446724e2 100644 --- a/code/bit-bash.lisp +++ b/code/bit-bash.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bit-bash.lisp,v 1.13 1992/02/21 21:59:39 wlott Exp $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bit-bash.lisp,v 1.14 1992/02/21 23:24:16 wlott Exp $") ;;; ;;; ********************************************************************** ;;; @@ -128,7 +128,7 @@ (values (int-sap (32bit-logical-andc2 address 3)) (+ (* (logand address 3) byte-bits) offset)))) -(declaim (inline word-sap-ref (setf word-sap-ref))) +(declaim (inline word-sap-ref %set-word-sap-ref)) ;;; (defun word-sap-ref (sap offset) (declare (type system-area-pointer sap) @@ -137,14 +137,16 @@ (optimize (speed 3) (safety 0))) (sap-ref-32 sap (the index (ash offset 2)))) ;;; -(defun (setf word-sap-ref) (value sap offset) - (declare (type (unsigned-byte 32) value) - (type system-area-pointer sap) +(defun %set-word-sap-ref) (sap offset value) + (declare (type system-area-pointer sap) (type index offset) + (type (unsigned-byte 32) value) (values (unsigned-byte 32)) (optimize (speed 3) (safety 0))) (setf (sap-ref-32 sap (the index (ash offset 2))) value)) - +;;; +(defsetf word-sap-ref %set-word-sap-ref) + ;;;; DO-CONSTANT-BIT-BASH @@ -471,7 +473,7 @@ (multiple-value-bind (dst dst-offset) (fix-sap-and-offset dst dst-offset) (do-constant-bit-bash dst dst-offset length value - #'word-sap-ref #'(setf word-sap-ref))))) + #'word-sap-ref #'%set-word-sap-ref)))) (defun bit-bash-copy (src src-offset dst dst-offset length) (declare (type offset src-offset dst-offset length)) @@ -490,7 +492,7 @@ (multiple-value-bind (dst dst-offset) (fix-sap-and-offset dst dst-offset) (do-unary-bit-bash src src-offset dst dst-offset length - #'word-sap-ref #'(setf word-sap-ref) + #'word-sap-ref #'%set-word-sap-ref #'word-sap-ref))))) (defun copy-to-system-area (src src-offset dst dst-offset length) @@ -500,7 +502,7 @@ (multiple-value-bind (dst dst-offset) (fix-sap-and-offset dst dst-offset) (do-unary-bit-bash src src-offset dst dst-offset length - #'word-sap-ref #'(setf word-sap-ref) #'%raw-bits)))) + #'word-sap-ref #'%set-word-sap-ref #'%raw-bits)))) (defun copy-from-system-area (src src-offset dst dst-offset length) (declare (type offset src-offset dst-offset length)) -- GitLab