April 2004 - movitz-cvs@common-lisp.net - mailman3.common-lisp.net

[movitz-cvs] CVS update: movitz/losp/muerte/basic-macros.lisp
by Frode Vatvedt Fjeld 18 Apr '04

18 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv16480 Modified Files: basic-macros.lisp Log Message: Small changes to eq compiler-macro. Date: Sun Apr 18 17:27:37 2004 Author: ffjeld Index: movitz/losp/muerte/basic-macros.lisp diff -u movitz/losp/muerte/basic-macros.lisp:1.14 movitz/losp/muerte/basic-macros.lisp:1.15 --- movitz/losp/muerte/basic-macros.lisp:1.14 Sat Apr 17 11:33:57 2004 +++ movitz/losp/muerte/basic-macros.lisp Sun Apr 18 17:27:37 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: basic-macros.lisp,v 1.14 2004/04/17 15:33:57 ffjeld Exp $ +;;;; $Id: basic-macros.lisp,v 1.15 2004/04/18 21:27:37 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -384,11 +384,11 @@ (define-compiler-macro eq (&whole form &environment env x y) (cond ((movitz:movitz-constantp y env) - (let ((y (movitz::eval-form y env))) + (let ((y (movitz:movitz-eval y env))) (cond ((movitz:movitz-constantp x env) (warn "constant eq!: ~S" form) - (eq y (movitz::eval-form x env))) + (eq y (movitz:movitz-eval x env))) ((eq y nil) `(muerte::inlined-not ,x)) ((eql y 0) @@ -407,15 +407,13 @@ (t `(with-inline-assembly (:returns :boolean-zf=1 :side-effects nil) (:compile-two-forms (:eax :ebx) ,x ,y) (:cmpl :eax :ebx)))))) - ((and (movitz:movitz-constantp x env) - (typep (movitz::eval-form x env) - '(or symbol (unsigned-byte 30)))) - `(eq ,y ,x)) + ((movitz:movitz-constantp x env) + `(eq ,y ',(movitz:movitz-eval x env))) (t `(with-inline-assembly (:returns :boolean-zf=1 :side-effects nil) (:compile-two-forms (:eax :ebx) ,x ,y) (:cmpl :eax :ebx))))) -(define-compiler-macro eql (&whole form x y) +(define-compiler-macro eql (x y) `(eq ,x ,y)) (define-compiler-macro values (&rest sub-forms)

1 0

[movitz-cvs] CVS update: movitz/doc/ChangeLog
by Frode Vatvedt Fjeld 18 Apr '04

18 Apr '04

Update of /project/movitz/cvsroot/movitz/doc In directory common-lisp.net:/tmp/cvs-serv11313 Modified Files: ChangeLog Log Message: *** empty log message *** Date: Sun Apr 18 08:33:10 2004 Author: ffjeld Index: movitz/doc/ChangeLog diff -u movitz/doc/ChangeLog:1.3 movitz/doc/ChangeLog:1.4 --- movitz/doc/ChangeLog:1.3 Mon Mar 29 10:26:39 2004 +++ movitz/doc/ChangeLog Sun Apr 18 08:33:10 2004 @@ -1,3 +1,17 @@ +2004-04-18 Frode Vatvedt Fjeld <frodef(a)cs.uit.no> + + * The bootloader no longer initializes the VGA subssystem, since + the textmode driver in los0 should be able to adapt to most + standard VGA textmodes now. + + * Apropos should work again, I think it didn't before due to a + compiler bug. + + * There is now a fairly complete GC in los0, meaning in principle + there us no reason it should not keep running forever. I've had an + uptime of about a week. The new-space buffer is limited to 256 KB, + however. + 2004-03-29 Frode Vatvedt Fjeld <frodef(a)cs.uit.no> * Added basic GC functionality. The Movitz platform is now I

1 0

[movitz-cvs] CVS update: movitz/web-update.sh
by Frode Vatvedt Fjeld 18 Apr '04

18 Apr '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv3081 Added Files: web-update.sh Log Message: *** empty log message *** Date: Sun Apr 18 08:32:57 2004 Author: ffjeld

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/cons.lisp
by Frode Vatvedt Fjeld 17 Apr '04

17 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv2725 Modified Files: cons.lisp Log Message: Added "fast" implementations of cddr and cdddr, in an effort to reduce cal/ret run-time and code-size overhead in list processing. Date: Sat Apr 17 11:34:03 2004 Author: ffjeld Index: movitz/losp/muerte/cons.lisp diff -u movitz/losp/muerte/cons.lisp:1.3 movitz/losp/muerte/cons.lisp:1.4 --- movitz/losp/muerte/cons.lisp:1.3 Mon Mar 22 09:42:31 2004 +++ movitz/losp/muerte/cons.lisp Sat Apr 17 11:34:03 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 15:25:45 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: cons.lisp,v 1.3 2004/03/22 14:42:31 ffjeld Exp $ +;;;; $Id: cons.lisp,v 1.4 2004/04/17 15:34:03 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -53,6 +53,36 @@ (:leal (:eax -1) :ecx) (:testb 3 :cl) (:jnz '(:sub-program () (:int 66))) + (:movl (:eax 3) :eax) + (:ret))) + +(define-primitive-function fast-cddr () + "This is the actual CDR code." + (with-inline-assembly (:returns :eax) + (:leal (:eax -1) :ecx) + (:testb 3 :cl) + (:jnz '(:sub-program () (:int 66))) + (:movl (:eax 3) :eax) + (:leal (:eax -1) :ecx) + (:testb 3 :cl) + (:jnz '(:sub-program () (:int 66))) + (:movl (:eax 3) :eax) + (:ret))) + +(define-primitive-function fast-cdddr () + "This is the actual CDR code." + (with-inline-assembly (:returns :eax) + (:leal (:eax -1) :ecx) + (:testb 3 :cl) + (:jnz '(:sub-program (not-cons) (:int 66))) + (:movl (:eax 3) :eax) + (:leal (:eax -1) :ecx) + (:testb 3 :cl) + (:jnz '(:sub-program (not-cons) (:int 66))) + (:movl (:eax 3) :eax) + (:leal (:eax -1) :ecx) + (:testb 3 :cl) + (:jnz '(:sub-program (not-cons) (:int 66))) (:movl (:eax 3) :eax) (:ret)))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/basic-macros.lisp
by Frode Vatvedt Fjeld 17 Apr '04

17 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv25835 Modified Files: basic-macros.lisp Log Message: Added "fast" implementations of cddr and cdddr, in an effort to reduce cal/ret run-time and code-size overhead in list processing. Date: Sat Apr 17 11:33:57 2004 Author: ffjeld Index: movitz/losp/muerte/basic-macros.lisp diff -u movitz/losp/muerte/basic-macros.lisp:1.13 movitz/losp/muerte/basic-macros.lisp:1.14 --- movitz/losp/muerte/basic-macros.lisp:1.13 Fri Apr 16 19:33:36 2004 +++ movitz/losp/muerte/basic-macros.lisp Sat Apr 17 11:33:57 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Wed Nov 8 18:44:57 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: basic-macros.lisp,v 1.13 2004/04/16 23:33:36 ffjeld Exp $ +;;;; $Id: basic-macros.lisp,v 1.14 2004/04/17 15:33:57 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -575,6 +575,23 @@ (define-compiler-macro cddr (x) `(cdr (cdr ,x))) +(define-compiler-macro caddr (x) + `(car (cdr (cdr ,x)))) + +(define-compiler-macro cadddr (x) + `(car (cdr (cdr (cdr ,x))))) + +(define-compiler-macro cdar (x) + `(cdr (car ,x))) + + +(define-compiler-macro rest (x) `(cdr ,x)) +(define-compiler-macro first (x) `(car ,x)) +(define-compiler-macro second (x) `(cadr ,x)) +(define-compiler-macro third (x) `(caddr ,x)) +(define-compiler-macro fourth (x) `(cadddr ,x)) +(define-compiler-macro fifth (x) `(caddddr ,x)) + (define-compiler-macro (setf car) (value cell &environment env) (if (and (movitz:movitz-constantp value env) (eq nil (movitz::eval-form value env))) @@ -840,32 +857,6 @@ (array (error "Array backquote not implemented.")) (t (list 'quote form)))) - -;;;(defmacro defun+movitz (name &rest args) -;;; (flet ((make-compile-side-name (x) -;;; (if (find-symbol (symbol-name x) :common-lisp) -;;; (intern (format nil "~A-~A" '#:movitz x)) -;;; x))) -;;; (if (symbolp name) -;;; `(progn -;;; (eval-when (:compile-toplevel) -;;; (defun ,(make-compile-side-name name) ,@args)) -;;; (defun ,name ,@args)) -;;; `(progn -;;; (eval-when (:compile-toplevel) -;;; (defun (,(first name) ,(make-compile-side-name (second name))) ,@(cddr name) -;;; ,@args)) -;;; (defun ,name ,@args))))) - - -(define-compiler-macro first (x) - `(car ,x)) -(define-compiler-macro second (x) - `(cadr ,x)) -(define-compiler-macro third (x) - `(caddr ,x)) -(define-compiler-macro rest (x) - `(cdr ,x)) (define-compiler-macro find-class (&whole form &environment env symbol &optional (errorp t)) (declare (ignore errorp))

1 0

[movitz-cvs] CVS update: movitz/image.lisp
by Frode Vatvedt Fjeld 17 Apr '04

17 Apr '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv21184 Modified Files: image.lisp Log Message: Added "fast" implementations of cddr and cdddr, in an effort to reduce cal/ret run-time and code-size overhead in list processing. Date: Sat Apr 17 11:33:51 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.24 movitz/image.lisp:1.25 --- movitz/image.lisp:1.24 Fri Apr 16 04:57:29 2004 +++ movitz/image.lisp Sat Apr 17 11:33:51 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: image.lisp,v 1.24 2004/04/16 08:57:29 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.25 2004/04/17 15:33:51 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -39,6 +39,18 @@ :map-binary-write 'movitz-intern-code-vector :map-binary-read-delayed 'movitz-word-code-vector :binary-tag :primitive-function) + (fast-cddr + :binary-type code-vector-word + :initform nil + :map-binary-write 'movitz-intern-code-vector + :map-binary-read-delayed 'movitz-word-code-vector + :binary-tag :primitive-function) + (fast-cdddr + :binary-type code-vector-word + :initform nil + :map-binary-write 'movitz-intern-code-vector + :map-binary-read-delayed 'movitz-word-code-vector + :binary-tag :primitive-function) (fast-car-ebx :binary-type code-vector-word :initform nil @@ -128,12 +140,6 @@ (stack-top ; stack-top must be right after stack-bottom :binary-type word ; in order for the bound instruction to work. :initform #x100000) - (bochs-flags - :binary-type lu32 - :initform 0) - (bochs-flags2 - :binary-type lu32 - :initform 0) ;; (unbound-value :binary-type word @@ -421,6 +427,9 @@ (segment-descriptor-7 :binary-type segment-descriptor :initform (make-segment-descriptor)) + (bochs-flags + :binary-type lu32 + :initform 0) ) (:slot-align null-cons -1))

1 0

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

17 Apr '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv14930 Modified Files: compiler.lisp Log Message: Added "fast" implementations of cddr and cdddr, in an effort to reduce cal/ret run-time and code-size overhead in list processing. Date: Sat Apr 17 11:33:45 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.52 movitz/compiler.lisp:1.53 --- movitz/compiler.lisp:1.52 Sat Apr 17 10:10:51 2004 +++ movitz/compiler.lisp Sat Apr 17 11:33:45 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.52 2004/04/17 14:10:51 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.53 2004/04/17 15:33:45 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -2054,6 +2054,17 @@ (setq p `((:call (:edi ,(global-constant-offset newf)))) next-pc (nthcdr 2 pc)) (explain nil "Changed [~S ~S] to ~S" i i2 newf))) + ((and (global-funcall-p i '(fast-cdr)) + (global-funcall-p i2 '(fast-cdr)) + (global-funcall-p i3 '(fast-cdr))) + (setq p `((:call (:edi ,(global-constant-offset 'fast-cdddr)))) + next-pc (nthcdr 3 pc)) + (explain nil "Changed (cdr (cdr (cdr :eax))) to (cdddr :eax).")) + ((and (global-funcall-p i '(fast-cdr)) + (global-funcall-p i2 '(fast-cdr))) + (setq p `((:call (:edi ,(global-constant-offset 'fast-cddr)))) + next-pc (nthcdr 2 pc)) + (explain nil "Changed (cdr (cdr :eax)) to (cddr :eax).")) ((and (load-stack-frame-p i) (eq :eax (twop-dst i)) (global-funcall-p i2 '(fast-car fast-cdr)) (preserves-stack-location-p i3 (load-stack-frame-p i))

1 0

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

17 Apr '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv10477 Modified Files: compiler.lisp Log Message: Tiny edit. Date: Sat Apr 17 10:10:51 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.51 movitz/compiler.lisp:1.52 --- movitz/compiler.lisp:1.51 Sat Apr 17 10:10:00 2004 +++ movitz/compiler.lisp Sat Apr 17 10:10:51 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.51 2004/04/17 14:10:00 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.52 2004/04/17 14:10:51 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -739,11 +739,12 @@ have-normalized-ecx-p))) (let ((optimized-function-code (optimize-code function-code - :keep-labels (append (subseq (movitz-funobj-const-list funobj) - 0 (movitz-funobj-num-jumpers funobj)) - '(entry%1op - entry%2op - entry%3op))))) + :keep-labels (append + (subseq (movitz-funobj-const-list funobj) + 0 (movitz-funobj-num-jumpers funobj)) + '(entry%1op + entry%2op + entry%3op))))) (cons numargs optimized-function-code)))))))) (let ((code1 (cdr (assoc 1 code-specs))) (code2 (cdr (assoc 2 code-specs)))

1 0

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

17 Apr '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv9897 Modified Files: compiler.lisp Log Message: Be slightly more clever about when to implicitly insert stack-limit-checks. Date: Sat Apr 17 10:10:01 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.50 movitz/compiler.lisp:1.51 --- movitz/compiler.lisp:1.50 Fri Apr 16 19:38:41 2004 +++ movitz/compiler.lisp Sat Apr 17 10:10:00 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.50 2004/04/16 23:38:41 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.51 2004/04/17 14:10:00 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -728,7 +728,9 @@ (multiple-value-bind (prelude-code have-normalized-ecx-p) (make-compiled-function-prelude stack-frame-size function-env use-stack-frame-p (need-normalized-ecx-p function-env) frame-map - :do-check-stack-p t) + :do-check-stack-p (or (<= 32 stack-frame-size) + (tree-search resolved-code + '(:call)))) (let ((function-code (install-arg-cmp (append prelude-code resolved-code @@ -2702,7 +2704,8 @@ (truncate (or (position-if (lambda (i) (member b (find-read-bindings i))) - (cdr init-pc)) + (cdr init-pc) + #-sbcl :end #-sbcl 10) 15) count))))))))) ;; First, make several passes while trying to locate bindings

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/inspect.lisp
by Frode Vatvedt Fjeld 17 Apr '04

17 Apr '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv4168 Modified Files: inspect.lisp Log Message: The function check-stack-limit certainly doesn't need to also implicitly check the stack-limit. Date: Sat Apr 17 10:09:07 2004 Author: ffjeld Index: movitz/losp/muerte/inspect.lisp diff -u movitz/losp/muerte/inspect.lisp:1.8 movitz/losp/muerte/inspect.lisp:1.9 --- movitz/losp/muerte/inspect.lisp:1.8 Fri Apr 16 10:42:22 2004 +++ movitz/losp/muerte/inspect.lisp Sat Apr 17 10:09:07 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Oct 24 09:50:41 2003 ;;;; -;;;; $Id: inspect.lisp,v 1.8 2004/04/16 14:42:22 ffjeld Exp $ +;;;; $Id: inspect.lisp,v 1.9 2004/04/17 14:09:07 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -24,6 +24,7 @@ (:locally (:bound (:edi (:edi-offset stack-bottom)) :esp)))) (defun check-stack-limit () + (declare (without-check-stack-limit)) ; we do it explicitly.. (check-stack-limit)) (defun stack-top ()

1 0