X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-tran.lisp;h=56fa01a518dfef1068132f1d16c42d92e4da5af5;hb=545fa4548b327804cf78afe38a2ecd94ced86162;hp=ea381c42b2614ec0952cafef86b0064b89e44b0d;hpb=19198944c81507369ae46522c13b30df628cb442;p=sbcl.git diff --git a/src/compiler/generic/vm-tran.lisp b/src/compiler/generic/vm-tran.lisp index ea381c4..56fa01a 100644 --- a/src/compiler/generic/vm-tran.lisp +++ b/src/compiler/generic/vm-tran.lisp @@ -16,11 +16,11 @@ ;;; FIXME: Add a comment telling whether this holds for all vectors ;;; or only for vectors based on simple arrays (non-adjustable, etc.). (defconstant vector-data-bit-offset - (* sb!vm:vector-data-offset sb!vm:word-bits)) + (* sb!vm:vector-data-offset sb!vm:n-word-bits)) -;;; We need to define these predicates, since the TYPEP source transform picks -;;; whichever predicate was defined last when there are multiple predicates for -;;; equivalent types. +;;; We need to define these predicates, since the TYPEP source +;;; transform picks whichever predicate was defined last when there +;;; are multiple predicates for equivalent types. (def-source-transform short-float-p (x) `(single-float-p ,x)) #!-long-float (def-source-transform long-float-p (x) `(double-float-p ,x)) @@ -127,22 +127,22 @@ new-value))))) (deftransform data-vector-set ((array index new-value) - (simple-array t t)) + (simple-array t t)) (let ((array-type (continuation-type array))) (unless (array-type-p array-type) (give-up-ir1-transform)) (let ((dims (array-type-dimensions array-type))) (when (or (atom dims) (= (length dims) 1)) - (give-up-ir1-transform)) + (give-up-ir1-transform)) (let ((el-type (array-type-element-type array-type)) - (total-size (if (member '* dims) - '* - (reduce #'* dims)))) - `(data-vector-set (truly-the (simple-array ,(type-specifier el-type) - (,total-size)) - (%array-data-vector array)) - index - new-value))))) + (total-size (if (member '* dims) + '* + (reduce #'* dims)))) + `(data-vector-set (truly-the (simple-array ,(type-specifier el-type) + (,total-size)) + (%array-data-vector array)) + index + new-value))))) ;;; transforms for getting at simple arrays of (UNSIGNED-BYTE N) when (< N 8) ;;; @@ -153,7 +153,7 @@ #+nil (macrolet ((frob (type bits) - (let ((elements-per-word (truncate sb!vm:word-bits bits))) + (let ((elements-per-word (truncate sb!vm:n-word-bits bits))) `(progn (deftransform data-vector-ref ((vector index) (,type *)) @@ -161,7 +161,7 @@ (floor index ,',elements-per-word) (ldb ,(ecase sb!vm:target-byte-order (:little-endian '(byte ,bits (* bit ,bits))) - (:big-endian '(byte ,bits (- sb!vm:word-bits + (:big-endian '(byte ,bits (- sb!vm:n-word-bits (* (1+ bit) ,bits))))) (%raw-bits vector (+ word sb!vm:vector-data-offset))))) (deftransform data-vector-set ((vector index new-value) @@ -171,7 +171,7 @@ (setf (ldb ,(ecase sb!vm:target-byte-order (:little-endian '(byte ,bits (* bit ,bits))) (:big-endian - '(byte ,bits (- sb!vm:word-bits + '(byte ,bits (- sb!vm:n-word-bits (* (1+ bit) ,bits))))) (%raw-bits vector (+ word sb!vm:vector-data-offset))) new-value))))))) @@ -212,8 +212,8 @@ (end (+ sb!vm:vector-data-offset (truncate (the index (+ (length bit-array-1) - sb!vm:word-bits -1)) - sb!vm:word-bits)))) + sb!vm:n-word-bits -1)) + sb!vm:n-word-bits)))) ((= index end) result-bit-array) (declare (optimize (speed 3) (safety 0)) (type index index end)) @@ -236,42 +236,52 @@ (end (+ sb!vm:vector-data-offset (truncate (the index (+ (length bit-array) - (1- sb!vm:word-bits))) - sb!vm:word-bits)))) + (1- sb!vm:n-word-bits))) + sb!vm:n-word-bits)))) ((= index end) result-bit-array) (declare (optimize (speed 3) (safety 0)) (type index index end)) (setf (%raw-bits result-bit-array index) (32bit-logical-not (%raw-bits bit-array index)))))) -;;;; primitive translator for BYTE-BLT +;;;; %BYTE-BLT -(def-primitive-translator byte-blt (src src-start dst dst-start dst-end) - `(let ((src ,src) - (src-start (* ,src-start sb!vm:byte-bits)) - (dst ,dst) - (dst-start (* ,dst-start sb!vm:byte-bits)) - (dst-end (* ,dst-end sb!vm:byte-bits))) - (let ((length (- dst-end dst-start))) - (etypecase src - (system-area-pointer - (etypecase dst - (system-area-pointer - (system-area-copy src src-start dst dst-start length)) - ((simple-unboxed-array (*)) - (copy-from-system-area src src-start - dst (+ dst-start ,vector-data-bit-offset) - length)))) - ((simple-unboxed-array (*)) - (etypecase dst - (system-area-pointer - (copy-to-system-area src (+ src-start ,vector-data-bit-offset) - dst dst-start - length)) - ((simple-unboxed-array (*)) - (bit-bash-copy src (+ src-start ,vector-data-bit-offset) - dst (+ dst-start ,vector-data-bit-offset) - length)))))))) +;;; FIXME: The old CMU CL code used various COPY-TO/FROM-SYSTEM-AREA +;;; stuff (with all the associated bit-index cruft and overflow +;;; issues) even for byte moves. In SBCL, we're converting to byte +;;; moves as problems are discovered with the old code, and this is +;;; currently (ca. sbcl-0.6.12.30) the main interface for code in +;;; SB!KERNEL and SB!SYS (e.g. i/o code). It's not clear that it's the +;;; ideal interface, though, and it probably deserves some thought. +(deftransform %byte-blt ((src src-start dst dst-start dst-end) + ((or (simple-unboxed-array (*)) system-area-pointer) + index + (or (simple-unboxed-array (*)) system-area-pointer) + index + index)) + ;; FIXME: CMU CL had a hairier implementation of this (back when it + ;; was still called (%PRIMITIVE BYTE-BLT). It had the small problem + ;; that it didn't work for large (>16M) values of SRC-START or + ;; DST-START. However, it might have been more efficient. In + ;; particular, I don't really know how much the foreign function + ;; call costs us here. My guess is that if the overhead is + ;; acceptable for SQRT and COS, it's acceptable here, but this + ;; should probably be checked. -- WHN + '(flet ((sapify (thing) + (etypecase thing + (system-area-pointer thing) + ;; FIXME: The code here rather relies on the simple + ;; unboxed array here having byte-sized entries. That + ;; should be asserted explicitly, I just haven't found + ;; a concise way of doing it. (It would be nice to + ;; declare it in the DEFKNOWN too.) + ((simple-unboxed-array (*)) (vector-sap thing))))) + (declare (inline sapify)) + (without-gcing + (memmove (sap+ (sapify dst) dst-start) + (sap+ (sapify src) src-start) + (- dst-end dst-start))) + nil)) ;;;; transforms for EQL of floating point values @@ -281,3 +291,4 @@ (deftransform eql ((x y) (double-float double-float)) '(and (= (double-float-low-bits x) (double-float-low-bits y)) (= (double-float-high-bits x) (double-float-high-bits y)))) +