X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=src%2Faggregates.lisp;h=c6624074dd2a07baeaa46bbad95da468bd32ef89;hb=b8e666e0f483efdec2f13eb5e1cdd0b06f700191;hp=aff8f7740dcbf502106fc465c08a31e29e874361;hpb=40902249f2739db0830d663704b4931e37ee0d52;p=uffi.git diff --git a/src/aggregates.lisp b/src/aggregates.lisp index aff8f77..c662407 100644 --- a/src/aggregates.lisp +++ b/src/aggregates.lisp @@ -227,25 +227,27 @@ of the enum-name name, separator-string, and field-name" (setf (aref a i) (uffi:deref-array s '(:array :unsigned-byte) i))))) #+sbcl -(defun convert-from-foreign-usb8 (sap len) - (declare (type sb-sys:system-area-pointer sap)) - (locally - (declare (optimize (speed 3) (safety 0))) - (let ((result (make-array len :element-type '(unsigned-byte 8)))) - (sb-kernel:copy-from-system-area sap 0 - result (* sb-vm:vector-data-offset - sb-vm:n-word-bits) - (* len sb-vm:n-byte-bits)) - result))) +(defun convert-from-foreign-usb8 (s len) + (let ((sap (sb-alien:alien-sap s))) + (declare (type sb-sys:system-area-pointer sap)) + (locally + (declare (optimize (speed 3) (safety 0))) + (let ((result (make-array len :element-type '(unsigned-byte 8)))) + (sb-kernel:copy-from-system-area sap 0 + result (* sb-vm:vector-data-offset + sb-vm:n-word-bits) + (* len sb-vm:n-byte-bits)) + result)))) #+cmu -(defun convert-from-foreign-usb8 (sap len) - (declare (type system:system-area-pointer sap)) - (locally - (declare (optimize (speed 3) (safety 0))) - (let ((result (make-array len :element-type '(unsigned-byte 8)))) - (kernel:copy-from-system-area sap 0 - result (* vm:vector-data-offset - vm:word-bits) - (* len vm:byte-bits)) - result))) +(defun convert-from-foreign-usb8 (s len) + (let ((sap (alien:alien-sap s))) + (declare (type system:system-area-pointer sap)) + (locally + (declare (optimize (speed 3) (safety 0))) + (let ((result (make-array len :element-type '(unsigned-byte 8)))) + (kernel:copy-from-system-area sap 0 + result (* vm:vector-data-offset + vm:word-bits) + (* len vm:byte-bits)) + result))))