From: Nikodemus S. <de...@us...> - 2008-09-30 07:57:14
|
Update of /cvsroot/sbcl/sbcl/src/code In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv16572/src/code Modified Files: irrat.lisp time.lisp Log Message: 1.0.20.33: two buglets, LOG and TIME * Unbreak (LOG DOUBLE INTEGER). * LAMBDAS-CONVERTED / LAMBDA-CONVERSIONS confusion in PRINT-TIME. (patch by Erik Marsden) Index: irrat.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/irrat.lisp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- irrat.lisp 26 Sep 2008 16:24:05 -0000 1.36 +++ irrat.lisp 30 Sep 2008 07:56:57 -0000 1.37 @@ -342,10 +342,11 @@ ((and (typep number '(integer (0) *)) (typep base '(integer (0) *))) (coerce (/ (log2 number) (log2 base)) 'single-float)) - ((or (and (typep number 'integer) (typep base 'double-float)) - (and (typep number 'double-float) (typep base 'integer))) + ((and (typep number 'integer) (typep base 'double-float)) ;; No single float intermediate result (/ (log2 number) (log base 2.0d0))) + ((and (typep number 'double-float) (typep base 'integer)) + (/ (log number 2.0d0) (log2 base))) (t (/ (log number) (log base)))) (number-dispatch ((number number)) Index: time.lisp =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/code/time.lisp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- time.lisp 19 Sep 2008 19:01:20 -0000 1.38 +++ time.lisp 30 Sep 2008 07:56:57 -0000 1.39 @@ -265,7 +265,7 @@ (defun print-time (&key real-time-ms user-run-time-us system-run-time-us gc-run-time-ms processor-cycles eval-calls - lambda-conversions page-faults bytes-consed + lambdas-converted page-faults bytes-consed aborted) (let ((total-run-time-us (+ user-run-time-us system-run-time-us))) (format *trace-output* @@ -294,7 +294,7 @@ 100.0 (float (* 100 (/ (round total-run-time-us 1000) real-time-ms)))) eval-calls - lambda-conversions + lambdas-converted processor-cycles page-faults bytes-consed |