- movitz-cvs@lists.common-lisp.net - mailman3.common-lisp.net

[movitz-cvs] CVS update: movitz/losp/muerte/defstruct.lisp
by Frode Vatvedt Fjeld 20 Jul '04

20 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv15777 Modified Files: defstruct.lisp Log Message: Cleaned up most ":int 107" instances. Now, we mostly use the semi-standardized ":int 64" which means that the value in EAX wasn't integer. The default interrupt-handler understands this and signals the appropriate error. Date: Tue Jul 20 01:54:09 2004 Author: ffjeld Index: movitz/losp/muerte/defstruct.lisp diff -u movitz/losp/muerte/defstruct.lisp:1.9 movitz/losp/muerte/defstruct.lisp:1.10 --- movitz/losp/muerte/defstruct.lisp:1.9 Thu Jul 15 14:06:55 2004 +++ movitz/losp/muerte/defstruct.lisp Tue Jul 20 01:54:09 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Mon Jan 22 13:10:59 2001 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: defstruct.lisp,v 1.9 2004/07/15 21:06:55 ffjeld Exp $ +;;;; $Id: defstruct.lisp,v 1.10 2004/07/20 08:54:09 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -64,10 +64,10 @@ ;; type test passed, read slot ,@(if (= 4 movitz::+movitz-fixnum-factor+) `((:compile-form (:result-mode :ebx) slot-number) - (:movl (:eax :ebx #.(bt:slot-offset 'movitz::movitz-struct 'movitz::slot0)) + (:movl (:eax :ebx (:offset movitz-struct slot0)) :eax)) `((:compile-form (:result-mode :untagged-fixnum-ecx) slot-number) - (:movl (:eax (:ecx 4) #.(bt:slot-offset 'movitz::movitz-struct 'movitz::slot0)) + (:movl (:eax (:ecx 4) (:offset movitz-struct slot0)) :eax)))))) (do-it))) @@ -86,12 +86,12 @@ (:movzxw (:eax ,(bt:slot-offset 'movitz::movitz-struct 'movitz::length)) :ecx) (:leal ((:ecx ,movitz::+movitz-fixnum-factor+)) :ecx) (:testb ,movitz::+movitz-fixnum-zmask+ :bl) - (:jnz '(:sub-program (not-fixnum) (:int 107))) + (:jnz '(:sub-program (not-fixnum) (:movl :ebx :eax) (:int 64))) (:cmpl :ecx :ebx) - (:jae '(:sub-program (out-of-range) (:int 61))) - ;; type test passed, read slot - (:compile-form (:result-mode :ecx) value) - (:movl :ecx (:eax :ebx #.(bt:slot-offset 'movitz::movitz-struct 'movitz::slot0)))))) + (:jae '(:sub-program (out-of-range) (:int 65))) + ;; type test passed, write slot + (:compile-form (:result-mode :edx) value) + (:movl :edx (:eax :ebx (:offset movitz-struct slot0)))))) (do-it))) (defun struct-accessor-prototype (object)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/conditions.lisp
by Frode Vatvedt Fjeld 20 Jul '04

20 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv14208 Modified Files: conditions.lisp Log Message: Cleaned up most ":int 107" instances. Now, we mostly use the semi-standardized ":int 64" which means that the value in EAX wasn't integer. The default interrupt-handler understands this and signals the appropriate error. Date: Tue Jul 20 01:54:05 2004 Author: ffjeld Index: movitz/losp/muerte/conditions.lisp diff -u movitz/losp/muerte/conditions.lisp:1.8 movitz/losp/muerte/conditions.lisp:1.9 --- movitz/losp/muerte/conditions.lisp:1.8 Mon Jul 12 00:54:30 2004 +++ movitz/losp/muerte/conditions.lisp Tue Jul 20 01:54:05 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Nov 20 15:47:04 2002 ;;;; -;;;; $Id: conditions.lisp,v 1.8 2004/07/12 07:54:30 ffjeld Exp $ +;;;; $Id: conditions.lisp,v 1.9 2004/07/20 08:54:05 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -130,6 +130,18 @@ (funobj-name (condition-function c)) (funobj-lambda-list (condition-function c)) (condition-argument-count c))))) + +(define-condition index-out-of-range (error) + ((index + :initarg :index + :reader condition-index) + (range + :initarg :range + :reader condition-range)) + (:report (lambda (c s) + (format s "Index ~D is beyond range 0-~D." + (condition-index c) + (condition-range c))))) (define-condition stream-error (error) ((stream

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/characters.lisp
by Frode Vatvedt Fjeld 20 Jul '04

20 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv13312 Modified Files: characters.lisp Log Message: Cleaned up most ":int 107" instances. Now, we mostly use the semi-standardized ":int 64" which means that the value in EAX wasn't integer. The default interrupt-handler understands this and signals the appropriate error. Date: Tue Jul 20 01:54:00 2004 Author: ffjeld Index: movitz/losp/muerte/characters.lisp diff -u movitz/losp/muerte/characters.lisp:1.3 movitz/losp/muerte/characters.lisp:1.4 --- movitz/losp/muerte/characters.lisp:1.3 Sun Apr 18 16:16:44 2004 +++ movitz/losp/muerte/characters.lisp Tue Jul 20 01:54:00 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Feb 5 19:05:01 2001 ;;;; -;;;; $Id: characters.lisp,v 1.3 2004/04/18 23:16:44 ffjeld Exp $ +;;;; $Id: characters.lisp,v 1.4 2004/07/20 08:54:00 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -33,7 +33,7 @@ (with-inline-assembly (:returns :eax) (:compile-form (:result-mode :eax) code) (:testb #.movitz::+movitz-fixnum-zmask+ :al) - (:jnz '(:sub-program (not-fixnum) (:int 107))) + (:jnz '(:sub-program (not-fixnum) (:int 64))) (:shll #.(cl:- 8 movitz::+movitz-fixnum-shift+) :eax) (:movb #.(movitz::tag :character) :al)))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/bignums.lisp
by Frode Vatvedt Fjeld 20 Jul '04

20 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv12833 Modified Files: bignums.lisp Log Message: Cleaned up most ":int 107" instances. Now, we mostly use the semi-standardized ":int 64" which means that the value in EAX wasn't integer. The default interrupt-handler understands this and signals the appropriate error. Date: Tue Jul 20 01:53:56 2004 Author: ffjeld Index: movitz/losp/muerte/bignums.lisp diff -u movitz/losp/muerte/bignums.lisp:1.4 movitz/losp/muerte/bignums.lisp:1.5 --- movitz/losp/muerte/bignums.lisp:1.4 Mon Jul 19 07:44:21 2004 +++ movitz/losp/muerte/bignums.lisp Tue Jul 20 01:53:56 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Jul 17 19:42:57 2004 ;;;; -;;;; $Id: bignums.lisp,v 1.4 2004/07/19 14:44:21 ffjeld Exp $ +;;;; $Id: bignums.lisp,v 1.5 2004/07/20 08:53:56 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -36,7 +36,7 @@ (:movl (:eax ,movitz:+other-type-offset+) :ecx) (:shrl 16 :ecx) (:jz '(:sub-program (should-never-happen) - (:int 107))) + (:int 63))) shrink-loop (:cmpl 4 :ecx) (:je 'shrink-no-more) @@ -54,9 +54,9 @@ (:jmp 'done))) shrink-done (:testb 3 :cl) - (:jnz '(:sub-program () (:int 107))) + (:jnz '(:sub-program () (:int 63))) (:testw :cx :cx) - (:jz '(:sub-program () (:int 107))) + (:jz '(:sub-program () (:int 63))) (:movw :cx (:eax ,(bt:slot-offset 'movitz:movitz-bignum 'movitz::length))) done ))) @@ -64,14 +64,14 @@ (defun copy-bignum (old) (check-type old bignum) - (let* ((length (ceiling (bignum-integer-length old) 32)) + (let* ((length (%bignum-bigits old)) (new (malloc-non-pointer-words (1+ length)))) (with-inline-assembly (:returns :eax) (:compile-two-forms (:eax :ebx) new old) (:compile-form (:result-mode :edx) length) copy-bignum-loop - (:movl (:ebx :edx #.movitz:+other-type-offset+) :ecx) - (:movl :ecx (:eax :edx #.movitz:+other-type-offset+)) + (:movl (:ebx :edx (:offset movitz-bignum type)) :ecx) + (:movl :ecx (:eax :edx (:offset movitz-bignum type))) (:subl 4 :edx) (:jnc 'copy-bignum-loop))))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/arithmetic-macros.lisp
by Frode Vatvedt Fjeld 20 Jul '04

20 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv11680 Modified Files: arithmetic-macros.lisp Log Message: Cleaned up most ":int 107" instances. Now, we mostly use the semi-standardized ":int 64" which means that the value in EAX wasn't integer. The default interrupt-handler understands this and signals the appropriate error. Date: Tue Jul 20 01:53:50 2004 Author: ffjeld Index: movitz/losp/muerte/arithmetic-macros.lisp diff -u movitz/losp/muerte/arithmetic-macros.lisp:1.3 movitz/losp/muerte/arithmetic-macros.lisp:1.4 --- movitz/losp/muerte/arithmetic-macros.lisp:1.3 Sun Jul 18 17:14:53 2004 +++ movitz/losp/muerte/arithmetic-macros.lisp Tue Jul 20 01:53:50 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Jul 17 13:42:46 2004 ;;;; -;;;; $Id: arithmetic-macros.lisp,v 1.3 2004/07/19 00:14:53 ffjeld Exp $ +;;;; $Id: arithmetic-macros.lisp,v 1.4 2004/07/20 08:53:50 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -93,7 +93,6 @@ (max (movitz:movitz-eval max env))) (check-type min fixnum) (check-type max fixnum) - ;; (warn "~D -- ~D" min max) (cond ((movitz:movitz-constantp x env) (<= min (movitz:movitz-eval x env) max)) @@ -108,14 +107,14 @@ `(with-inline-assembly (:returns :boolean-cf=1) (:compile-form (:result-mode :eax) ,x) (:testb ,movitz::+movitz-fixnum-zmask+ :al) - (:jnz '(:sub-program () (:int 107))) + (:jnz '(:sub-program () (:int 64))) (:cmpl ,(* (1+ max) movitz::+movitz-fixnum-factor+) :eax))) (t `(do-result-mode-case () (:booleans (with-inline-assembly (:returns :boolean-zf=0) (:compile-form (:result-mode :eax) ,x) (:testb ,movitz::+movitz-fixnum-zmask+ :al) - (:jnz '(:sub-program () (:int 107))) + (:jnz '(:sub-program () (:int 64))) (:cmpl ,(* min movitz::+movitz-fixnum-factor+) :eax) (:sbbl :ecx :ecx) (:cmpl ,(* (1+ max) movitz::+movitz-fixnum-factor+) :eax) @@ -123,7 +122,7 @@ (t (with-inline-assembly (:returns (:boolean-ecx 1 0)) (:compile-form (:result-mode :eax) ,x) (:testb ,movitz::+movitz-fixnum-zmask+ :al) - (:jnz '(:sub-program () (:int 107))) + (:jnz '(:sub-program () (:int 64))) (:cmpl ,(* min movitz::+movitz-fixnum-factor+) :eax) (:sbbl :ecx :ecx) (:cmpl ,(* (1+ max) movitz::+movitz-fixnum-factor+) :eax) @@ -132,22 +131,21 @@ (and (<= ,min x) (<= x ,max)))))) (define-compiler-macro below (&whole form x max &environment env) - (let ((below-not-integer (gensym "below-not-integer-"))) - (if (movitz:movitz-constantp max env) - `(with-inline-assembly (:returns :boolean-cf=1) - (:compile-form (:result-mode :eax) ,x) - (:testb ,movitz::+movitz-fixnum-zmask+ :al) - (:jnz '(:sub-program (,below-not-integer) (:int 107))) - (:cmpl ,(* (movitz:movitz-eval max env) - movitz::+movitz-fixnum-factor+) - :eax)) + (if (movitz:movitz-constantp max env) `(with-inline-assembly (:returns :boolean-cf=1) - (:compile-two-forms (:eax :ebx) ,x ,max) - (:movl :eax :ecx) - (:orl :ebx :ecx) - (:testb ,movitz::+movitz-fixnum-zmask+ :cl) - (:jnz '(:sub-program (,below-not-integer) (:int 107))) - (:cmpl :ebx :eax))))) + (:compile-form (:result-mode :eax) ,x) + (:testb ,movitz::+movitz-fixnum-zmask+ :al) + (:jnz '(:sub-program () (:int 64))) + (:cmpl ,(* (movitz:movitz-eval max env) + movitz::+movitz-fixnum-factor+) + :eax)) + `(with-inline-assembly (:returns :boolean-cf=1) + (:compile-two-forms (:eax :ebx) ,x ,max) + (:testb ,movitz::+movitz-fixnum-zmask+ :al) + (:jnz '(:sub-program () (:int 64))) + (:testb ,movitz::+movitz-fixnum-zmask+ :bl) + (:jnz '(:sub-program () (:movl :ebx :eax) (:int 64))) + (:cmpl :ebx :eax)))) (define-compiler-macro zerop (number) `(= 0 ,number))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/scavenge.lisp
by Frode Vatvedt Fjeld 19 Jul '04

19 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv6862 Modified Files: scavenge.lisp Log Message: Minor bignum tweaks. Date: Mon Jul 19 07:44:25 2004 Author: ffjeld Index: movitz/losp/muerte/scavenge.lisp diff -u movitz/losp/muerte/scavenge.lisp:1.19 movitz/losp/muerte/scavenge.lisp:1.20 --- movitz/losp/muerte/scavenge.lisp:1.19 Wed Jul 14 17:27:34 2004 +++ movitz/losp/muerte/scavenge.lisp Mon Jul 19 07:44:25 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Mar 29 14:54:08 2004 ;;;; -;;;; $Id: scavenge.lisp,v 1.19 2004/07/15 00:27:34 ffjeld Exp $ +;;;; $Id: scavenge.lisp,v 1.20 2004/07/19 14:44:25 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -48,8 +48,9 @@ "If x is a bignum header word, return the number of bigits." `(with-inline-assembly (:returns :eax) (:compile-form (:result-mode :eax) ,x) - (:andl #xfffc0000 :eax) - (:shrl 16 :eax)))) + (:shrl 16 :eax) + (:testb ,movitz:+movitz-fixnum-zmask+ :al) + (:jnz '(:sub-program () (:int 107)))))) (do ((*scan-last* nil) ; Last scanned object, for debugging. (scan start-location (1+ scan))) ((>= scan end-location)) @@ -66,7 +67,7 @@ "Scanned ~Z at odd address #x~X." x scan) ;; Just skip the bigits (let* ((bigits (word-bigits x)) - (delta (1+ (logand bigits -2)))) + (delta (logior bigits 1))) (setf *scan-last* (%word-offset scan #.(movitz:tag :other))) (incf scan delta))) ((scavenge-typep x :funobj)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/bignums.lisp
by Frode Vatvedt Fjeld 19 Jul '04

19 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv6666 Modified Files: bignums.lisp Log Message: Minor bignum tweaks. Date: Mon Jul 19 07:44:21 2004 Author: ffjeld Index: movitz/losp/muerte/bignums.lisp diff -u movitz/losp/muerte/bignums.lisp:1.3 movitz/losp/muerte/bignums.lisp:1.4 --- movitz/losp/muerte/bignums.lisp:1.3 Sun Jul 18 17:54:25 2004 +++ movitz/losp/muerte/bignums.lisp Mon Jul 19 07:44:21 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Jul 17 19:42:57 2004 ;;;; -;;;; $Id: bignums.lisp,v 1.3 2004/07/19 00:54:25 ffjeld Exp $ +;;;; $Id: bignums.lisp,v 1.4 2004/07/19 14:44:21 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -466,7 +466,7 @@ (defun bignum-set-zerof (bignum) (check-type bignum bignum) - (dotimes (i (logior 1 (%bignum-bigits bignum))) + (dotimes (i (%bignum-bigits bignum)) (setf (memref bignum -2 i :lisp) 0)) bignum)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/integers.lisp
by Frode Vatvedt Fjeld 19 Jul '04

19 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv13858 Modified Files: integers.lisp Log Message: Fixed ldb%byte of negative fixnums. Date: Mon Jul 19 06:59:32 2004 Author: ffjeld Index: movitz/losp/muerte/integers.lisp diff -u movitz/losp/muerte/integers.lisp:1.77 movitz/losp/muerte/integers.lisp:1.78 --- movitz/losp/muerte/integers.lisp:1.77 Mon Jul 19 05:50:20 2004 +++ movitz/losp/muerte/integers.lisp Mon Jul 19 06:59:31 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: integers.lisp,v 1.77 2004/07/19 12:50:20 ffjeld Exp $ +;;;; $Id: integers.lisp,v 1.78 2004/07/19 13:59:31 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1427,10 +1427,11 @@ ;;; bytes (defun byte (size position) + (check-type position (integer 0 #x3ff)) (+ (* size #x400) position)) (defun byte-size (bytespec) - (truncate bytespec #x400)) + (values (truncate bytespec #x400))) (defun byte-position (bytespec) (rem bytespec #x400)) @@ -1692,10 +1693,10 @@ (:declare-label-set retry-jumper-ones-expanded-bignum (retry-ones-expanded-bignum)) ;; Calculate word-size from bytespec-size. (:compile-form (:result-mode :ecx) size) - (:subl ,movitz:+movitz-fixnum-factor+ :ecx) ; Subtract 1 - (:shrl ,(+ 5 movitz:+movitz-fixnum-shift+) :ecx) ; Divide by 32 - (:leal ((:ecx ,movitz:+movitz-fixnum-factor+) ; Add 1 for index->size.. - ,(* 2 movitz:+movitz-fixnum-factor+)) ; ..and 1 for header. + (:addl ,(* 31 movitz:+movitz-fixnum-factor+) :ecx) ; Add 31 + (:shrl 5 :ecx) ; Divide by 32 + (:andl ,(- movitz:+movitz-fixnum-factor+) :ecx) + (:leal (:ecx ,movitz:+movitz-fixnum-factor+) ; Add 1 for header. :eax) (:locally (:movl :esp (:edi (:edi-offset atomically-esp)))) (:locally (:movl '(:funcall ,(movitz::atomically-status-jumper-fn t :esp) @@ -1703,7 +1704,7 @@ (:edi (:edi-offset atomically-status)))) (:call-local-pf get-cons-pointer) (:shll 16 :ecx) - (:addl ,(dpb 1 (byte 16 16) (movitz:tag :bignum 0)) :ecx) ; add 1 for index->size + (:orl ,(movitz:tag :bignum 0) :ecx) (:movl :ecx (:eax ,movitz:+other-type-offset+)) (:shrl 16 :ecx) (:leal ((:ecx ,movitz:+movitz-fixnum-factor+)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/integers.lisp
by Frode Vatvedt Fjeld 19 Jul '04

19 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv17152 Modified Files: integers.lisp Log Message: Fixed a bug in ldb%byte for bignums. Date: Mon Jul 19 05:50:20 2004 Author: ffjeld Index: movitz/losp/muerte/integers.lisp diff -u movitz/losp/muerte/integers.lisp:1.76 movitz/losp/muerte/integers.lisp:1.77 --- movitz/losp/muerte/integers.lisp:1.76 Sun Jul 18 17:54:29 2004 +++ movitz/losp/muerte/integers.lisp Mon Jul 19 05:50:20 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: integers.lisp,v 1.76 2004/07/19 00:54:29 ffjeld Exp $ +;;;; $Id: integers.lisp,v 1.77 2004/07/19 12:50:20 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -754,11 +754,11 @@ (%negatef (+ subtrahend (- minuend)) subtrahend minuend)) ;;; ((positive-fixnum positive-bignum) -;;; (%bignum-canonicalize +;;; (bignum-canonicalize ;;; (%bignum-negate ;;; (bignum-subf (copy-bignum subtrahend) minuend)))) ;;; ((negative-fixnum positive-bignum) -;;; (%bignum-canonicalize +;;; (bignum-canonicalize ;;; (%negatef (bignum-add-fixnum subtrahend minuend) ;;; subtrahend minuend))) ((positive-bignum positive-bignum) @@ -768,7 +768,7 @@ ((< minuend subtrahend) (let ((x (- subtrahend minuend))) (%negatef x subtrahend minuend))) - (t (%bignum-canonicalize + (t (bignum-canonicalize (with-inline-assembly (:returns :eax) (:compile-two-forms (:eax :ebx) (copy-bignum minuend) subtrahend) (:xorl :edx :edx) ; counter @@ -883,7 +883,7 @@ (- pos))))))) (assert (or (plusp (memref result -2 (+ -1 (* 2 (%bignum-bigits result))) :unsigned-byte16)) (plusp (memref result -2 (+ -2 (* 2 (%bignum-bigits result))) :unsigned-byte16)))) - (%bignum-canonicalize result)))))) + (bignum-canonicalize result)))))) (t (let ((count (- count))) (etypecase integer (fixnum @@ -909,7 +909,7 @@ (if (< src src-max-bigit) (memref integer -2 src :unsigned-byte16) 0))))) - (%bignum-canonicalize + (bignum-canonicalize (macrolet ((do-it () `(with-inline-assembly (:returns :ebx) @@ -1140,10 +1140,10 @@ 32)))) (length (integer-length y)) (i 0 (+ i 29))) - ((>= i length) (%bignum-canonicalize r)) + ((>= i length) (bignum-canonicalize r)) (bignum-set-zerof tmp) - (bignum-addf r (bignum-shift-leftf (bignum-mulf-fixnum (bignum-addf tmp x) - (ldb (byte 29 i) y)) + (bignum-addf r (bignum-shift-leftf (bignum-mulf (bignum-addf tmp x) + (ldb (byte 29 i) y)) i))) #+movitz-reference-code (do ((r 0) @@ -1481,7 +1481,7 @@ ((positive-bignum positive-bignum) (if (< (%bignum-bigits y) (%bignum-bigits x)) (logand y x) - (%bignum-canonicalize + (bignum-canonicalize (with-inline-assembly (:returns :eax) (:compile-two-forms (:eax :ebx) (copy-bignum x) y) (:movzxw (:eax (:offset movitz-bignum length)) @@ -1517,14 +1517,14 @@ (((eql 0) t) integer2) (((eql -1) t) 0) ((positive-fixnum positive-bignum) - (%bignum-canonicalize + (bignum-canonicalize (with-inline-assembly (:returns :eax) (:compile-two-forms (:eax :ecx) (copy-bignum integer2) integer1) (:shrl ,movitz:+movitz-fixnum-shift+ :ecx) (:notl :ecx) (:andl :ecx (:eax (:offset movitz-bignum bigit0)))))) ((positive-bignum positive-bignum) - (%bignum-canonicalize + (bignum-canonicalize (with-inline-assembly (:returns :eax) (:compile-two-forms (:eax :ebx) (copy-bignum integer2) integer1) (:movzxw (:eax (:offset movitz-bignum length)) @@ -1629,7 +1629,7 @@ (let ((r (copy-bignum x))) (macrolet ((do-it () - `(%bignum-canonicalize + `(bignum-canonicalize (with-inline-assembly (:returns :eax) (:compile-two-forms (:eax :ebx) r y) (:movzxw (:ebx (:offset movitz-bignum length)) @@ -1921,7 +1921,7 @@ (:movl #xffffffff (:ebx :ecx (:offset movitz-bignum bigit0))) (:cmpw :cx (:eax (:offset movitz-bignum length))) (:jc '(:sub-program (result-too-big-shouldnt-happen) - (:break))) + (:int 4))) (:jne 'tail-tmp-ok) ;; Sizes was equal, so set tail-tmp to zero. (:movl 0 (:ebx :ecx (:offset movitz-bignum bigit0))) @@ -1964,6 +1964,13 @@ (:movzxw (:ebx (:offset movitz-bignum length)) :edx) (:popl :ecx) ; (new) bytespec size + (:load-lexical (:lexical-binding size) :ecx) + (:shrl 5 :ecx) + (:andl -4 :ecx) ; ECX = index of (conceptual) MSB + (:cmpl :ecx :edx) + (:jbe 'mask-done) + + (:load-lexical (:lexical-binding size) :ecx) (:shrl ,movitz:+movitz-fixnum-shift+ :ecx) (:andl 31 :ecx) (:jz 'mask-done)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/print.lisp
by Frode Vatvedt Fjeld 19 Jul '04

19 Jul '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv23296 Modified Files: print.lisp Log Message: Changed the output of printer errors while *print-safely*. Date: Mon Jul 19 02:57:44 2004 Author: ffjeld Index: movitz/losp/muerte/print.lisp diff -u movitz/losp/muerte/print.lisp:1.11 movitz/losp/muerte/print.lisp:1.12 --- movitz/losp/muerte/print.lisp:1.11 Thu Jul 8 08:23:53 2004 +++ movitz/losp/muerte/print.lisp Mon Jul 19 02:57:44 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Sep 3 11:48:19 2001 ;;;; -;;;; $Id: print.lisp,v 1.11 2004/07/08 15:23:53 ffjeld Exp $ +;;;; $Id: print.lisp,v 1.12 2004/07/19 09:57:44 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -170,7 +170,8 @@ (internal-write object) (handler-case (internal-write object) (serious-condition (c) - (format t "#<printer error for ~Z: [~A]>" object c))))))) + (print-unreadable-object (c *standard-output* :type t :identity t) + (format t " while printing ~Z" object)))))))) (defun internal-write (object) (let ((stream *standard-output*))

1 0