X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Fsrctran.lisp;h=4b70251be13484faef89c2cdb0c2003057be0d44;hb=ff57884e206ac28660af6af34315bc9b81697f57;hp=d7b83854666f44259918b6a4b3a17dcac9669aaa;hpb=24466b987096dd6ec63067b1531367308f199c99;p=sbcl.git diff --git a/src/compiler/srctran.lisp b/src/compiler/srctran.lisp index d7b8385..4b70251 100644 --- a/src/compiler/srctran.lisp +++ b/src/compiler/srctran.lisp @@ -29,10 +29,9 @@ (define-source-transform identity (x) `(prog1 ,x)) (define-source-transform values (x) `(prog1 ,x)) -;;; Bind the value and make a closure that returns them. +;;; Bind the value and make a closure that returns it. (define-source-transform constantly (value) - (let ((rest (gensym "CONSTANTLY-REST-")) - (n-value (gensym "CONSTANTLY-VALUE-"))) + (with-unique-names (rest n-value) `(let ((,n-value ,value)) (lambda (&rest ,rest) (declare (ignore ,rest)) @@ -817,7 +816,6 @@ ;;; are equal to an intermediate convention for which they are ;;; considered different which is more natural for some of the ;;; optimisers. -#!-negative-zero-is-not-zero (defun convert-numeric-type (type) (declare (type numeric-type type)) ;;; Only convert real float interval delimiters types. @@ -836,11 +834,11 @@ :low (if lo-float-zero-p (if (consp lo) (list (float 0.0 lo-val)) - (float -0.0 lo-val)) + (float (load-time-value (make-unportable-float :single-float-negative-zero)) lo-val)) lo) :high (if hi-float-zero-p (if (consp hi) - (list (float -0.0 hi-val)) + (list (float (load-time-value (make-unportable-float :single-float-negative-zero)) hi-val)) (float 0.0 hi-val)) hi)) type)) @@ -850,7 +848,6 @@ ;;; Convert back from the intermediate convention for which -0.0 and ;;; 0.0 are considered different to the standard type convention for ;;; which and equal. -#!-negative-zero-is-not-zero (defun convert-back-numeric-type (type) (declare (type numeric-type type)) ;;; Only convert real float interval delimiters types. @@ -938,7 +935,6 @@ type)) ;;; Convert back a possible list of numeric types. -#!-negative-zero-is-not-zero (defun convert-back-numeric-type-list (type-list) (typecase type-list (list @@ -960,7 +956,9 @@ ;;; FIXME: MAKE-CANONICAL-UNION-TYPE and CONVERT-MEMBER-TYPE probably ;;; belong in the kernel's type logic, invoked always, instead of in -;;; the compiler, invoked only during some type optimizations. +;;; the compiler, invoked only during some type optimizations. (In +;;; fact, as of 0.pre8.100 or so they probably are, under +;;; MAKE-MEMBER-TYPE, so probably this code can be deleted) ;;; Take a list of types and return a canonical type specifier, ;;; combining any MEMBER types together. If both positive and negative @@ -975,24 +973,15 @@ (setf members (union members (member-type-members type))) (push type misc-types))) #!+long-float - (when (null (set-difference '(-0l0 0l0) members)) - #!-negative-zero-is-not-zero - (push (specifier-type '(long-float 0l0 0l0)) misc-types) - #!+negative-zero-is-not-zero - (push (specifier-type '(long-float -0l0 0l0)) misc-types) - (setf members (set-difference members '(-0l0 0l0)))) - (when (null (set-difference '(-0d0 0d0) members)) - #!-negative-zero-is-not-zero - (push (specifier-type '(double-float 0d0 0d0)) misc-types) - #!+negative-zero-is-not-zero - (push (specifier-type '(double-float -0d0 0d0)) misc-types) - (setf members (set-difference members '(-0d0 0d0)))) - (when (null (set-difference '(-0f0 0f0) members)) - #!-negative-zero-is-not-zero - (push (specifier-type '(single-float 0f0 0f0)) misc-types) - #!+negative-zero-is-not-zero - (push (specifier-type '(single-float -0f0 0f0)) misc-types) - (setf members (set-difference members '(-0f0 0f0)))) + (when (null (set-difference `(,(load-time-value (make-unportable-float :long-float-negative-zero)) 0.0l0) members)) + (push (specifier-type '(long-float 0.0l0 0.0l0)) misc-types) + (setf members (set-difference members `(,(load-time-value (make-unportable-float :long-float-negative-zero)) 0.0l0)))) + (when (null (set-difference `(,(load-time-value (make-unportable-float :double-float-negative-zero)) 0.0d0) members)) + (push (specifier-type '(double-float 0.0d0 0.0d0)) misc-types) + (setf members (set-difference members `(,(load-time-value (make-unportable-float :double-float-negative-zero)) 0.0d0)))) + (when (null (set-difference `(,(load-time-value (make-unportable-float :single-float-negative-zero)) 0.0f0) members)) + (push (specifier-type '(single-float 0.0f0 0.0f0)) misc-types) + (setf members (set-difference members `(,(load-time-value (make-unportable-float :single-float-negative-zero)) 0.0f0)))) (if members (apply #'type-union (make-member-type :members members) misc-types) (apply #'type-union misc-types)))) @@ -1023,8 +1012,7 @@ (defun one-arg-derive-type (arg derive-fcn member-fcn &optional (convert-type t)) (declare (type function derive-fcn) - (type (or null function) member-fcn) - #!+negative-zero-is-not-zero (ignore convert-type)) + (type (or null function) member-fcn)) (let ((arg-list (prepare-arg-for-derive-type (continuation-type arg)))) (when arg-list (flet ((deriver (x) @@ -1040,20 +1028,14 @@ ;; Otherwise convert to a numeric type. (let ((result-type-list (funcall derive-fcn (convert-member-type x)))) - #!-negative-zero-is-not-zero (if convert-type (convert-back-numeric-type-list result-type-list) - result-type-list) - #!+negative-zero-is-not-zero - result-type-list))) + result-type-list)))) (numeric-type - #!-negative-zero-is-not-zero (if convert-type (convert-back-numeric-type-list (funcall derive-fcn (convert-numeric-type x))) - (funcall derive-fcn x)) - #!+negative-zero-is-not-zero - (funcall derive-fcn x)) + (funcall derive-fcn x))) (t *universal-type*)))) ;; Run down the list of args and derive the type of each one, @@ -1077,10 +1059,7 @@ (defun two-arg-derive-type (arg1 arg2 derive-fcn fcn &optional (convert-type t)) (declare (type function derive-fcn fcn)) - #!+negative-zero-is-not-zero - (declare (ignore convert-type)) - (flet (#!-negative-zero-is-not-zero - (deriver (x y same-arg) + (flet ((deriver (x y same-arg) (cond ((and (member-type-p x) (member-type-p y)) (let* ((x (first (member-type-members x))) (y (first (member-type-members y))) @@ -1117,26 +1096,6 @@ (convert-back-numeric-type-list result) result))) (t - *universal-type*))) - #!+negative-zero-is-not-zero - (deriver (x y same-arg) - (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) - (funcall fcn x y)))) - (if result - (make-member-type :members (list result))))) - ((and (member-type-p x) (numeric-type-p y)) - (let ((x (convert-member-type x))) - (funcall derive-fcn x y same-arg))) - ((and (numeric-type-p x) (member-type-p y)) - (let ((y (convert-member-type y))) - (funcall derive-fcn x y same-arg))) - ((and (numeric-type-p x) (numeric-type-p y)) - (funcall derive-fcn x y same-arg)) - (t *universal-type*)))) (let ((same-arg (same-leaf-ref-p arg1 arg2)) (a1 (prepare-arg-for-derive-type (continuation-type arg1))) @@ -1347,16 +1306,19 @@ ) ; PROGN - -;;; KLUDGE: All this ASH optimization is suppressed under CMU CL -;;; because as of version 2.4.6 for Debian, CMU CL blows up on (ASH -;;; 1000000000 -100000000000) (i.e. ASH of two bignums yielding zero) -;;; and it's hard to avoid that calculation in here. -#-(and cmu sb-xc-host) -(progn - (defun ash-derive-type-aux (n-type shift same-arg) (declare (ignore same-arg)) + ;; KLUDGE: All this ASH optimization is suppressed under CMU CL for + ;; some bignum cases because as of version 2.4.6 for Debian and 18d, + ;; CMU CL blows up on (ASH 1000000000 -100000000000) (i.e. ASH of + ;; two bignums yielding zero) and it's hard to avoid that + ;; calculation in here. + #+(and cmu sb-xc-host) + (when (and (or (typep (numeric-type-low n-type) 'bignum) + (typep (numeric-type-high n-type) 'bignum)) + (or (typep (numeric-type-low shift) 'bignum) + (typep (numeric-type-high shift) 'bignum))) + (return-from ash-derive-type-aux *universal-type*)) (flet ((ash-outer (n s) (when (and (fixnump s) (<= s 64) @@ -1389,7 +1351,6 @@ (defoptimizer (ash derive-type) ((n shift)) (two-arg-derive-type n shift #'ash-derive-type-aux #'ash)) -) ; PROGN #+sb-xc-host ; (See CROSS-FLOAT-INFINITY-KLUDGE.) (macrolet ((frob (fun) @@ -2301,10 +2262,7 @@ (specifier-type 'base-char)) (defoptimizer (values derive-type) ((&rest values)) - (values-specifier-type - `(values ,@(mapcar (lambda (x) - (type-specifier (continuation-type x))) - values)))) + (make-values-type :required (mapcar #'continuation-type values))) ;;;; byte operations ;;;; @@ -2589,7 +2547,8 @@ (or result 0))) ;;; If arg is a constant power of two, turn FLOOR into a shift and -;;; mask. If CEILING, add in (1- (ABS Y)) and then do FLOOR. +;;; mask. If CEILING, add in (1- (ABS Y)), do FLOOR and correct a +;;; remainder. (flet ((frob (y ceil-p) (unless (constant-continuation-p y) (give-up-ir1-transform)) @@ -2599,13 +2558,14 @@ (unless (= y-abs (ash 1 len)) (give-up-ir1-transform)) (let ((shift (- len)) - (mask (1- y-abs))) - `(let ,(when ceil-p `((x (+ x ,(1- y-abs))))) + (mask (1- y-abs)) + (delta (if ceil-p (* (signum y) (1- y-abs)) 0))) + `(let ((x (+ x ,delta))) ,(if (minusp y) `(values (ash (- x) ,shift) - (- (logand (- x) ,mask))) + (- (- (logand (- x) ,mask)) ,delta)) `(values (ash x ,shift) - (logand x ,mask)))))))) + (- (logand x ,mask) ,delta)))))))) (deftransform floor ((x y) (integer integer) *) "convert division by 2^k to shift" (frob y nil)) @@ -3012,11 +2972,11 @@ ;;; negated test as appropriate. If it is a degenerate one-arg call, ;;; then we transform to code that returns true. Otherwise, we bind ;;; all the arguments and expand into a bunch of IFs. -(declaim (ftype (function (symbol list boolean) *) multi-compare)) -(defun multi-compare (predicate args not-p) +(declaim (ftype (function (symbol list boolean t) *) multi-compare)) +(defun multi-compare (predicate args not-p type) (let ((nargs (length args))) (cond ((< nargs 1) (values nil t)) - ((= nargs 1) `(progn ,@args t)) + ((= nargs 1) `(progn (the ,type ,@args) t)) ((= nargs 2) (if not-p `(if (,predicate ,(first args) ,(second args)) nil t) @@ -3032,40 +2992,46 @@ `(if (,predicate ,current ,last) ,result nil)))) ((zerop i) - `((lambda ,vars ,result) . ,args))))))) - -(define-source-transform = (&rest args) (multi-compare '= args nil)) -(define-source-transform < (&rest args) (multi-compare '< args nil)) -(define-source-transform > (&rest args) (multi-compare '> args nil)) -(define-source-transform <= (&rest args) (multi-compare '> args t)) -(define-source-transform >= (&rest args) (multi-compare '< args t)) - -(define-source-transform char= (&rest args) (multi-compare 'char= args nil)) -(define-source-transform char< (&rest args) (multi-compare 'char< args nil)) -(define-source-transform char> (&rest args) (multi-compare 'char> args nil)) -(define-source-transform char<= (&rest args) (multi-compare 'char> args t)) -(define-source-transform char>= (&rest args) (multi-compare 'char< args t)) + `((lambda ,vars (declare (type ,type ,@vars)) ,result) + ,@args))))))) + +(define-source-transform = (&rest args) (multi-compare '= args nil 'number)) +(define-source-transform < (&rest args) (multi-compare '< args nil 'real)) +(define-source-transform > (&rest args) (multi-compare '> args nil 'real)) +(define-source-transform <= (&rest args) (multi-compare '> args t 'real)) +(define-source-transform >= (&rest args) (multi-compare '< args t 'real)) + +(define-source-transform char= (&rest args) (multi-compare 'char= args nil + 'character)) +(define-source-transform char< (&rest args) (multi-compare 'char< args nil + 'character)) +(define-source-transform char> (&rest args) (multi-compare 'char> args nil + 'character)) +(define-source-transform char<= (&rest args) (multi-compare 'char> args t + 'character)) +(define-source-transform char>= (&rest args) (multi-compare 'char< args t + 'character)) (define-source-transform char-equal (&rest args) - (multi-compare 'char-equal args nil)) + (multi-compare 'char-equal args nil 'character)) (define-source-transform char-lessp (&rest args) - (multi-compare 'char-lessp args nil)) + (multi-compare 'char-lessp args nil 'character)) (define-source-transform char-greaterp (&rest args) - (multi-compare 'char-greaterp args nil)) + (multi-compare 'char-greaterp args nil 'character)) (define-source-transform char-not-greaterp (&rest args) - (multi-compare 'char-greaterp args t)) + (multi-compare 'char-greaterp args t 'character)) (define-source-transform char-not-lessp (&rest args) - (multi-compare 'char-lessp args t)) + (multi-compare 'char-lessp args t 'character)) ;;; This function does source transformation of N-arg inequality ;;; functions such as /=. This is similar to MULTI-COMPARE in the <3 ;;; arg cases. If there are more than two args, then we expand into ;;; the appropriate n^2 comparisons only when speed is important. -(declaim (ftype (function (symbol list) *) multi-not-equal)) -(defun multi-not-equal (predicate args) +(declaim (ftype (function (symbol list t) *) multi-not-equal)) +(defun multi-not-equal (predicate args type) (let ((nargs (length args))) (cond ((< nargs 1) (values nil t)) - ((= nargs 1) `(progn ,@args t)) + ((= nargs 1) `(progn (the ,type ,@args) t)) ((= nargs 2) `(if (,predicate ,(first args) ,(second args)) nil t)) ((not (policy *lexenv* @@ -3078,24 +3044,18 @@ (next (cdr vars) (cdr next)) (result t)) ((null next) - `((lambda ,vars ,result) . ,args)) + `((lambda ,vars (declare (type ,type ,@vars)) ,result) + ,@args)) (let ((v1 (first var))) (dolist (v2 next) (setq result `(if (,predicate ,v1 ,v2) nil ,result)))))))))) -(define-source-transform /= (&rest args) (multi-not-equal '= args)) -(define-source-transform char/= (&rest args) (multi-not-equal 'char= args)) +(define-source-transform /= (&rest args) + (multi-not-equal '= args 'number)) +(define-source-transform char/= (&rest args) + (multi-not-equal 'char= args 'character)) (define-source-transform char-not-equal (&rest args) - (multi-not-equal 'char-equal args)) - -;;; FIXME: can go away once bug 194 is fixed and we can use (THE REAL X) -;;; as God intended -(defun error-not-a-real (x) - (error 'simple-type-error - :datum x - :expected-type 'real - :format-control "not a REAL: ~S" - :format-arguments (list x))) + (multi-not-equal 'char-equal args 'character)) ;;; Expand MAX and MIN into the obvious comparisons. (define-source-transform max (arg0 &rest rest) @@ -3410,7 +3370,7 @@ (error "can't understand type ~S~%" element-type)))))) (cond ((array-type-p array-type) (get-element-type array-type)) - ((union-type-p array-type) + ((union-type-p array-type) (apply #'type-union (mapcar #'get-element-type (union-type-types array-type)))) (t @@ -3468,7 +3428,7 @@ (loop for i of-type index from (ash current-heap-size -1) downto 1 do (%heapify i)) - (loop + (loop (when (< current-heap-size 2) (return)) (rotatef (%elt 1) (%elt current-heap-size))