X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fgeneric%2Fvm-tran.lisp;h=0d5849eb162b3df6a35bdea8cf87121dea709dd8;hb=0dcc957ae6bf24809fda82fd59c134e70058c42a;hp=6d90e85f93adcb6309310c8bbf3874ca6fb78698;hpb=cea4896b2482b7b2b429c1631d774b4cfbc0efba;p=sbcl.git diff --git a/src/compiler/generic/vm-tran.lisp b/src/compiler/generic/vm-tran.lisp index 6d90e85..0d5849e 100644 --- a/src/compiler/generic/vm-tran.lisp +++ b/src/compiler/generic/vm-tran.lisp @@ -18,9 +18,9 @@ (defconstant vector-data-bit-offset (* sb!vm:vector-data-offset sb!vm: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) ;;; @@ -179,44 +179,6 @@ (frob (simple-array (unsigned-byte 2) (*)) 2) (frob (simple-array (unsigned-byte 4) (*)) 4)) -;;;; simple string transforms -;;;; -;;;; Note: CMU CL had more of these, including transforms for -;;;; functions which cons. In SBCL, we've gotten rid of the transforms -;;;; for functions which cons, since our GC overhead is sufficiently -;;;; large that it doesn't seem worth it to try to economize on -;;;; function call overhead or on the overhead of runtime type -;;;; dispatch in AREF. - -;;; FIXME: Shouldn't we be testing for legality of -;;; * START1, START2, END1, and END2 indices? -;;; * size of copied string relative to destination string? -;;; (Either there should be tests conditional on SAFETY>=SPEED, or -;;; the transform should be conditional on SPEED>SAFETY.) -;;; -;;; FIXME: Also, the transform should probably be dependent on -;;; SPEED>SPACE. -(deftransform replace ((string1 string2 &key (start1 0) (start2 0) - end1 end2) - (simple-string simple-string &rest t)) - `(locally - (declare (optimize (safety 0))) - (bit-bash-copy string2 - (the index - (+ (the index (* start2 sb!vm:byte-bits)) - ,vector-data-bit-offset)) - string1 - (the index - (+ (the index (* start1 sb!vm:byte-bits)) - ,vector-data-bit-offset)) - (the index - (* (min (the index (- (or end1 (length string1)) - start1)) - (the index (- (or end2 (length string2)) - start2))) - sb!vm:byte-bits))) - string1)) - ;;;; bit vector hackery ;;; SIMPLE-BIT-VECTOR bit-array operations are transformed to a word loop that @@ -282,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 @@ -319,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)))) +