movitz-cvs

movitz-cvs@common-lisp.net

2595 discussions

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

20 Jul '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv18624 Modified Files: compiler.lisp Log Message: Detect if code declares a jumper-set multiple times, don't just silently overwrite the old jumper-set, which caused very weird effects when such a jumper was actually used. Date: Tue Jul 20 02:08:38 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.77 movitz/compiler.lisp:1.78 --- movitz/compiler.lisp:1.77 Sun Jul 18 16:45:45 2004 +++ movitz/compiler.lisp Tue Jul 20 02:08:38 2004 @@ -8,7 +8,7 @@ ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.77 2004/07/18 23:45:45 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.78 2004/07/20 09:08:38 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -2497,6 +2497,8 @@ (:declare-label-set (destructuring-bind (name set) (cdr instruction) + (assert (not (getf jumper-sets name)) () + "Duplicate jumper declaration for ~S." name) (setf (getf jumper-sets name) set)))) do (let ((sub (instruction-sub-program instruction))) (when sub (process sub))))))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/scavenge.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-serv19360 Modified Files: scavenge.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:52 2004 Author: ffjeld Index: movitz/losp/muerte/scavenge.lisp diff -u movitz/losp/muerte/scavenge.lisp:1.20 movitz/losp/muerte/scavenge.lisp:1.21 --- movitz/losp/muerte/scavenge.lisp:1.20 Mon Jul 19 07:44:25 2004 +++ movitz/losp/muerte/scavenge.lisp Tue Jul 20 01:54:52 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.20 2004/07/19 14:44:25 ffjeld Exp $ +;;;; $Id: scavenge.lisp,v 1.21 2004/07/20 08:54:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -50,7 +50,7 @@ (:compile-form (:result-mode :eax) ,x) (:shrl 16 :eax) (:testb ,movitz:+movitz-fixnum-zmask+ :al) - (:jnz '(:sub-program () (:int 107)))))) + (:jnz '(:sub-program () (:int 63)))))) (do ((*scan-last* nil) ; Last scanned object, for debugging. (scan start-location (1+ scan))) ((>= scan end-location)) @@ -64,7 +64,7 @@ (error "Illegal word ~Z at ~S." x scan)) ((scavenge-typep x :bignum) (assert (evenp scan) () - "Scanned ~Z at odd address #x~X." x scan) + "Scanned ~Z at odd location #x~X." x scan) ;; Just skip the bigits (let* ((bigits (word-bigits x)) (delta (logior bigits 1))) @@ -72,7 +72,7 @@ (incf scan delta))) ((scavenge-typep x :funobj) (assert (evenp scan) () - "Scanned ~Z at odd address #x~X." x scan) + "Scanned ~Z at odd location #x~X." x scan) (setf *scan-last* (%word-offset scan #.(movitz:tag :other))) ;; Process code-vector pointers specially.. (let* ((funobj (%word-offset scan #.(movitz:tag :other))) @@ -90,7 +90,7 @@ (incf scan (+ 7 num-jumpers)))) ; Don't scan the jumpers. ((scavenge-typep x :infant-object) (assert (evenp scan) () - "Scanned #x~Z at odd address #x~X." x scan) + "Scanned #x~Z at odd location #x~X." x scan) (error "Scanning an infant object ~Z at ~S (end ~S)." x scan end-location)) ((or (scavenge-wide-typep x :basic-vector #.(bt:enum-value 'movitz:movitz-vector-element-type :u8)) @@ -99,21 +99,21 @@ (scavenge-wide-typep x :basic-vector #.(bt:enum-value 'movitz:movitz-vector-element-type :code))) (assert (evenp scan) () - "Scanned ~Z at odd address #x~X." x scan) + "Scanned ~Z at odd location #x~X." x scan) (let ((len (memref scan 0 1 :lisp))) (check-type len positive-fixnum) (setf *scan-last* (%word-offset scan #.(movitz:tag :other))) (incf scan (1+ (* 2 (truncate (+ 7 len) 8)))))) ((scavenge-wide-typep x :basic-vector #.(bt:enum-value 'movitz:movitz-vector-element-type :u16)) (assert (evenp scan) () - "Scanned ~Z at odd address #x~X." x scan) + "Scanned ~Z at odd location #x~X." x scan) (let ((len (memref scan 0 1 :lisp))) (check-type len positive-fixnum) (setf *scan-last* (%word-offset scan #.(movitz:tag :other))) (incf scan (1+ (* 2 (truncate (+ 3 len) 4)))))) ((scavenge-wide-typep x :basic-vector #.(bt:enum-value 'movitz:movitz-vector-element-type :u32)) (assert (evenp scan) () - "Scanned ~Z at odd address #x~X." x scan) + "Scanned ~Z at odd location #x~X." x scan) (let ((len (memref scan 0 1 :lisp))) (check-type len positive-fixnum) (setf *scan-last* (%word-offset scan #.(movitz:tag :other)))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/run-time-context.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-serv19194 Modified Files: run-time-context.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:48 2004 Author: ffjeld Index: movitz/losp/muerte/run-time-context.lisp diff -u movitz/losp/muerte/run-time-context.lisp:1.9 movitz/losp/muerte/run-time-context.lisp:1.10 --- movitz/losp/muerte/run-time-context.lisp:1.9 Thu Jul 15 14:07:27 2004 +++ movitz/losp/muerte/run-time-context.lisp Tue Jul 20 01:54:48 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Nov 12 18:33:02 2003 ;;;; -;;;; $Id: run-time-context.lisp,v 1.9 2004/07/15 21:07:27 ffjeld Exp $ +;;;; $Id: run-time-context.lisp,v 1.10 2004/07/20 08:54:48 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -30,24 +30,6 @@ (or (assoc slot-name (slot-value (class-of context) 'slot-map)) (when errorp (error "No run-time-context slot named ~S in ~S." slot-name context)))) - -(define-compiler-macro %run-time-context-slot (&whole form &environment env slot-name - &optional (context '(current-run-time-context))) - (if (not (and (movitz:movitz-constantp slot-name env) - (equal context '(current-run-time-context)))) - form - (let ((slot-name (movitz::eval-form slot-name env))) - (ecase (bt:binary-slot-type 'movitz::movitz-constant-block (intern (symbol-name slot-name) :movitz)) - (movitz::word - `(with-inline-assembly (:returns :eax) - (:locally (:movl (:edi (:edi-offset ,slot-name)) :eax)))) - (movitz::code-vector-word - `(with-inline-assembly (:returns :eax) - (:locally (:movl (:edi (:edi-offset ,slot-name)) :eax)) - (:subl ,movitz::+code-vector-word-offset+ :eax))) - (movitz::lu32 - `(with-inline-assembly (:returns :untagged-fixnum-ecx) - (:locally (:movl (:edi (:edi-offset ,slot-name)) :ecx)))))))) (defun %run-time-context-slot (slot-name &optional (context (current-run-time-context))) (check-type context run-time-context)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/print.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-serv18880 Modified Files: print.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:43 2004 Author: ffjeld Index: movitz/losp/muerte/print.lisp diff -u movitz/losp/muerte/print.lisp:1.12 movitz/losp/muerte/print.lisp:1.13 --- movitz/losp/muerte/print.lisp:1.12 Mon Jul 19 02:57:44 2004 +++ movitz/losp/muerte/print.lisp Tue Jul 20 01:54:43 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.12 2004/07/19 09:57:44 ffjeld Exp $ +;;;; $Id: print.lisp,v 1.13 2004/07/20 08:54:43 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -312,6 +312,10 @@ (hash-table-count (package-object-external-symbols object)) (hash-table-count (package-object-internal-symbols object)))) (print-unreadable-object (object stream :identity t :type t)))) + (ratio + (write-integer (ratio-numerator object) stream *print-base* *print-radix*) + (write-char #\/ stream) + (write-integer (ratio-denominator object) stream *print-base* nil)) (t (if (not *never-use-print-object*) (print-object object stream) (print-unreadable-object (object stream :identity t)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/primitive-functions.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-serv18432 Modified Files: primitive-functions.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:38 2004 Author: ffjeld Index: movitz/losp/muerte/primitive-functions.lisp diff -u movitz/losp/muerte/primitive-functions.lisp:1.30 movitz/losp/muerte/primitive-functions.lisp:1.31 --- movitz/losp/muerte/primitive-functions.lisp:1.30 Fri Jul 16 18:54:12 2004 +++ movitz/losp/muerte/primitive-functions.lisp Tue Jul 20 01:54:38 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Oct 2 21:02:18 2001 ;;;; -;;;; $Id: primitive-functions.lisp,v 1.30 2004/07/17 01:54:12 ffjeld Exp $ +;;;; $Id: primitive-functions.lisp,v 1.31 2004/07/20 08:54:38 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -530,7 +530,7 @@ (:locally (:movl (:edi (:edi-offset nursery-space)) :eax)) (:testb 7 :al) (:jnz '(:sub-program () - (:int 107))))) + (:int 63))))) (defun malloc-cons-pointer () "Return current cons-pointer in 8-byte units since buffer-start." @@ -633,10 +633,8 @@ :ecx) (:ret) fail - (:int 107)))) + (:int 64)))) (do-it))) - - ;;;;

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/more-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-serv17151 Modified Files: more-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:54:34 2004 Author: ffjeld Index: movitz/losp/muerte/more-macros.lisp diff -u movitz/losp/muerte/more-macros.lisp:1.14 movitz/losp/muerte/more-macros.lisp:1.15 --- movitz/losp/muerte/more-macros.lisp:1.14 Tue Jul 13 15:44:05 2004 +++ movitz/losp/muerte/more-macros.lisp Tue Jul 20 01:54:34 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Jun 7 15:05:57 2002 ;;;; -;;;; $Id: more-macros.lisp,v 1.14 2004/07/13 22:44:05 ffjeld Exp $ +;;;; $Id: more-macros.lisp,v 1.15 2004/07/20 08:54:34 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -322,12 +322,31 @@ ,format-control ,@format-arguments) ,@body)) +(define-compiler-macro %run-time-context-slot (&whole form &environment env slot-name + &optional (context '(current-run-time-context))) + (if (not (and (movitz:movitz-constantp slot-name env) + (equal context '(current-run-time-context)))) + form + (let ((slot-name (movitz::eval-form slot-name env))) + (ecase (bt:binary-slot-type 'movitz::movitz-constant-block (intern (symbol-name slot-name) :movitz)) + (movitz::word + `(with-inline-assembly (:returns :eax) + (:locally (:movl (:edi (:edi-offset ,slot-name)) :eax)))) + (movitz::code-vector-word + `(with-inline-assembly (:returns :eax) + (:locally (:movl (:edi (:edi-offset ,slot-name)) :eax)) + (:subl ,movitz::+code-vector-word-offset+ :eax))) + (movitz::lu32 + `(with-inline-assembly (:returns :untagged-fixnum-ecx) + (:locally (:movl (:edi (:edi-offset ,slot-name)) :ecx)))))))) + ;;; Some macros that aren't implemented, and we want to give compiler errors. (defmacro define-unimplemented-macro (name) `(defmacro ,name (&rest args) (declare (ignore args)) - (error ,(format nil "Macro ~A is not implemented yet." name)))) + (with-simple-restart (continue "Proceed with a NIL expansion for ~S." ',name) + (error "Macro ~S is not implemented yet." ',name)))) (define-unimplemented-macro with-open-file) (define-unimplemented-macro restart-case)

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/memref.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-serv17083 Modified Files: memref.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:29 2004 Author: ffjeld Index: movitz/losp/muerte/memref.lisp diff -u movitz/losp/muerte/memref.lisp:1.20 movitz/losp/muerte/memref.lisp:1.21 --- movitz/losp/muerte/memref.lisp:1.20 Mon Jul 19 02:56:57 2004 +++ movitz/losp/muerte/memref.lisp Tue Jul 20 01:54:29 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Mar 6 21:25:49 2001 ;;;; -;;;; $Id: memref.lisp,v 1.20 2004/07/19 09:56:57 ffjeld Exp $ +;;;; $Id: memref.lisp,v 1.21 2004/07/20 08:54:29 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -628,9 +628,9 @@ (:shll 2 :ecx) (:addl :ebx :eax) (:into) - (:testb ,(cl:mask-field (cl:byte (cl:+ 2 movitz::+movitz-fixnum-shift+) 0) -1) + (:testb ,(mask-field (byte (+ 2 movitz::+movitz-fixnum-shift+) 0) -1) :al) - (:jnz '(:sub-program (unaligned) (:int 63))) + (:jnz '(:sub-program () (:int 63))) (:addl :ecx :eax) (:shrl ,movitz::+movitz-fixnum-shift+ :eax) ; scale down address (,prefixes :movl (:eax) :ecx) @@ -806,7 +806,9 @@ ,@(unless (= 0 start2) `((:addl ,(* start2 movitz::+movitz-fixnum-factor+) :ebx))) (:testb ,movitz::+movitz-fixnum-zmask+ :dl) - (:jnz '(:sub-program (no-fixnum) (:int 107))) + (:jnz '(:sub-program () + (:movl :edx :eax) + (:int 64))) copy-loop (:movl (:ebx :edx) :ecx) (:movl :ecx (:eax :edx)) @@ -824,7 +826,9 @@ (:testl :edx :edx) (:jz 'done) (:testb ,movitz::+movitz-fixnum-zmask+ :dl) - (:jnz '(:sub-program (no-fixnum) (:int 107))) + (:jnz '(:sub-program () + (:movl :edx :eax) + (:int 64))) copy-loop (:movl (:ebx :edx) :ecx) (:movl :ecx (:eax :edx))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/los-closette.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-serv16980 Modified Files: los-closette.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:24 2004 Author: ffjeld Index: movitz/losp/muerte/los-closette.lisp diff -u movitz/losp/muerte/los-closette.lisp:1.14 movitz/losp/muerte/los-closette.lisp:1.15 --- movitz/losp/muerte/los-closette.lisp:1.14 Thu Jul 15 14:07:13 2004 +++ movitz/losp/muerte/los-closette.lisp Tue Jul 20 01:54:24 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Jul 23 14:29:10 2002 ;;;; -;;;; $Id: los-closette.lisp,v 1.14 2004/07/15 21:07:13 ffjeld Exp $ +;;;; $Id: los-closette.lisp,v 1.15 2004/07/20 08:54:24 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -983,7 +983,7 @@ (defclass rational (real) () (:metaclass built-in-class)) (defclass integer (rational) () (:metaclass built-in-class)) (defclass fixnum (integer) () (:metaclass built-in-class)) -(defclass ratio (rational) () (:metaclass built-in-class)) +;; (defclass ratio (rational) () (:metaclass built-in-class)) (defclass float (real) () (:metaclass built-in-class)) (defclass complex (number) () (:metaclass built-in-class))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/interrupt.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-serv16690 Modified Files: interrupt.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:19 2004 Author: ffjeld Index: movitz/losp/muerte/interrupt.lisp diff -u movitz/losp/muerte/interrupt.lisp:1.15 movitz/losp/muerte/interrupt.lisp:1.16 --- movitz/losp/muerte/interrupt.lisp:1.15 Sun Jul 18 16:48:22 2004 +++ movitz/losp/muerte/interrupt.lisp Tue Jul 20 01:54:19 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Apr 7 01:50:03 2004 ;;;; -;;;; $Id: interrupt.lisp,v 1.15 2004/07/18 23:48:22 ffjeld Exp $ +;;;; $Id: interrupt.lisp,v 1.16 2004/07/20 08:54:19 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -282,6 +282,8 @@ (setf (@ $eax) (read *query-io*))) (62 (error "Trying to save too many values: ~@Z." $ecx)) (63 (error "Primitive assertion error. EIP=~@Z, ESI=~@Z." $eip $esi)) + (64 (error 'type-error :datum (@ $eax) :expected-type 'integer)) + (65 (error 'index-out-of-range :index (@ $ebx) (@ $ecx))) (66 (error "Unspecified type error at ~@Z in ~S with EAX=~@Z, ECX=~@Z." $eip (@ (+ interrupt-frame (interrupt-frame-index :esi))) $eax $ecx))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/integers.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-serv16373 Modified Files: integers.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:15 2004 Author: ffjeld Index: movitz/losp/muerte/integers.lisp diff -u movitz/losp/muerte/integers.lisp:1.78 movitz/losp/muerte/integers.lisp:1.79 --- movitz/losp/muerte/integers.lisp:1.78 Mon Jul 19 06:59:31 2004 +++ movitz/losp/muerte/integers.lisp Tue Jul 20 01:54:14 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.78 2004/07/19 13:59:31 ffjeld Exp $ +;;;; $Id: integers.lisp,v 1.79 2004/07/20 08:54:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -48,7 +48,7 @@ (:leal (:eax ,(- (movitz:tag :other))) :ecx) (:testb 7 :cl) (:jnz '(:sub-program (n1-not-bignum) - (:int 107))) + (:int 64))) (:movl (:eax ,movitz:+other-type-offset+) :ecx) (:cmpb ,(movitz:tag :bignum) :cl) (:jne 'n1-not-bignum) @@ -60,7 +60,8 @@ (:leal (:ebx ,(- (movitz:tag :other))) :ecx) (:testb 7 :cl) (:jnz '(:sub-program (n2-not-bignum) - (:int 107))) + (:movl :ebx :eax) + (:int 64))) (:movl (:ebx ,movitz:+other-type-offset+) :ecx) (:cmpb ,(movitz:tag :bignum) :cl) (:jne 'n2-not-bignum) @@ -184,8 +185,8 @@ (:leal (:ebx ,(- (movitz:tag :other))) :ecx) (:testb 7 :cl) (:jnz '(:sub-program (not-integer) - (:int 107) - (:jmp 'not-integer))) + (:movl :ebx :eax) + (:int 64))) (:movl (:ebx ,movitz:+other-type-offset+) :ecx) (:cmpw ,(movitz:tag :bignum 0) :cx) (:jne 'not-plusbignum) @@ -211,8 +212,7 @@ (:leal (:eax #.(cl:- (movitz:tag :other))) :ecx) (:testb 7 :cl) (:jnz '(:sub-program (not-integer) - (:int 107) - (:jmp 'not-integer))) + (:int 64))) (:movl (:eax #.movitz:+other-type-offset+) :ecx) (:cmpw #.(movitz:tag :bignum 0) :cx) (:jne 'not-plusbignum) @@ -1351,17 +1351,27 @@ )))) (defun / (number &rest denominators) - (declare (dynamic-extent denominators)) - (cond - ((null denominators) - (make-ratio 1 number)) - ((null (cdr denominators)) - (multiple-value-bind (q r) - (truncate number (first denominators)) - (if (= 0 r) - q - (error "Don't know how to divide ~S by ~S." number (first denominators))))) - (t (/ number (reduce '* denominators))))) + (numargs-case + (1 (x) + (make-rational 1 x)) + (2 (x y) + (multiple-value-bind (q r) + (truncate x y) + (if (= 0 r) + q + (make-rational x y)))) + (t (number &rest denominators) + (declare (dynamic-extent denominators)) + (cond + ((null denominators) + (make-rational 1 number)) + ((null (cdr denominators)) + (multiple-value-bind (q r) + (truncate number (first denominators)) + (if (= 0 r) + q + (make-rational number (first denominators))))) + (t (/ number (reduce '* denominators))))))) (defun round (number &optional (divisor 1)) "Mathematical rounding."

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

movitz-cvs