movitz-cvs May 2006

movitz-cvs@common-lisp.net

1 participants
32 discussions

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 02 May '06

02 May '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv16690 Modified Files: interrupt.lisp Log Message: Map int 101 to "illegal keyword argument" error. --- /project/movitz/cvsroot/movitz/losp/muerte/interrupt.lisp 2005/09/01 22:53:53 1.49 +++ /project/movitz/cvsroot/movitz/losp/muerte/interrupt.lisp 2006/05/02 20:03:15 1.50 @@ -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.49 2005/09/01 22:53:53 ffjeld Exp $ +;;;; $Id: interrupt.lisp,v 1.50 2006/05/02 20:03:15 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -391,6 +391,10 @@ (ldb (byte 8 24) (dit-frame-ref nil dit-frame :ecx :unsigned-byte32)) code)))) + (101 + (error 'program-error + :format-control "Illegal keyword argument [eax: ~S]" + :format-arguments (list (dereference $eax)))) (108 (error 'throw-error :tag (dereference $eax))) (110

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 02 May '06

02 May '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv16528 Modified Files: integers.lisp Log Message: Added realp. --- /project/movitz/cvsroot/movitz/losp/muerte/integers.lisp 2006/04/07 21:35:32 1.121 +++ /project/movitz/cvsroot/movitz/losp/muerte/integers.lisp 2006/05/02 20:02:09 1.122 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: integers.lisp,v 1.121 2006/04/07 21:35:32 ffjeld Exp $ +;;;; $Id: integers.lisp,v 1.122 2006/05/02 20:02:09 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -2260,3 +2260,6 @@ (defun rational (number) number) + +(defun realp (x) + (typep x 'real))

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 02 May '06

02 May '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv16336 Modified Files: functions.lisp Log Message: Fix constantly compiler-macro. --- /project/movitz/cvsroot/movitz/losp/muerte/functions.lisp 2006/04/07 21:52:17 1.30 +++ /project/movitz/cvsroot/movitz/losp/muerte/functions.lisp 2006/05/02 20:01:46 1.31 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Mar 12 22:58:54 2002 ;;;; -;;;; $Id: functions.lisp,v 1.30 2006/04/07 21:52:17 ffjeld Exp $ +;;;; $Id: functions.lisp,v 1.31 2006/05/02 20:01:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -44,17 +44,11 @@ (case (translate-program value :muerte.cl :cl) ((t) `(function constantly-true)) ((nil) `(function constantly-false)) - (t `(make-prototyped-function (constantly ,value) - constantly-prototype - (value ,value)))))) - (t (let ((value-var (gensym "constantly-value-"))) - `(let ((,value-var ,value-form)) - (lambda (&rest ignore) - (declare (ignore ignore)) - ,value-var)))))) + (t form)))) + (t form))) (defun constantly (x) - (compiler-macro-call constantly x)) + (lambda () x)) (defun complement-prototype (&rest args) (declare (dynamic-extent args))

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 02 May '06

02 May '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv16294 Modified Files: cons.lisp Log Message: Added the subst family of functions. --- /project/movitz/cvsroot/movitz/losp/muerte/cons.lisp 2006/05/02 17:12:20 1.14 +++ /project/movitz/cvsroot/movitz/losp/muerte/cons.lisp 2006/05/02 20:01:01 1.15 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 15:25:45 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: cons.lisp,v 1.14 2006/05/02 17:12:20 ffjeld Exp $ +;;;; $Id: cons.lisp,v 1.15 2006/05/02 20:01:01 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -288,7 +288,7 @@ ((atom subtree) subtree) (t (let ((car (s (car subtree))) (cdr (s (cdr subtree)))) - (if (and (eq car (car subtreE)) + (if (and (eq car (car subtree)) (eq cdr (cdr subtree))) subtree (cons car cdr)))))))) @@ -310,7 +310,68 @@ (if (setq temp (assoc (funcall key subtree) alist :test test)) (setf (cdr last) (cdr temp)))) (if (setq temp (assoc (funcall key subtree) alist :test test)) - (return (setf (Cdr last) (Cdr temp))) + (return (setf (Cdr last) (cdr temp))) (setf (car subtree) (s (car subtree))))) subtree)))) (s tree)))) + +(defun subst (new old tree &key key (test 'eql) test-not) + "=> new-tree" + (let ((test (if test-not (complement test-not) test)) + (key (or key 'identity))) + (labels ((do-subst (subtree) + (cond + ((funcall test old (funcall key subtree)) + new) + ((atom subtree) + subtree) + (t (cons (do-subst (car subtree)) + (do-subst (cdr subtree))))))) + (do-subst tree)))) + +(defun subst-if (new predicate tree &key key) + "=> new-tree" + (let ((key (or key 'identity))) + (labels ((do-subst (subtree) + (cond + ((funcall predicate (funcall key subtree)) + new) + ((atom subtree) + subtree) + (t (cons (do-subst (car subtree)) + (do-subst (cdr subtree))))))) + (do-subst tree)))) + +(defun subst-if-not (new predicate tree &key key) + (subst-if new (complement predicate) tree :key key)) + +(defun nsubst (new old tree &key key (test 'eql) test-not) + (let ((test (if test-not (complement test-not) test)) + (key (or key 'identity))) + (labels ((do-subst (subtree) + (cond + ((funcall test old (funcall key subtree)) + new) + ((atom subtree) + subtree) + (t (setf (car subtree) (do-subst (car subtree)) + (cdr subtree) (do-subst (cdr subtree))) + subtree)))) + (do-subst tree)))) + +(defun nsubst-if (new predicate tree &key key) + "=> new-tree" + (let ((key (or key 'identity))) + (labels ((do-subst (subtree) + (cond + ((funcall predicate (funcall key subtree)) + new) + ((atom subtree) + subtree) + (t (setf (car subtree) (do-subst (car subtree)) + (cdr subtree) (do-subst (cdr subtree))) + subtree)))) + (do-subst tree)))) + +(defun nsubst-if-not (new predicate tree &key key) + (nsubst-if new (complement predicate) tree :key key))

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 02 May '06

02 May '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv16035 Modified Files: arrays.lisp Log Message: Added bit and sbit accessors. --- /project/movitz/cvsroot/movitz/losp/muerte/arrays.lisp 2006/04/07 21:47:44 1.57 +++ /project/movitz/cvsroot/movitz/losp/muerte/arrays.lisp 2006/05/02 20:00:20 1.58 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sun Feb 11 23:14:04 2001 ;;;; -;;;; $Id: arrays.lisp,v 1.57 2006/04/07 21:47:44 ffjeld Exp $ +;;;; $Id: arrays.lisp,v 1.58 2006/05/02 20:00:20 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -620,6 +620,153 @@ (defun (setf char%unsafe) (value string index) (setf (char%unsafe string index) value)) +;;; bit accessors + +(defun bit (array &rest subscripts) + (numargs-case + (2 (array index) + (etypecase array + (indirect-vector + (with-indirect-vector (indirect array :check-type nil) + (aref (indirect displaced-to) (+ index (indirect displaced-offset))))) + (simple-bit-vector + (macrolet + ((do-it () + `(with-inline-assembly (:returns :eax) + (:compile-two-forms (:eax :ebx) array index) + (:testb ,movitz:+movitz-fixnum-zmask+ :bl) + (:jnz '(:sub-program (illegal-index) + (:compile-form (:result-mode :ignore) + (error "Illegal index: ~S." index)))) + (:cmpl :ebx + (:eax ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::num-elements))) + (:jbe '(:sub-program (out-of-bounds) + (:compile-form (:result-mode :ignore) + (error "Index ~D is beyond vector length ~D." + index + (memref array + (movitz-type-slot-offset 'movitz-basic-vector 'num-elements)))))) + :bit + (:movl :ebx :ecx) + (:movl :eax :ebx) + (:shrl ,movitz:+movitz-fixnum-shift+ :ecx) + (:xorl :eax :eax) + (:btl :ecx (:ebx ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::data))) + (:jnc 'return) + (:addl ,movitz:+movitz-fixnum-factor+ :eax) + return))) + (do-it))))) + (t (vector &rest subscripts) + (declare (ignore vector subscripts)) + (error "Multi-dimensional arrays not implemented.")))) + +(defun sbit (array &rest subscripts) + (numargs-case + (2 (array index) + (check-type array simple-bit-vector) + (macrolet + ((do-it () + `(with-inline-assembly (:returns :eax) + (:compile-two-forms (:eax :ebx) array index) + (:testb ,movitz:+movitz-fixnum-zmask+ :bl) + (:jnz '(:sub-program (illegal-index) + (:compile-form (:result-mode :ignore) + (error "Illegal index: ~S." index)))) + (:cmpl :ebx + (:eax ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::num-elements))) + (:jbe '(:sub-program (out-of-bounds) + (:compile-form (:result-mode :ignore) + (error "Index ~D is beyond vector length ~D." + index + (memref array + (movitz-type-slot-offset 'movitz-basic-vector 'num-elements)))))) + :bit + (:movl :ebx :ecx) + (:movl :eax :ebx) + (:shrl ,movitz:+movitz-fixnum-shift+ :ecx) + (:xorl :eax :eax) + (:btl :ecx (:ebx ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::data))) + (:jnc 'return) + (:addl ,movitz:+movitz-fixnum-factor+ :eax) + return))) + (do-it))) + (t (vector &rest subscripts) + (declare (ignore vector subscripts)) + (error "Multi-dimensional arrays not implemented.")))) + + +(defun (setf bit) (value vector &rest subscripts) + (numargs-case + (3 (value vector index) + (check-type value bit) + (etypecase vector + (indirect-vector + (with-indirect-vector (indirect vector :check-type nil) + (setf (aref (indirect displaced-to) (+ index (indirect displaced-offset))) + value))) + (simple-bit-vector + (macrolet + ((do-it () + `(with-inline-assembly (:returns :eax) + (:compile-two-forms (:eax :ebx) value vector) + (:compile-form (:result-mode :edx) index) + (:testb ,movitz:+movitz-fixnum-zmask+ :dl) + (:jnz '(:sub-program (not-an-index) + (:compile-form (:result-mode :ignore) + (error "Not a vector index: ~S." index)))) + (:cmpl (:ebx ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::num-elements)) + :edx) + (:jnc '(:sub-program (illegal-index) + (:compile-form (:result-mode :ignore) + (error "Index ~S out of range." index)))) + (:movl :edx :ecx) + (:shrl ,movitz:+movitz-fixnum-shift+ :ecx) + + (:testl :eax :eax) + (:jnz 'set-one-bit) + (:btrl :ecx (:ebx ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::data))) + (:jmp 'return) + set-one-bit + (:btsl :ecx (:ebx ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::data))) + return))) + (do-it))))) + (t (value vector &rest subscripts) + (declare (ignore value vector subscripts)) + (error "Multi-dimensional arrays not implemented.")))) + +(defun (setf sbit) (value vector &rest subscripts) + (numargs-case + (3 (value vector index) + (check-type value bit) + (macrolet + ((do-it () + `(with-inline-assembly (:returns :eax) + (:compile-two-forms (:eax :ebx) value vector) + (:compile-form (:result-mode :edx) index) + (:testb ,movitz:+movitz-fixnum-zmask+ :dl) + (:jnz '(:sub-program (not-an-index) + (:compile-form (:result-mode :ignore) + (error "Not a vector index: ~S." index)))) + (:cmpl (:ebx ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::num-elements)) + :edx) + (:jnc '(:sub-program (illegal-index) + (:compile-form (:result-mode :ignore) + (error "Index ~S out of range." index)))) + (:movl :edx :ecx) + (:shrl ,movitz:+movitz-fixnum-shift+ :ecx) + + (:testl :eax :eax) + (:jnz 'set-one-bit) + (:btrl :ecx (:ebx ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::data))) + (:jmp 'return) + set-one-bit + (:btsl :ecx (:ebx ,(bt:slot-offset 'movitz:movitz-basic-vector 'movitz::data))) + return))) + (do-it))) + (t (value vector &rest subscripts) + (declare (ignore value vector subscripts)) + (error "Multi-dimensional arrays not implemented.")))) + ;;; u8 accessors (define-compiler-macro u8ref%unsafe (vector index)

1 0

[movitz-cvs] CVS movitz
by ffjeld 02 May '06

02 May '06

Update of /project/movitz/cvsroot/movitz In directory clnet:/tmp/cvs-serv14806 Modified Files: compiler.lisp Log Message: Various tweaks for compiling forms with literal objects as arguments to certain operators. --- /project/movitz/cvsroot/movitz/compiler.lisp 2006/04/28 23:20:45 1.168 +++ /project/movitz/cvsroot/movitz/compiler.lisp 2006/05/02 19:59:55 1.169 @@ -8,7 +8,7 @@ ;;;; Created at: Wed Oct 25 12:30:49 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: compiler.lisp,v 1.168 2006/04/28 23:20:45 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.169 2006/05/02 19:59:55 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -3889,10 +3889,21 @@ (ecase (operator location) ((:argument-stack) `((:movl ,immediate (:ebp ,(argument-stack-offset binding))))) - ((:eax :ebx :edx) + ((:eax :ebx :ecx :edx) (make-immediate-move immediate location)) ((:untagged-fixnum-ecx) (make-immediate-move (movitz-fixnum-value value) :ecx)))))) + (movitz-character + (let ((immediate (movitz-immediate-value value))) + (if (integerp location) + (let ((tmp (chose-free-register protect-registers))) + (append (make-immediate-move immediate tmp) + `((:movl ,tmp (:ebp ,(stack-frame-offset location)))))) + (ecase (operator location) + ((:argument-stack) + `((:movl ,immediate (:ebp ,(argument-stack-offset binding))))) + ((:eax :ebx :ecx :edx) + (make-immediate-move immediate location)))))) (movitz-heap-object (etypecase location ((member :eax :ebx :edx) @@ -6676,50 +6687,65 @@ (destructuring-bind (op cell dst) (cdr instruction) (check-type dst (member :eax :ebx :ecx :edx)) - (multiple-value-bind (op-offset fast-op fast-op-ebx) + (multiple-value-bind (op-offset fast-op fast-op-ebx cl-op) (ecase op (:car (values (bt:slot-offset 'movitz-cons 'car) 'fast-car - 'fast-car-ebx)) + 'fast-car-ebx + 'movitz-car)) (:cdr (values (bt:slot-offset 'movitz-cons 'cdr) 'fast-cdr - 'fast-cdr-ebx))) - (let* ((binding (binding-target (ensure-local-binding (binding-target cell) funobj))) - (location (new-binding-location (binding-target binding) frame-map)) - (binding-is-list-p (binding-store-subtypep binding 'list))) - #+ignore (warn "~A of loc ~A bind ~A" op location binding) - (cond - ((and binding-is-list-p - (member location '(:eax :ebx :ecx :edx))) - `((,*compiler-nonlocal-lispval-read-segment-prefix* - :movl (,location ,op-offset) ,dst))) - (binding-is-list-p - `(,@(make-load-lexical binding dst funobj nil frame-map) - (,*compiler-nonlocal-lispval-read-segment-prefix* - :movl (,dst ,op-offset) ,dst))) - ((not *compiler-use-cons-reader-segment-protocol-p*) - (cond - ((eq location :ebx) - `((,*compiler-global-segment-prefix* - :call (:edi ,(global-constant-offset fast-op-ebx))) - ,@(when (not (eq dst :eax)) - `((:movl :eax ,dst))))) - (t `(,@(make-load-lexical binding :eax funobj nil frame-map) - (,*compiler-global-segment-prefix* - :call (:edi ,(global-constant-offset fast-op))) - ,@(when (not (eq dst :eax)) - `((:movl :eax ,dst))))))) - (t (cond - ((member location '(:ebx :ecx :edx)) - `((,(or *compiler-cons-read-segment-prefix* - *compiler-nonlocal-lispval-read-segment-prefix*) - :movl (:eax ,op-offset) ,dst))) - (t (append (make-load-lexical binding :eax funobj nil frame-map) - `((,(or *compiler-cons-read-segment-prefix* - *compiler-nonlocal-lispval-read-segment-prefix*) - :movl (:eax ,op-offset) ,dst))))))))))) - - + 'fast-cdr-ebx + 'movitz-cdr))) + (let ((binding (binding-target (ensure-local-binding (binding-target cell) funobj)))) + (etypecase binding + (constant-object-binding + (let ((x (constant-object binding))) + (typecase x + (movitz-null + (make-load-constant *movitz-nil* dst funobj frame-map)) + (movitz-cons + (append (make-load-constant x dst funobj frame-map) + `((:movl (,dst ,op-offset) ,dst)))) + (t `(,@(make-load-lexical binding :eax funobj nil frame-map) + (,*compiler-global-segment-prefix* + :call (:edi ,(global-constant-offset fast-op))) + ,@(when (not (eq dst :eax)) + `((:movl :eax ,dst)))))))) + (lexical-binding + (let ((location (new-binding-location (binding-target binding) frame-map)) + (binding-is-list-p (binding-store-subtypep binding 'list))) + #+ignore (warn "~A of loc ~A bind ~A" op location binding) + (cond + ((and binding-is-list-p + (member location '(:eax :ebx :ecx :edx))) + `((,*compiler-nonlocal-lispval-read-segment-prefix* + :movl (,location ,op-offset) ,dst))) + (binding-is-list-p + `(,@(make-load-lexical binding dst funobj nil frame-map) + (,*compiler-nonlocal-lispval-read-segment-prefix* + :movl (,dst ,op-offset) ,dst))) + ((not *compiler-use-cons-reader-segment-protocol-p*) + (cond + ((eq location :ebx) + `((,*compiler-global-segment-prefix* + :call (:edi ,(global-constant-offset fast-op-ebx))) + ,@(when (not (eq dst :eax)) + `((:movl :eax ,dst))))) + (t `(,@(make-load-lexical binding :eax funobj nil frame-map) + (,*compiler-global-segment-prefix* + :call (:edi ,(global-constant-offset fast-op))) + ,@(when (not (eq dst :eax)) + `((:movl :eax ,dst))))))) + (t (cond + ((member location '(:ebx :ecx :edx)) + `((,(or *compiler-cons-read-segment-prefix* + *compiler-nonlocal-lispval-read-segment-prefix*) + :movl (:eax ,op-offset) ,dst))) + (t (append (make-load-lexical binding :eax funobj nil frame-map) + `((,(or *compiler-cons-read-segment-prefix* + *compiler-nonlocal-lispval-read-segment-prefix*) + :movl (:eax ,op-offset) ,dst)))))))))))))) ;;;;;;;;;;;;;;;;;; endp @@ -6732,39 +6758,49 @@ (define-extended-code-expander :endp (instruction funobj frame-map) (destructuring-bind (cell result-mode) (cdr instruction) - (let* ((binding (binding-target (ensure-local-binding (binding-target cell) funobj))) - (location (new-binding-location (binding-target binding) frame-map)) - (binding-is-list-p (binding-store-subtypep binding 'list)) - (tmp-register (case location - ((:eax :ebx :ecx :edx) - location)))) - ;; (warn "endp of loc ~A bind ~A" location binding) - (cond - ((and binding-is-list-p - (member location '(:eax :ebx :ecx :edx))) - (make-result-and-returns-glue result-mode :boolean-zf=1 - `((:cmpl :edi ,location)))) - ((eq :boolean-branch-on-true (result-mode-type result-mode)) - (let ((tmp-register (or tmp-register :ecx))) - (append (make-load-lexical binding - (cons :boolean-branch-on-false - (cdr result-mode)) - funobj nil frame-map) - (unless binding-is-list-p - (append (make-load-lexical binding tmp-register funobj nil frame-map) - `((:leal (,tmp-register -1) :ecx) - (:testb 3 :cl) - (:jnz '(:sub-program (,(gensym "endp-not-cons-")) - (:int 66))))))))) - (t (let ((tmp-register (or tmp-register :eax))) - (append (make-load-lexical binding tmp-register funobj nil frame-map) - (unless binding-is-list-p - `((:leal (,tmp-register -1) :ecx) - (:testb 3 :cl) - (:jnz '(:sub-program (,(gensym "endp-not-cons-")) - (:int 66))))) - `((:cmpl :edi ,tmp-register)) - (make-result-and-returns-glue result-mode :boolean-zf=1)))))))) + (let ((binding (binding-target (ensure-local-binding (binding-target cell) funobj)))) + (etypecase binding + (constant-object-binding + (let ((x (constant-object binding))) + (typecase x + (movitz-cons + (make-load-constant *movitz-nil* result-mode funobj frame-map)) + (movitz-null + (make-load-constant (image-t-symbol *image*) result-mode funobj frame-map)) + (t '((:int 61)))))) + (lexical-binding + (let* ((location (new-binding-location (binding-target binding) frame-map)) + (binding-is-list-p (binding-store-subtypep binding 'list)) + (tmp-register (case location + ((:eax :ebx :ecx :edx) + location)))) + ;; (warn "endp of loc ~A bind ~A" location binding) + (cond + ((and binding-is-list-p + (member location '(:eax :ebx :ecx :edx))) + (make-result-and-returns-glue result-mode :boolean-zf=1 + `((:cmpl :edi ,location)))) + ((eq :boolean-branch-on-true (result-mode-type result-mode)) + (let ((tmp-register (or tmp-register :ecx))) + (append (make-load-lexical binding + (cons :boolean-branch-on-false + (cdr result-mode)) + funobj nil frame-map) + (unless binding-is-list-p + (append (make-load-lexical binding tmp-register funobj nil frame-map) + `((:leal (,tmp-register -1) :ecx) + (:testb 3 :cl) + (:jnz '(:sub-program (,(gensym "endp-not-cons-")) + (:int 66))))))))) + (t (let ((tmp-register (or tmp-register :eax))) + (append (make-load-lexical binding tmp-register funobj nil frame-map) + (unless binding-is-list-p + `((:leal (,tmp-register -1) :ecx) + (:testb 3 :cl) + (:jnz '(:sub-program (,(gensym "endp-not-cons-")) + (:int 66))))) + `((:cmpl :edi ,tmp-register)) + (make-result-and-returns-glue result-mode :boolean-zf=1))))))))))) ;;;;;;;;;;;;;;;;;; incf-lexvar @@ -6867,11 +6903,23 @@ (type1 (and (binding-store-type term1) (apply #'encoded-type-decode (binding-store-type term1)))) (singleton0 (and type0 (type-specifier-singleton type0))) - (singleton1 (and type1 (type-specifier-singleton type1)))) - (append (unless (and singleton0 (typep (car singleton0) 'movitz-fixnum)) - (list term0)) - (unless (and singleton1 (typep (car singleton1) 'movitz-fixnum)) - (list term1))))) + (singleton1 (and type1 (type-specifier-singleton type1))) + (singleton-sum (and singleton0 singleton1 + (type-specifier-singleton + (apply #'encoded-integer-types-add + (append (binding-store-type term0) + (binding-store-type term1))))))) + (cond + (singleton-sum + (let ((b (make-instance 'constant-object-binding + :name (gensym "constant-sum") + :object (car singleton-sum)))) + (movitz-env-add-binding (binding-env term0) b) + (list b))) + (t (append (unless (and singleton0 (typep (car singleton0) 'movitz-fixnum)) + (list term0)) + (unless (and singleton1 (typep (car singleton1) 'movitz-fixnum)) + (list term1))))))) (define-extended-code-expander :add (instruction funobj frame-map) (destructuring-bind (term0 term1 destination)

1 0

[movitz-cvs] CVS movitz/losp/muerte
by ffjeld 02 May '06

02 May '06

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory clnet:/tmp/cvs-serv24627 Modified Files: cons.lisp Log Message: Minor tweaks to sublis and nsublis. --- /project/movitz/cvsroot/movitz/losp/muerte/cons.lisp 2006/04/30 21:38:40 1.13 +++ /project/movitz/cvsroot/movitz/losp/muerte/cons.lisp 2006/05/02 17:12:20 1.14 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 15:25:45 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: cons.lisp,v 1.13 2006/04/30 21:38:40 ffjeld Exp $ +;;;; $Id: cons.lisp,v 1.14 2006/05/02 17:12:20 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -294,18 +294,18 @@ (cons car cdr)))))))) (s tree)))) -(defun nsublis (alist tree &key key (test #'eql) (test-not nil notp)) +(defun nsublis (alist tree &key key (test #'eql) test-not) "Substitutes new for subtrees matching old." (declare (inline assoc)) (let ((key (or key 'identity)) (test (if test-not (complement test-not) test)) (temp)) (labels ((s (subtree) - (cond ((Setq temp (nsublis-macro)) + (cond ((setq temp (assoc (funcall key subtree) alist :test test)) (cdr temp)) ((atom subtree) subtree) (t (do* ((last nil subtree) - (subtree subtree (Cdr subtree))) + (subtree subtree (cdr subtree))) ((atom subtree) (if (setq temp (assoc (funcall key subtree) alist :test test)) (setf (cdr last) (cdr temp))))

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

movitz-cvs May 2006