(defun source-transform-cxr (form)
(if (/= (length form) 2)
(values nil t)
- (let ((name (symbol-name (car form))))
- (do ((i (- (length name) 2) (1- i))
+ (let* ((name (car form))
+ (string (symbol-name
+ (etypecase name
+ (symbol name)
+ (leaf (leaf-source-name name))))))
+ (do ((i (- (length string) 2) (1- i))
(res (cadr form)
- `(,(ecase (char name i)
+ `(,(ecase (char string i)
(#\A 'car)
(#\D 'cdr))
,res)))
;;; a utility for defining derive-type methods of integer operations. If
;;; the types of both X and Y are integer types, then we compute a new
;;; integer type with bounds determined Fun when applied to X and Y.
-;;; Otherwise, we use Numeric-Contagion.
+;;; Otherwise, we use NUMERIC-CONTAGION.
(defun derive-integer-type-aux (x y fun)
(declare (type function fun))
(if (and (numeric-type-p x) (numeric-type-p y)
;;; simple utility to flatten a list
(defun flatten-list (x)
- (labels ((flatten-helper (x r);; 'r' is the stuff to the 'right'.
- (cond ((null x) r)
- ((atom x)
- (cons x r))
- (t (flatten-helper (car x)
- (flatten-helper (cdr x) r))))))
- (flatten-helper x nil)))
+ (labels ((flatten-and-append (tree list)
+ (cond ((null tree) list)
+ ((atom tree) (cons tree list))
+ (t (flatten-and-append
+ (car tree) (flatten-and-append (cdr tree) list))))))
+ (flatten-and-append x nil)))
;;; Take some type of lvar and massage it so that we get a list of the
;;; constituent types. If ARG is *EMPTY-TYPE*, return NIL to indicate
(if member-fun
(with-float-traps-masked
(:underflow :overflow :divide-by-zero)
- (make-member-type
- :members (list
- (funcall member-fun
- (first (member-type-members x))))))
+ (specifier-type
+ `(eql ,(funcall member-fun
+ (first (member-type-members x))))))
;; Otherwise convert to a numeric type.
(let ((result-type-list
(funcall derive-fun (convert-member-type x))))
(cond ((and (member-type-p x) (member-type-p y))
(let* ((x (first (member-type-members x)))
(y (first (member-type-members y)))
- (result (with-float-traps-masked
- (:underflow :overflow :divide-by-zero
- :invalid)
- (funcall fun x y))))
- (cond ((null result))
+ (result (ignore-errors
+ (with-float-traps-masked
+ (:underflow :overflow :divide-by-zero
+ :invalid)
+ (funcall fun x y)))))
+ (cond ((null result) *empty-type*)
((and (floatp result) (float-nan-p result))
(make-numeric-type :class 'float
:format (type-of result)
:complexp :real))
(t
- (make-member-type :members (list result))))))
+ (specifier-type `(eql ,result))))))
((and (member-type-p x) (numeric-type-p y))
(let* ((x (convert-member-type x))
(y (if convert-type (convert-numeric-type y) y))
#'%unary-truncate-derive-type-aux
#'%unary-truncate))
+(defoptimizer (%unary-ftruncate derive-type) ((number))
+ (let ((divisor (specifier-type '(integer 1 1))))
+ (one-arg-derive-type number
+ #'(lambda (n)
+ (ftruncate-derive-type-quot-aux n divisor nil))
+ #'%unary-ftruncate)))
+
;;; Define optimizers for FLOOR and CEILING.
(macrolet
((def (name q-name r-name)
(values nil t t)))
(defun logand-derive-type-aux (x y &optional same-leaf)
- (declare (ignore same-leaf))
+ (when same-leaf
+ (return-from logand-derive-type-aux x))
(multiple-value-bind (x-len x-pos x-neg) (integer-type-length x)
(declare (ignore x-pos))
- (multiple-value-bind (y-len y-pos y-neg) (integer-type-length y)
+ (multiple-value-bind (y-len y-pos y-neg) (integer-type-length y)
(declare (ignore y-pos))
(if (not x-neg)
;; X must be positive.
(if (not y-neg)
;; They must both be positive.
- (cond ((or (null x-len) (null y-len))
+ (cond ((and (null x-len) (null y-len))
(specifier-type 'unsigned-byte))
+ ((null x-len)
+ (specifier-type `(unsigned-byte* ,y-len)))
+ ((null y-len)
+ (specifier-type `(unsigned-byte* ,x-len)))
(t
(specifier-type `(unsigned-byte* ,(min x-len y-len)))))
;; X is positive, but Y might be negative.
(specifier-type 'integer)))))))
(defun logior-derive-type-aux (x y &optional same-leaf)
- (declare (ignore same-leaf))
+ (when same-leaf
+ (return-from logior-derive-type-aux x))
(multiple-value-bind (x-len x-pos x-neg) (integer-type-length x)
(multiple-value-bind (y-len y-pos y-neg) (integer-type-length y)
(cond
(specifier-type 'integer))))))))
(defun logxor-derive-type-aux (x y &optional same-leaf)
- (declare (ignore same-leaf))
+ (when same-leaf
+ (return-from logxor-derive-type-aux (specifier-type '(eql 0))))
(multiple-value-bind (x-len x-pos x-neg) (integer-type-length x)
(multiple-value-bind (y-len y-pos y-neg) (integer-type-length y)
(cond
(max x-len y-len)
'*))))
((or (and (not x-pos) (not y-neg))
- (and (not y-neg) (not y-pos)))
+ (and (not y-pos) (not x-neg)))
;; Either X is negative and Y is positive or vice-versa. The
;; result will be negative.
(specifier-type `(integer ,(if (and x-len y-len)
(deffrob logior)
(deffrob logxor))
-;;; FIXME: could actually do stuff with SAME-LEAF
(defoptimizer (logeqv derive-type) ((x y))
(two-arg-derive-type x y (lambda (x y same-leaf)
(lognot-derive-type-aux
- (logxor-derive-type-aux x y same-leaf)))
+ (logxor-derive-type-aux x y same-leaf)))
#'logeqv))
(defoptimizer (lognand derive-type) ((x y))
(two-arg-derive-type x y (lambda (x y same-leaf)
#'lognor))
(defoptimizer (logandc1 derive-type) ((x y))
(two-arg-derive-type x y (lambda (x y same-leaf)
- (logand-derive-type-aux
- (lognot-derive-type-aux x) y nil))
+ (if same-leaf
+ (specifier-type '(eql 0))
+ (logand-derive-type-aux
+ (lognot-derive-type-aux x) y nil)))
#'logandc1))
(defoptimizer (logandc2 derive-type) ((x y))
(two-arg-derive-type x y (lambda (x y same-leaf)
- (logand-derive-type-aux
- x (lognot-derive-type-aux y) nil))
+ (if same-leaf
+ (specifier-type '(eql 0))
+ (logand-derive-type-aux
+ x (lognot-derive-type-aux y) nil)))
#'logandc2))
(defoptimizer (logorc1 derive-type) ((x y))
(two-arg-derive-type x y (lambda (x y same-leaf)
- (logior-derive-type-aux
- (lognot-derive-type-aux x) y nil))
+ (if same-leaf
+ (specifier-type '(eql -1))
+ (logior-derive-type-aux
+ (lognot-derive-type-aux x) y nil)))
#'logorc1))
(defoptimizer (logorc2 derive-type) ((x y))
(two-arg-derive-type x y (lambda (x y same-leaf)
- (logior-derive-type-aux
- x (lognot-derive-type-aux y) nil))
+ (if same-leaf
+ (specifier-type '(eql -1))
+ (logior-derive-type-aux
+ x (lognot-derive-type-aux y) nil)))
#'logorc2))
\f
;;;; miscellaneous derive-type methods
(defoptimizer (integer-length derive-type) ((x))
(let ((x-type (lvar-type x)))
- (when (and (numeric-type-p x-type)
- (csubtypep x-type (specifier-type 'integer)))
+ (when (numeric-type-p x-type)
;; If the X is of type (INTEGER LO HI), then the INTEGER-LENGTH
;; of X is (INTEGER (MIN lo hi) (MAX lo hi), basically. Be
;; careful about LO or HI being NIL, though. Also, if 0 is
(setf min-len 0))
(specifier-type `(integer ,(or min-len '*) ,(or max-len '*))))))))
+(defoptimizer (isqrt derive-type) ((x))
+ (let ((x-type (lvar-type x)))
+ (when (numeric-type-p x-type)
+ (let* ((lo (numeric-type-low x-type))
+ (hi (numeric-type-high x-type))
+ (lo-res (if lo (isqrt lo) '*))
+ (hi-res (if hi (isqrt hi) '*)))
+ (specifier-type `(integer ,lo-res ,hi-res))))))
+
(defoptimizer (code-char derive-type) ((code))
- (specifier-type 'base-char))
+ (let ((type (lvar-type code)))
+ ;; FIXME: unions of integral ranges? It ought to be easier to do
+ ;; this, given that CHARACTER-SET is basically an integral range
+ ;; type. -- CSR, 2004-10-04
+ (when (numeric-type-p type)
+ (let* ((lo (numeric-type-low type))
+ (hi (numeric-type-high type))
+ (type (specifier-type `(character-set ((,lo . ,hi))))))
+ (cond
+ ;; KLUDGE: when running on the host, we lose a slight amount
+ ;; of precision so that we don't have to "unparse" types
+ ;; that formally we can't, such as (CHARACTER-SET ((0
+ ;; . 0))). -- CSR, 2004-10-06
+ #+sb-xc-host
+ ((csubtypep type (specifier-type 'standard-char)) type)
+ #+sb-xc-host
+ ((csubtypep type (specifier-type 'base-char))
+ (specifier-type 'base-char))
+ #+sb-xc-host
+ ((csubtypep type (specifier-type 'extended-char))
+ (specifier-type 'extended-char))
+ (t #+sb-xc-host (specifier-type 'character)
+ #-sb-xc-host type))))))
(defoptimizer (values derive-type) ((&rest values))
(make-values-type :required (mapcar #'lvar-type values)))
+
+(defun signum-derive-type-aux (type)
+ (if (eq (numeric-type-complexp type) :complex)
+ (let* ((format (case (numeric-type-class type)
+ ((integer rational) 'single-float)
+ (t (numeric-type-format type))))
+ (bound-format (or format 'float)))
+ (make-numeric-type :class 'float
+ :format format
+ :complexp :complex
+ :low (coerce -1 bound-format)
+ :high (coerce 1 bound-format)))
+ (let* ((interval (numeric-type->interval type))
+ (range-info (interval-range-info interval))
+ (contains-0-p (interval-contains-p 0 interval))
+ (class (numeric-type-class type))
+ (format (numeric-type-format type))
+ (one (coerce 1 (or format class 'real)))
+ (zero (coerce 0 (or format class 'real)))
+ (minus-one (coerce -1 (or format class 'real)))
+ (plus (make-numeric-type :class class :format format
+ :low one :high one))
+ (minus (make-numeric-type :class class :format format
+ :low minus-one :high minus-one))
+ ;; KLUDGE: here we have a fairly horrible hack to deal
+ ;; with the schizophrenia in the type derivation engine.
+ ;; The problem is that the type derivers reinterpret
+ ;; numeric types as being exact; so (DOUBLE-FLOAT 0d0
+ ;; 0d0) within the derivation mechanism doesn't include
+ ;; -0d0. Ugh. So force it in here, instead.
+ (zero (make-numeric-type :class class :format format
+ :low (- zero) :high zero)))
+ (case range-info
+ (+ (if contains-0-p (type-union plus zero) plus))
+ (- (if contains-0-p (type-union minus zero) minus))
+ (t (type-union minus zero plus))))))
+
+(defoptimizer (signum derive-type) ((num))
+ (one-arg-derive-type num #'signum-derive-type-aux nil))
\f
;;;; byte operations
;;;;
;;; "goodness" means that the result will not increase (in the
;;; (unsigned-byte +infinity) sense). An ordinary modular function is
;;; replaced with the version, cutting its result to WIDTH or more
-;;; bits. If we have changed anything, we need to flush old derived
-;;; types, because they have nothing in common with the new code.
+;;; bits. For most functions (e.g. for +) we cut all arguments; for
+;;; others (e.g. for ASH) we have "optimizers", cutting only necessary
+;;; arguments (maybe to a different width) and returning the name of a
+;;; modular version, if it exists, or NIL. If we have changed
+;;; anything, we need to flush old derived types, because they have
+;;; nothing in common with the new code.
(defun cut-to-width (lvar width)
(declare (type lvar lvar) (type (integer 0) width))
(labels ((reoptimize-node (node name)
(setf (block-reoptimize (node-block node)) t)
(setf (component-reoptimize (node-component node)) t))
(cut-node (node &aux did-something)
- (when (and (combination-p node)
- (fun-info-p (basic-combination-kind node)))
+ (when (and (not (block-delete-p (node-block node)))
+ (combination-p node)
+ (eq (basic-combination-kind node) :known))
(let* ((fun-ref (lvar-use (combination-fun node)))
(fun-name (leaf-source-name (ref-leaf fun-ref)))
- (modular-fun (find-modular-version fun-name width))
- (name (and (modular-fun-info-p modular-fun)
- (modular-fun-info-name modular-fun))))
+ (modular-fun (find-modular-version fun-name width)))
(when (and modular-fun
- (not (and (eq name 'logand)
+ (not (and (eq fun-name 'logand)
(csubtypep
(single-value-type (node-derived-type node))
- (specifier-type `(unsigned-byte ,width))))))
- (unless (eq modular-fun :good)
- (setq did-something t)
- (change-ref-leaf
+ (specifier-type `(unsigned-byte* ,width))))))
+ (binding* ((name (etypecase modular-fun
+ ((eql :good) fun-name)
+ (modular-fun-info
+ (modular-fun-info-name modular-fun))
+ (function
+ (funcall modular-fun node width)))
+ :exit-if-null))
+ (unless (eql modular-fun :good)
+ (setq did-something t)
+ (change-ref-leaf
fun-ref
(find-free-fun name "in a strange place"))
(setf (combination-kind node) :full))
- (dolist (arg (basic-combination-args node))
- (when (cut-lvar arg)
- (setq did-something t)))
- (when did-something
- (reoptimize-node node fun-name))
- did-something))))
+ (unless (functionp modular-fun)
+ (dolist (arg (basic-combination-args node))
+ (when (cut-lvar arg)
+ (setq did-something t))))
+ (when did-something
+ (reoptimize-node node name))
+ did-something)))))
(cut-lvar (lvar &aux did-something)
(do-uses (node lvar)
(when (cut-node node)
(give-up-ir1-transform "BOOLE code is not a constant."))
(let ((control (lvar-value op)))
(case control
- (#.boole-clr 0)
- (#.boole-set -1)
- (#.boole-1 'x)
- (#.boole-2 'y)
- (#.boole-c1 '(lognot x))
- (#.boole-c2 '(lognot y))
- (#.boole-and '(logand x y))
- (#.boole-ior '(logior x y))
- (#.boole-xor '(logxor x y))
- (#.boole-eqv '(logeqv x y))
- (#.boole-nand '(lognand x y))
- (#.boole-nor '(lognor x y))
- (#.boole-andc1 '(logandc1 x y))
- (#.boole-andc2 '(logandc2 x y))
- (#.boole-orc1 '(logorc1 x y))
- (#.boole-orc2 '(logorc2 x y))
+ (#.sb!xc:boole-clr 0)
+ (#.sb!xc:boole-set -1)
+ (#.sb!xc:boole-1 'x)
+ (#.sb!xc:boole-2 'y)
+ (#.sb!xc:boole-c1 '(lognot x))
+ (#.sb!xc:boole-c2 '(lognot y))
+ (#.sb!xc:boole-and '(logand x y))
+ (#.sb!xc:boole-ior '(logior x y))
+ (#.sb!xc:boole-xor '(logxor x y))
+ (#.sb!xc:boole-eqv '(logeqv x y))
+ (#.sb!xc:boole-nand '(lognand x y))
+ (#.sb!xc:boole-nor '(lognor x y))
+ (#.sb!xc:boole-andc1 '(logandc1 x y))
+ (#.sb!xc:boole-andc2 '(logandc2 x y))
+ (#.sb!xc:boole-orc1 '(logorc1 x y))
+ (#.sb!xc:boole-orc2 '(logorc2 x y))
(t
(abort-ir1-transform "~S is an illegal control arg to BOOLE."
control)))))
(let* ((y (lvar-value y))
(y-abs (abs y))
(len (1- (integer-length y-abs))))
- (unless (= y-abs (ash 1 len))
+ (unless (and (> y-abs 0) (= y-abs (ash 1 len)))
(give-up-ir1-transform))
(if (minusp y)
`(- (ash x ,len))
(let* ((y (lvar-value y))
(y-abs (abs y))
(len (1- (integer-length y-abs))))
- (unless (= y-abs (ash 1 len))
+ (unless (and (> y-abs 0) (= y-abs (ash 1 len)))
(give-up-ir1-transform))
(let ((shift (- len))
(mask (1- y-abs))
(let* ((y (lvar-value y))
(y-abs (abs y))
(len (1- (integer-length y-abs))))
- (unless (= y-abs (ash 1 len))
+ (unless (and (> y-abs 0) (= y-abs (ash 1 len)))
(give-up-ir1-transform))
(let ((mask (1- y-abs)))
(if (minusp y)
(let* ((y (lvar-value y))
(y-abs (abs y))
(len (1- (integer-length y-abs))))
- (unless (= y-abs (ash 1 len))
+ (unless (and (> y-abs 0) (= y-abs (ash 1 len)))
(give-up-ir1-transform))
(let* ((shift (- len))
(mask (1- y-abs)))
`(- (ash (- x) ,shift)))
(- (logand (- x) ,mask)))
(values ,(if (minusp y)
- `(- (ash (- x) ,shift))
+ `(ash (- ,mask x) ,shift)
`(ash x ,shift))
(logand x ,mask))))))
(let* ((y (lvar-value y))
(y-abs (abs y))
(len (1- (integer-length y-abs))))
- (unless (= y-abs (ash 1 len))
+ (unless (and (> y-abs 0) (= y-abs (ash 1 len)))
(give-up-ir1-transform))
(let ((mask (1- y-abs)))
`(if (minusp x)
\f
;;;; character operations
-(deftransform char-equal ((a b) (base-char base-char))
+(deftransform char-equal ((a b)
+ ((character-set ((0 . 255)))
+ (character-set ((0 . 255)))))
"open code"
'(let* ((ac (char-code a))
(bc (char-code b))
(or (zerop sum)
(when (eql sum #x20)
(let ((sum (+ ac bc)))
- (and (> sum 161) (< sum 213)))))))
+ (or (and (> sum 161) (< sum 213))
+ (and (> sum 415) (< sum 461))
+ (and (> sum 463) (< sum 477))))))))
-(deftransform char-upcase ((x) (base-char))
+(deftransform char-upcase ((x) ((character-set ((0 . 255)))))
"open code"
'(let ((n-code (char-code x)))
- (if (and (> n-code #o140) ; Octal 141 is #\a.
- (< n-code #o173)) ; Octal 172 is #\z.
+ (if (or (and (> n-code #o140) ; Octal 141 is #\a.
+ (< n-code #o173)) ; Octal 172 is #\z.
+ (and (> n-code #o337)
+ (< n-code #o367))
+ (and (> n-code #o367)
+ (< n-code #o377)))
(code-char (logxor #x20 n-code))
x)))
-(deftransform char-downcase ((x) (base-char))
+(deftransform char-downcase ((x) ((character-set ((0 . 255)))))
"open code"
'(let ((n-code (char-code x)))
- (if (and (> n-code 64) ; 65 is #\A.
- (< n-code 91)) ; 90 is #\Z.
+ (if (or (and (> n-code 64) ; 65 is #\A.
+ (< n-code 91)) ; 90 is #\Z.
+ (and (> n-code 191)
+ (< n-code 215))
+ (and (> n-code 215)
+ (< n-code 223)))
(code-char (logxor #x20 n-code))
x)))
\f
;;; then the result is definitely false.
(deftransform simple-equality-transform ((x y) * *
:defun-only t)
- (cond ((same-leaf-ref-p x y)
- t)
- ((not (types-equal-or-intersect (lvar-type x)
- (lvar-type y)))
+ (cond
+ ((same-leaf-ref-p x y) t)
+ ((not (types-equal-or-intersect (lvar-type x) (lvar-type y)))
nil)
- (t
- (give-up-ir1-transform))))
+ (t (give-up-ir1-transform))))
(macrolet ((def (x)
`(%deftransform ',x '(function * *) #'simple-equality-transform)))
(def eq)
- (def char=)
- (def equal))
+ (def char=))
-;;; This is similar to SIMPLE-EQUALITY-PREDICATE, except that we also
+;;; This is similar to SIMPLE-EQUALITY-TRANSFORM, except that we also
;;; try to convert to a type-specific predicate or EQ:
;;; -- If both args are characters, convert to CHAR=. This is better than
;;; just converting to EQ, since CHAR= may have special compilation
(y-type (lvar-type y))
(char-type (specifier-type 'character))
(number-type (specifier-type 'number)))
- (cond ((same-leaf-ref-p x y)
- t)
+ (cond
+ ((same-leaf-ref-p x y) t)
((not (types-equal-or-intersect x-type y-type))
nil)
((and (csubtypep x-type char-type)
(t
(give-up-ir1-transform)))))
+;;; similarly to the EQL transform above, we attempt to constant-fold
+;;; or convert to a simpler predicate: mostly we have to be careful
+;;; with strings.
+(deftransform equal ((x y) * *)
+ "convert to simpler equality predicate"
+ (let ((x-type (lvar-type x))
+ (y-type (lvar-type y))
+ (string-type (specifier-type 'string)))
+ (cond
+ ((same-leaf-ref-p x y) t)
+ ((and (csubtypep x-type string-type)
+ (csubtypep y-type string-type))
+ '(string= x y))
+ ((and (or (not (types-equal-or-intersect x-type string-type))
+ (not (types-equal-or-intersect y-type string-type)))
+ (not (types-equal-or-intersect x-type y-type)))
+ nil)
+ (t (give-up-ir1-transform)))))
+
;;; Convert to EQL if both args are rational and complexp is specified
;;; and the same for both.
(deftransform = ((x y) * *)
;;; information. If X's high bound is < Y's low, then X < Y.
;;; Similarly, if X's low is >= to Y's high, the X >= Y (so return
;;; NIL). If not, at least make sure any constant arg is second.
-(macrolet ((def (name reflexive-p surely-true surely-false)
+(macrolet ((def (name inverse reflexive-p surely-true surely-false)
`(deftransform ,name ((x y))
(if (same-leaf-ref-p x y)
,reflexive-p
- (let ((x (or (type-approximate-interval (lvar-type x))
- (give-up-ir1-transform)))
- (y (or (type-approximate-interval (lvar-type y))
- (give-up-ir1-transform))))
+ (let ((ix (or (type-approximate-interval (lvar-type x))
+ (give-up-ir1-transform)))
+ (iy (or (type-approximate-interval (lvar-type y))
+ (give-up-ir1-transform))))
(cond (,surely-true
t)
(,surely-false
nil)
((and (constant-lvar-p x)
(not (constant-lvar-p y)))
- `(,',name y x))
+ `(,',inverse y x))
(t
(give-up-ir1-transform))))))))
- (def < nil (interval-< x y) (interval->= x y))
- (def > nil (interval-< y x) (interval->= y x))
- (def <= t (interval->= y x) (interval-< y x))
- (def >= t (interval->= x y) (interval-< x y)))
+ (def < > nil (interval-< ix iy) (interval->= ix iy))
+ (def > < nil (interval-< iy ix) (interval->= iy ix))
+ (def <= >= t (interval->= iy ix) (interval-< iy ix))
+ (def >= <= t (interval->= ix iy) (interval-< ix iy)))
(defun ir1-transform-char< (x y first second inverse)
(cond
(if (null rest)
`(values (the real ,arg0))
`(let ((maxrest (max ,@rest)))
- (if (> ,arg0 maxrest) ,arg0 maxrest)))))
+ (if (>= ,arg0 maxrest) ,arg0 maxrest)))))
(define-source-transform min (arg0 &rest rest)
(once-only ((arg0 arg0))
(if (null rest)
`(values (the real ,arg0))
`(let ((minrest (min ,@rest)))
- (if (< ,arg0 minrest) ,arg0 minrest)))))
+ (if (<= ,arg0 minrest) ,arg0 minrest)))))
\f
;;;; converting N-arg arithmetic functions
;;;;
;;; for compile-time argument count checking.
;;;
-;;; FIXME I: this is currently called from DEFTRANSFORMs, the vast
-;;; majority of which are not going to transform the code, but instead
-;;; are going to GIVE-UP-IR1-TRANSFORM unconditionally. It would be
-;;; nice to make this explicit, maybe by implementing a new
-;;; "optimizer" (say, DEFOPTIMIZER CONSISTENCY-CHECK).
-;;;
;;; FIXME II: In some cases, type information could be correlated; for
;;; instance, ~{ ... ~} requires a list argument, so if the lvar-type
;;; of a corresponding argument is known and does not intersect the
(let ((nargs (length args)))
(cond
((< nargs min)
- (compiler-warn "Too few arguments (~D) to ~S ~S: ~
- requires at least ~D."
- nargs fun string min))
+ (warn 'format-too-few-args-warning
+ :format-control
+ "Too few arguments (~D) to ~S ~S: requires at least ~D."
+ :format-arguments (list nargs fun string min)))
((> nargs max)
- (;; to get warned about probably bogus code at
- ;; cross-compile time.
- #+sb-xc-host compiler-warn
- ;; ANSI saith that too many arguments doesn't cause a
- ;; run-time error.
- #-sb-xc-host compiler-style-warn
- "Too many arguments (~D) to ~S ~S: uses at most ~D."
- nargs fun string max)))))))
+ (warn 'format-too-many-args-warning
+ :format-control
+ "Too many arguments (~D) to ~S ~S: uses at most ~D."
+ :format-arguments (list nargs fun string max))))))))
(defoptimizer (format optimizer) ((dest control &rest args))
(when (constant-lvar-p control)
(let ((nargs (length args)))
(cond
((< nargs (min min1 min2))
- (compiler-warn "Too few arguments (~D) to ~S ~S ~S: ~
- requires at least ~D."
- nargs 'cerror y x (min min1 min2)))
+ (warn 'format-too-few-args-warning
+ :format-control
+ "Too few arguments (~D) to ~S ~S ~S: ~
+ requires at least ~D."
+ :format-arguments
+ (list nargs 'cerror y x (min min1 min2))))
((> nargs (max max1 max2))
- (;; to get warned about probably bogus code at
- ;; cross-compile time.
- #+sb-xc-host compiler-warn
- ;; ANSI saith that too many arguments doesn't cause a
- ;; run-time error.
- #-sb-xc-host compiler-style-warn
- "Too many arguments (~D) to ~S ~S ~S: uses at most ~D."
- nargs 'cerror y x (max max1 max2)))))))))))))
+ (warn 'format-too-many-args-warning
+ :format-control
+ "Too many arguments (~D) to ~S ~S ~S: ~
+ uses at most ~D."
+ :format-arguments
+ (list nargs 'cerror y x (max max1 max2))))))))))))))
(defoptimizer (coerce derive-type) ((value type))
(cond
(t
*universal-type*)))))
+;;; Like CMU CL, we use HEAPSORT. However, other than that, this code
+;;; isn't really related to the CMU CL code, since instead of trying
+;;; to generalize the CMU CL code to allow START and END values, this
+;;; code has been written from scratch following Chapter 7 of
+;;; _Introduction to Algorithms_ by Corman, Rivest, and Shamir.
(define-source-transform sb!impl::sort-vector (vector start end predicate key)
+ ;; Like CMU CL, we use HEAPSORT. However, other than that, this code
+ ;; isn't really related to the CMU CL code, since instead of trying
+ ;; to generalize the CMU CL code to allow START and END values, this
+ ;; code has been written from scratch following Chapter 7 of
+ ;; _Introduction to Algorithms_ by Corman, Rivest, and Shamir.
`(macrolet ((%index (x) `(truly-the index ,x))
(%parent (i) `(ash ,i -1))
(%left (i) `(%index (ash ,i 1)))
(%elt largest) i-elt
i largest)))))))))
(%sort-vector (keyfun &optional (vtype 'vector))
- `(macrolet (;; KLUDGE: In SBCL ca. 0.6.10, I had trouble getting
- ;; type inference to propagate all the way
- ;; through this tangled mess of
- ;; inlining. The TRULY-THE here works
- ;; around that. -- WHN
+ `(macrolet (;; KLUDGE: In SBCL ca. 0.6.10, I had
+ ;; trouble getting type inference to
+ ;; propagate all the way through this
+ ;; tangled mess of inlining. The TRULY-THE
+ ;; here works around that. -- WHN
(%elt (i)
`(aref (truly-the ,',vtype ,',',vector)
(%index (+ (%index ,i) start-1)))))
- (let ((start-1 (1- ,',start)) ; Heaps prefer 1-based addressing.
+ (let (;; Heaps prefer 1-based addressing.
+ (start-1 (1- ,',start))
(current-heap-size (- ,',end ,',start))
(keyfun ,keyfun))
(declare (type (integer -1 #.(1- most-positive-fixnum))