X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-tran.lisp;h=0d5849eb162b3df6a35bdea8cf87121dea709dd8;hb=7c07a6f965c51828d8f452b47e0620d8e6cf2959;hp=651658770ded2ce19e89a17756e19324fca1d2c9;hpb=95a6db7329b91dd90d165dd4057b9b5098d34aa2;p=sbcl.git diff --git a/src/compiler/generic/vm-tran.lisp b/src/compiler/generic/vm-tran.lisp index 6516587..0d5849e 100644 --- a/src/compiler/generic/vm-tran.lisp +++ b/src/compiler/generic/vm-tran.lisp @@ -78,26 +78,22 @@ (declare (type (simple-array ,element-type-specifier 1) array)) (data-vector-ref array index))))) -;;; MNA: open-coded-simple-array patch (deftransform data-vector-ref ((array index) (simple-array 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 (and (consp dims) (= (length dims) 1)) + (when (or (atom dims) (= (length dims) 1)) (give-up-ir1-transform)) - (let* ((el-type (array-type-element-type array-type)) - (total-size (if (or (atom dims) (member '* dims)) + (let ((el-type (array-type-element-type array-type)) + (total-size (if (member '* dims) '* - (reduce #'* dims))) - (type-sp `(simple-array ,(type-specifier el-type) - (,total-size)))) - (if (atom dims) - `(let ((a (truly-the ,type-sp (%array-simp array)))) - (data-vector-ref a index)) - `(let ((a (truly-the ,type-sp (%array-data-vector array)))) - (data-vector-ref a index))))))) + (reduce #'* dims)))) + `(data-vector-ref (truly-the (simple-array ,(type-specifier el-type) + (,total-size)) + (%array-data-vector array)) + index))))) (deftransform hairy-data-vector-set ((array index new-value) (array t t) @@ -130,26 +126,23 @@ index new-value))))) -;;; MNA: open-coded-simple-array patch (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 (and (consp dims) (= (length dims) 1)) - (give-up-ir1-transform)) - (let* ((el-type (array-type-element-type array-type)) - (total-size (if (or (atom dims) (member '* dims)) - '* - (reduce #'* dims))) - (type-sp `(simple-array ,(type-specifier el-type) - (,total-size)))) - (if (atom dims) - `(let ((a (truly-the ,type-sp (%array-simp array)))) - (data-vector-set a index new-value)) - `(let ((a (truly-the ,type-sp (%array-data-vector array)))) - (data-vector-set a index new-value))))))) + (when (or (atom dims) (= (length dims) 1)) + (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))))) ;;; transforms for getting at simple arrays of (UNSIGNED-BYTE N) when (< N 8) ;;; @@ -251,34 +244,44 @@ (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