Fix the recent %vector-widetag-and-n-bits change.
[sbcl.git] / src / code / array.lisp
index e367539..627a8b4 100644 (file)
       (values array index)))
 \f
 ;;;; MAKE-ARRAY
-(eval-when (:compile-toplevel :execute)
-  (sb!xc:defmacro pick-vector-type (type &rest specs)
-    `(cond ,@(mapcar (lambda (spec)
-                       `(,(if (eq (car spec) t)
-                              t
-                              `(subtypep ,type ',(car spec)))
-                         ,@(cdr spec)))
-                     specs))))
-
-;;; These functions are used in the implementation of MAKE-ARRAY for
-;;; complex arrays. There are lots of transforms to simplify
-;;; MAKE-ARRAY for various easy cases, but not for all reasonable
-;;; cases, so e.g. as of sbcl-0.6.6 we still make full calls to
-;;; MAKE-ARRAY for any non-simple array. Thus, there's some value to
-;;; making this somewhat efficient, at least not doing full calls to
-;;; SUBTYPEP in the easy cases.
+(defun %integer-vector-widetag-and-n-bits (signed high)
+  (let ((unsigned-table
+          #.(let ((map (make-array (1+ sb!vm:n-word-bits))))
+              (loop for saetp across
+                    (reverse sb!vm:*specialized-array-element-type-properties*)
+                    for ctype = (sb!vm:saetp-ctype saetp)
+                    when (and (numeric-type-p ctype)
+                              (eq (numeric-type-class ctype) 'integer)
+                              (zerop (numeric-type-low ctype)))
+                    do (fill map (cons (sb!vm:saetp-typecode saetp)
+                                       (sb!vm:saetp-n-bits saetp))
+                             :end (1+ (integer-length (numeric-type-high ctype)))))
+              map))
+        (signed-table
+          #.(let ((map (make-array (1+ sb!vm:n-word-bits))))
+              (loop for saetp across
+                    (reverse sb!vm:*specialized-array-element-type-properties*)
+                    for ctype = (sb!vm:saetp-ctype saetp)
+                    when (and (numeric-type-p ctype)
+                              (eq (numeric-type-class ctype) 'integer)
+                              (minusp (numeric-type-low ctype)))
+                    do (fill map (cons (sb!vm:saetp-typecode saetp)
+                                       (sb!vm:saetp-n-bits saetp))
+                             :end (+ (integer-length (numeric-type-high ctype)) 2)))
+              map)))
+    (cond ((> high sb!vm:n-word-bits)
+           (values #.sb!vm:simple-vector-widetag #.sb!vm:n-word-bits))
+          (signed
+           (let ((x (aref signed-table high)))
+             (values (car x) (cdr x))))
+          (t
+           (let ((x (aref unsigned-table high)))
+             (values (car x) (cdr x)))))))
+
+;;; This is a bit complicated, but calling subtypep over all
+;;; specialized types is exceedingly slow
 (defun %vector-widetag-and-n-bits (type)
-  (case type
-    ;; Pick off some easy common cases.
-    ;;
-    ;; (Perhaps we should make a much more exhaustive table of easy
-    ;; common cases here. Or perhaps the effort would be better spent
-    ;; on smarter compiler transforms which do the calculation once
-    ;; and for all in any reasonable user programs.)
-    ((t)
-     (values #.sb!vm:simple-vector-widetag #.sb!vm:n-word-bits))
-    ((base-char standard-char #!-sb-unicode character)
-     (values #.sb!vm:simple-base-string-widetag #.sb!vm:n-byte-bits))
-    #!+sb-unicode
-    ((character)
-     (values #.sb!vm:simple-character-string-widetag #.sb!vm:n-word-bits))
-    ((bit)
-     (values #.sb!vm:simple-bit-vector-widetag 1))
-    ;; OK, we have to wade into SUBTYPEPing after all.
-    (t
-     (unless *type-system-initialized*
-       (bug "SUBTYPEP dispatch for MAKE-ARRAY before the type system is ready"))
-     #.`(pick-vector-type type
-         ,@(map 'list
-                (lambda (saetp)
-                  `(,(sb!vm:saetp-specifier saetp)
-                    (values ,(sb!vm:saetp-typecode saetp)
-                            ,(sb!vm:saetp-n-bits saetp))))
-                sb!vm:*specialized-array-element-type-properties*)))))
+  (macrolet ((with-parameters ((arg-type &key intervals)
+                               (&rest args) &body body)
+               (let ((type-sym (gensym)))
+                 `(let (,@(loop for arg in args
+                                collect `(,arg '*)))
+                    (declare (ignorable ,@args))
+                    (when (consp type)
+                      (let ((,type-sym (cdr type)))
+                        (block nil
+                          ,@(loop for arg in args
+                                  collect
+                                  `(cond ((consp ,type-sym)
+                                          (let ((value (pop ,type-sym)))
+                                            (if (or (eq value '*)
+                                                    (typep value ',arg-type)
+                                                    ,(if intervals
+                                                         `(and (consp value)
+                                                               (null (cdr value))
+                                                               (typep (car value)
+                                                                      ',arg-type))))
+                                                (setf ,arg value)
+                                                (ill-type))))
+                                         ((null ,type-sym)
+                                          (return))
+                                         (t
+                                          (ill-type)))))
+                        (when ,type-sym
+                          (ill-type))))
+                    ,@body)))
+             (result (widetag)
+               (let ((value (symbol-value widetag)))
+                 `(values ,value
+                          ,(sb!vm:saetp-n-bits
+                            (find value
+                                  sb!vm:*specialized-array-element-type-properties*
+                                  :key #'sb!vm:saetp-typecode))))))
+    (flet ((ill-type ()
+             (error "Invalid type specifier: ~s" type))
+           (integer-interval-widetag (low high)
+             (if (minusp low)
+                 (%integer-vector-widetag-and-n-bits
+                  t
+                  (1+ (max (integer-length low) (integer-length high))))
+                 (%integer-vector-widetag-and-n-bits
+                  nil
+                  (max (integer-length low) (integer-length high))))))
+      (let* ((consp (consp type))
+             (type-name (if consp
+                            (car type)
+                            type)))
+        (case type-name
+          ((t)
+           (when consp
+             (ill-type))
+           (result sb!vm:simple-vector-widetag))
+          ((base-char standard-char #!-sb-unicode character)
+           (when consp
+             (ill-type))
+           (result sb!vm:simple-base-string-widetag))
+          #!+sb-unicode
+          ((character extended-char)
+           (when consp
+             (ill-type))
+           (result sb!vm:simple-character-string-widetag))
+          (bit
+           (when consp
+             (ill-type))
+           (result sb!vm:simple-bit-vector-widetag))
+          (fixnum
+           (when consp
+             (ill-type))
+           (result sb!vm:simple-array-fixnum-widetag))
+          (unsigned-byte
+           (with-parameters ((integer 1)) (high)
+             (if (eq high '*)
+                 (result sb!vm:simple-vector-widetag)
+                 (%integer-vector-widetag-and-n-bits nil high))))
+          (signed-byte
+           (with-parameters ((integer 1)) (high)
+             (if (eq high '*)
+                 (result sb!vm:simple-vector-widetag)
+                 (%integer-vector-widetag-and-n-bits t high))))
+          (double-float
+           (with-parameters (double-float :intervals t) (low high)
+             (if (and (not (eq low '*))
+                      (not (eq high '*))
+                      (if (or (consp low) (consp high))
+                          (>= (type-bound-number low) (type-bound-number high))
+                          (> low high)))
+                 (result sb!vm:simple-array-nil-widetag)
+                 (result sb!vm:simple-array-double-float-widetag))))
+          (single-float
+           (with-parameters (single-float :intervals t) (low high)
+             (if (and (not (eq low '*))
+                      (not (eq high '*))
+                      (if (or (consp low) (consp high))
+                          (>= (type-bound-number low) (type-bound-number high))
+                          (> low high)))
+                 (result sb!vm:simple-array-nil-widetag)
+                 (result sb!vm:simple-array-single-float-widetag))))
+          (mod
+           (if (and (consp type)
+                    (consp (cdr type))
+                    (null (cddr type))
+                    (typep (cadr type) '(integer 1)))
+               (%integer-vector-widetag-and-n-bits
+                nil (integer-length (1- (cadr type))))
+               (ill-type)))
+          #!+long-float
+          (long-float
+           (with-parameters (long-float :intervals t) (low high)
+             (if (and (not (eq low '*))
+                      (not (eq high '*))
+                      (if (or (consp low) (consp high))
+                          (>= (type-bound-number low) (type-bound-number high))
+                          (> low high)))
+                 (result sb!vm:simple-array-nil-widetag)
+                 (result sb!vm:simple-array-long-float-widetag))))
+          (integer
+           (with-parameters (integer :intervals t) (low high)
+             (let ((low (if (consp low)
+                            (1+ (car low))
+                            low))
+                   (high (if (consp high)
+                             (1- (car high))
+                             high)))
+               (cond ((or (eq high '*)
+                          (eq low '*))
+                      (result sb!vm:simple-vector-widetag))
+                     ((> low high)
+                      (result sb!vm:simple-array-nil-widetag))
+                     (t
+                      (integer-interval-widetag low high))))))
+          (complex
+           (with-parameters (t) (subtype)
+             (if (eq subtype '*)
+                 (result sb!vm:simple-vector-widetag)
+                 (let ((ctype (specifier-type type)))
+                   (cond ((eq ctype *empty-type*)
+                          (result sb!vm:simple-array-nil-widetag))
+                         ((union-type-p ctype)
+                          (cond ((csubtypep ctype (specifier-type '(complex double-float)))
+                                 (result
+                                  sb!vm:simple-array-complex-double-float-widetag))
+                                ((csubtypep ctype (specifier-type '(complex single-float)))
+                                 (result
+                                  sb!vm:simple-array-complex-single-float-widetag))
+                                #!+long-float
+                                ((csubtypep ctype (specifier-type '(complex long-float)))
+                                 (result
+                                  sb!vm:simple-array-complex-long-float-widetag))
+                                (t
+                                 (result sb!vm:simple-vector-widetag))))
+                         (t
+                          (case (numeric-type-format ctype)
+                            (double-float
+                             (result
+                              sb!vm:simple-array-complex-double-float-widetag))
+                            (single-float
+                             (result
+                              sb!vm:simple-array-complex-single-float-widetag))
+                            #!+long-float
+                            (long-float
+                             (result
+                              sb!vm:simple-array-complex-long-float-widetag))
+                            (t
+                             (result sb!vm:simple-vector-widetag)))))))))
+          ((nil)
+           (result sb!vm:simple-array-nil-widetag))
+          (t
+           (block nil
+             (let ((ctype
+                     (handler-case (specifier-type type)
+                       (parse-unknown-type ()
+                         (return (result sb!vm:simple-vector-widetag))))))
+               (if (union-type-p ctype)
+                   (let ((types (union-type-types ctype)))
+                     (cond ((not (every #'numeric-type-p types))
+                            (result sb!vm:simple-vector-widetag))
+                           ((csubtypep ctype (specifier-type 'integer))
+                            (integer-interval-widetag
+                             (reduce #'min types :key #'numeric-type-low)
+                             (reduce #'max types :key #'numeric-type-high)))
+                           ((csubtypep ctype (specifier-type 'double-float))
+                            (result sb!vm:simple-array-double-float-widetag))
+                           ((csubtypep ctype (specifier-type 'single-float))
+                            (result sb!vm:simple-array-single-float-widetag))
+                           #!+long-float
+                           ((csubtypep ctype (specifier-type 'long-float))
+                            (result sb!vm:simple-array-long-float-widetag))
+                           (t
+                            (result sb!vm:simple-vector-widetag))))
+                   (let ((expansion (type-specifier ctype)))
+                     (if (equal expansion type)
+                         (result sb!vm:simple-vector-widetag)
+                         (%vector-widetag-and-n-bits expansion))))))))))))
 
 (defun %complex-vector-widetag (widetag)
   (macrolet ((make-case ()