(in-package "SB!C")
-(file-comment
- "$Header$")
-
;;; FIXME: It would be good to implement SB!XC:DEFCONSTANT, and use
;;; use that here, so that the compiler is born knowing this value.
;;; FIXME: Add a comment telling whether this holds for all vectors
(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 (or (atom dims) (= (length dims) 1))
+ (when (and (consp dims) (= (length dims) 1))
(give-up-ir1-transform))
- (let ((el-type (array-type-element-type array-type))
- (total-size (if (member '* dims)
+ (let* ((el-type (array-type-element-type array-type))
+ (total-size (if (or (atom dims) (member '* dims))
'*
- (reduce #'* dims))))
- `(data-vector-ref (truly-the (simple-array ,(type-specifier el-type)
- (,total-size))
- (%array-data-vector array))
- index)))))
+ (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)))))))
(deftransform hairy-data-vector-set ((array index new-value)
(array t t)
index
new-value)))))
+;;; MNA: open-coded-simple-array patch
(deftransform data-vector-set ((array index new-value)
(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))
+ (when (and (consp dims) (= (length dims) 1))
(give-up-ir1-transform))
- (let ((el-type (array-type-element-type array-type))
- (total-size (if (member '* dims)
+ (let* ((el-type (array-type-element-type array-type))
+ (total-size (if (or (atom dims) (member '* dims))
'*
- (reduce #'* dims))))
- `(data-vector-set (truly-the (simple-array ,(type-specifier el-type)
- (,total-size))
- (%array-data-vector array))
- index
- new-value)))))
+ (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)))))))
;;; transforms for getting at simple arrays of (UNSIGNED-BYTE N) when (< N 8)
;;;
(frob (simple-array (unsigned-byte 2) (*)) 2)
(frob (simple-array (unsigned-byte 4) (*)) 4))
\f
-;;;; simple string transforms
-
-(deftransform subseq ((string start &optional (end nil))
- (simple-string t &optional t))
- `(let* ((length (- (or end (length string))
- start))
- (result (make-string length)))
- (declare (optimize (safety 0)))
- (bit-bash-copy string
- (the index
- (+ (the index (* start sb!vm:byte-bits))
- ,vector-data-bit-offset))
- result
- ,vector-data-bit-offset
- (the index (* length sb!vm:byte-bits)))
- result))
-
-(deftransform copy-seq ((seq) (simple-string))
- `(let* ((length (length seq))
- (res (make-string length)))
- (declare (optimize (safety 0)))
- (bit-bash-copy seq
- ,vector-data-bit-offset
- res
- ,vector-data-bit-offset
- (the index (* length sb!vm:byte-bits)))
- res))
-
-(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))
-
-(deftransform concatenate ((rtype &rest sequences)
- (t &rest simple-string)
- simple-string)
- (collect ((lets)
- (forms)
- (all-lengths)
- (args))
- (dolist (seq sequences)
- (declare (ignore seq))
- (let ((n-seq (gensym))
- (n-length (gensym)))
- (args n-seq)
- (lets `(,n-length (the index (* (length ,n-seq) sb!vm:byte-bits))))
- (all-lengths n-length)
- (forms `(bit-bash-copy ,n-seq ,vector-data-bit-offset
- res start
- ,n-length))
- (forms `(setq start (+ start ,n-length)))))
- `(lambda (rtype ,@(args))
- (declare (ignore rtype))
- (let* (,@(lets)
- (res (make-string (truncate (the index (+ ,@(all-lengths)))
- sb!vm:byte-bits)))
- (start ,vector-data-bit-offset))
- (declare (type index start ,@(all-lengths)))
- ,@(forms)
- res))))
-\f
;;;; bit vector hackery
;;; SIMPLE-BIT-VECTOR bit-array operations are transformed to a word loop that
(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))))
+
projects / sbcl.git / blobdiff