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

[movitz-cvs] CVS update: movitz/losp/muerte/basic-functions.lisp
by Frode Vatvedt Fjeld 26 Mar '04

26 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv31009 Modified Files: basic-functions.lisp Log Message: Move malloc functions to inspect.lisp, for now. Date: Thu Mar 25 20:49:07 2004 Author: ffjeld Index: movitz/losp/muerte/basic-functions.lisp diff -u movitz/losp/muerte/basic-functions.lisp:1.6 movitz/losp/muerte/basic-functions.lisp:1.7 --- movitz/losp/muerte/basic-functions.lisp:1.6 Thu Mar 25 06:27:00 2004 +++ movitz/losp/muerte/basic-functions.lisp Thu Mar 25 20:49:06 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Sep 4 18:41:57 2001 ;;;; -;;;; $Id: basic-functions.lisp,v 1.6 2004/03/25 11:27:00 ffjeld Exp $ +;;;; $Id: basic-functions.lisp,v 1.7 2004/03/26 01:49:06 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -356,16 +356,3 @@ (defun %word-offset (word offset) (%word-offset word offset)) -(defun malloc-words (words) - (malloc-clumps (1+ (truncate (1+ words) 2)))) - -(defun malloc-clumps (clumps) - (let ((x (with-inline-assembly (:returns :eax :side-effects t) - (:compile-form (:result-mode :ebx) clumps) - (:shll 1 :ebx) - (:globally (:call (:edi (:edi-offset malloc)))) - (:addl #.(movitz::tag :other) :eax)))) - (dotimes (i clumps) - (setf (memref x -6 i :lisp) nil - (memref x -2 i :lisp) nil)) - x))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/arrays.lisp
by Frode Vatvedt Fjeld 26 Mar '04

26 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv16201 Modified Files: arrays.lisp Log Message: Minor edit. Date: Thu Mar 25 20:47:39 2004 Author: ffjeld Index: movitz/losp/muerte/arrays.lisp diff -u movitz/losp/muerte/arrays.lisp:1.8 movitz/losp/muerte/arrays.lisp:1.9 --- movitz/losp/muerte/arrays.lisp:1.8 Thu Mar 25 06:17:22 2004 +++ movitz/losp/muerte/arrays.lisp Thu Mar 25 20:47:39 2004 @@ -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.8 2004/03/25 11:17:22 ffjeld Exp $ +;;;; $Id: arrays.lisp,v 1.9 2004/03/26 01:47:39 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -555,12 +555,12 @@ :other-tag :vector :wide-other-tag #.(bt:enum-value 'movitz::movitz-vector-element-type :any-t)))) - (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::num-elements) - 0 :unsigned-byte16) - dimensions) (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::flags) 0 :unsigned-byte16) 0) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::num-elements) + 0 :unsigned-byte16) + dimensions) (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::type) 0 :unsigned-byte16) #.(movitz:vector-type-tag :any-t))

1 0

[movitz-cvs] CVS update: movitz/losp/lib/toplevel.lisp
by Frode Vatvedt Fjeld 26 Mar '04

26 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv9627 Modified Files: toplevel.lisp Log Message: Minor edit. Date: Thu Mar 25 20:46:47 2004 Author: ffjeld Index: movitz/losp/lib/toplevel.lisp diff -u movitz/losp/lib/toplevel.lisp:1.4 movitz/losp/lib/toplevel.lisp:1.5 --- movitz/losp/lib/toplevel.lisp:1.4 Fri Feb 13 17:11:24 2004 +++ movitz/losp/lib/toplevel.lisp Thu Mar 25 20:46:47 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Thu Sep 5 15:56:26 2002 ;;;; -;;;; $Id: toplevel.lisp,v 1.4 2004/02/13 22:11:24 ffjeld Exp $ +;;;; $Id: toplevel.lisp,v 1.5 2004/03/26 01:46:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -43,10 +43,10 @@ (apply f arguments) (multiple-value-bind (completion completion-count) (muerte.readline:complete-symbol-name (string name) - :package :keyword - :filter-matches (lambda (x) - (and (gethash x *toplevel-commands*) - t))) + :package :keyword + :filter-matches (lambda (x) + (and (gethash x *toplevel-commands*) + t))) (case completion-count (0 (format t "~&No toplevel command named ~S." name) name)

1 0

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

26 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv26978 Modified Files: image.lisp Log Message: Added two bochs-flags fields to run-time-context. Date: Thu Mar 25 20:44:46 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.19 movitz/image.lisp:1.20 --- movitz/image.lisp:1.19 Wed Mar 24 13:39:42 2004 +++ movitz/image.lisp Thu Mar 25 20:44:46 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.19 2004/03/24 18:39:42 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.20 2004/03/26 01:44:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -128,6 +128,12 @@ (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

1 0

[movitz-cvs] CVS update: movitz/eval.lisp
by Frode Vatvedt Fjeld 26 Mar '04

26 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv14428 Modified Files: eval.lisp Log Message: This is a fix, but I'm not really sure how sound it is. Date: Thu Mar 25 20:43:46 2004 Author: ffjeld Index: movitz/eval.lisp diff -u movitz/eval.lisp:1.2 movitz/eval.lisp:1.3 --- movitz/eval.lisp:1.2 Mon Jan 19 06:23:41 2004 +++ movitz/eval.lisp Thu Mar 25 20:43:46 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Thu Nov 2 17:45:05 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: eval.lisp,v 1.2 2004/01/19 11:23:41 ffjeld Exp $ +;;;; $Id: eval.lisp,v 1.3 2004/03/26 01:43:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -97,7 +97,8 @@ (declare (ignore top-level-p)) (cond ((typep (movitz-binding form env) 'constant-object-binding) - (movitz-print (constant-object (movitz-binding form env)))) + (translate-program (movitz-print (constant-object (movitz-binding form env))) + :cl :muerte.cl)) ((movitz-constantp form env) (symbol-value form)) ;;; ((movitz-lexical-binding form env)

1 0

[movitz-cvs] CVS update: movitz/multiboot.lisp
by Frode Vatvedt Fjeld 26 Mar '04

26 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv10882 Modified Files: multiboot.lisp Log Message: Changed type word to lu32. Date: Thu Mar 25 20:42:45 2004 Author: ffjeld Index: movitz/multiboot.lisp diff -u movitz/multiboot.lisp:1.3 movitz/multiboot.lisp:1.4 --- movitz/multiboot.lisp:1.3 Wed Mar 24 08:20:49 2004 +++ movitz/multiboot.lisp Thu Mar 25 20:42:45 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Jun 12 12:14:12 2002 ;;;; -;;;; $Id: multiboot.lisp,v 1.3 2004/03/24 13:20:49 ffjeld Exp $ +;;;; $Id: multiboot.lisp,v 1.4 2004/03/26 01:42:45 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -37,10 +37,10 @@ (define-binary-class multiboot-header (movitz-heap-object) ((scan-skip-header - :binary-type word + :binary-type lu32 :initform +scan-skip-word+) (scan-skip-length - :binary-type word + :binary-type lu32 :initform 0 :map-binary-write (lambda (x type) (declare (ignore x y))

1 0

[movitz-cvs] CVS update: movitz/losp/lib/repl.lisp
by Frode Vatvedt Fjeld 26 Mar '04

26 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv30553 Modified Files: repl.lisp Log Message: Minor edits. Date: Thu Mar 25 20:36:30 2004 Author: ffjeld Index: movitz/losp/lib/repl.lisp diff -u movitz/losp/lib/repl.lisp:1.5 movitz/losp/lib/repl.lisp:1.6 --- movitz/losp/lib/repl.lisp:1.5 Wed Mar 24 19:40:35 2004 +++ movitz/losp/lib/repl.lisp Thu Mar 25 20:36:30 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Mar 19 14:58:12 2003 ;;;; -;;;; $Id: repl.lisp,v 1.5 2004/03/25 00:40:35 ffjeld Exp $ +;;;; $Id: repl.lisp,v 1.6 2004/03/26 01:36:30 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -45,12 +45,12 @@ (terpri) (multiple-value-bind (form buffer-pointer) (handler-bind - (#+ignore (muerte::missing-delimiter - (lambda (c) - (declare (ignore c)) - (format t "~&> ") - (invoke-restart 'muerte::next-line - (muerte.readline:contextual-readline *repl-readline-context*))))) + ((muerte::missing-delimiter + (lambda (c) + (declare (ignore c)) + (format t "~&> ") + (invoke-restart 'muerte::next-line + (muerte.readline:contextual-readline *repl-readline-context*))))) (simple-read-from-string buffer-string t t)) (multiple-value-call (lambda (form previous-package &rest results) @@ -74,11 +74,11 @@ (apply 'muerte.toplevel:invoke-toplevel-command form (loop for arg = (multiple-value-bind (arg x) - (simple-read-from-string buffer-string nil 'eof + (simple-read-from-string buffer-string nil '#0=#:eof :start buffer-pointer) (setq buffer-pointer x) arg) - until (eq arg 'eof) + until (eq arg '#0#) collect arg))))))) #+ignore (muerte.readline::readline-break (c) (declare (ignore c))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/environment.lisp
by Frode Vatvedt Fjeld 26 Mar '04

26 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv27600 Modified Files: environment.lisp Log Message: Put a maximum on the tracing indenting. Date: Thu Mar 25 20:35:29 2004 Author: ffjeld Index: movitz/losp/muerte/environment.lisp diff -u movitz/losp/muerte/environment.lisp:1.4 movitz/losp/muerte/environment.lisp:1.5 --- movitz/losp/muerte/environment.lisp:1.4 Wed Mar 24 19:52:54 2004 +++ movitz/losp/muerte/environment.lisp Thu Mar 25 20:35:29 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Oct 20 00:41:57 2001 ;;;; -;;;; $Id: environment.lisp,v 1.4 2004/03/25 00:52:54 ffjeld Exp $ +;;;; $Id: environment.lisp,v 1.5 2004/03/26 01:35:29 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -94,9 +94,10 @@ (declare (dynamic-extent results)) (let ((*trace-escape* t)) (fresh-line *trace-output*) - (dotimes (i *trace-level*) + (dotimes (i (min *trace-level* 10)) (write-string " " *trace-output*)) - (format *trace-output* "~&~D: =>~{ ~W~^,~}.~%" *trace-level* results) + (format *trace-output* "~D: =>~{ ~W~^,~}.~%" + *trace-level* results) (values-list results))) (let ((*trace-level* (1+ *trace-level*)) (*trace-escape* nil))

1 0

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

26 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv19195 Modified Files: compiler.lisp Log Message: Forgot to :init-lexvar &key bindings. Caused a nasty bug. Date: Thu Mar 25 20:34:13 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.35 movitz/compiler.lisp:1.36 --- movitz/compiler.lisp:1.35 Wed Mar 24 19:54:07 2004 +++ movitz/compiler.lisp Thu Mar 25 20:34:13 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.35 2004/03/25 00:54:07 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.36 2004/03/26 01:34:13 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -4079,7 +4079,9 @@ (cond ((and (movitz-constantp (optional-function-argument-init-form binding)) (< 1 position)) - `( + `((:init-lexvar ,binding) + ,@(when supplied-p-var + `((:init-lexvar ,supplied-p-binding))) ,@(compiler-call #'compile-self-evaluating :form (eval-form (optional-function-argument-init-form binding) env nil) :funobj funobj @@ -4105,7 +4107,10 @@ (:movl (:ebp (:ecx 4) ,(* -4 (1- (1+ position)))) :ebx) default-done (:store-lexical ,binding :ebx :type t))) - (t `((:arg-cmp ,(+ 2 position)) + (t `((:init-lexvar ,binding) + ,@(when supplied-p-var + `((:init-lexvar ,supplied-p-binding))) + (:arg-cmp ,(+ 2 position)) (:jb '(:sub-program (default) ,@(append (when supplied-p-var

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/basic-functions.lisp
by Frode Vatvedt Fjeld 25 Mar '04

25 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv20042 Modified Files: basic-functions.lisp Log Message: The functions malloc-words and malloc-clumps are needed to do anything, of course.. Date: Thu Mar 25 06:27:01 2004 Author: ffjeld Index: movitz/losp/muerte/basic-functions.lisp diff -u movitz/losp/muerte/basic-functions.lisp:1.5 movitz/losp/muerte/basic-functions.lisp:1.6 --- movitz/losp/muerte/basic-functions.lisp:1.5 Tue Mar 23 05:53:25 2004 +++ movitz/losp/muerte/basic-functions.lisp Thu Mar 25 06:27:00 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Sep 4 18:41:57 2001 ;;;; -;;;; $Id: basic-functions.lisp,v 1.5 2004/03/23 10:53:25 ffjeld Exp $ +;;;; $Id: basic-functions.lisp,v 1.6 2004/03/25 11:27:00 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -354,4 +354,18 @@ (:addl :ecx :eax)))) (defun %word-offset (word offset) - (%word-offset word offset)) \ No newline at end of file + (%word-offset word offset)) + +(defun malloc-words (words) + (malloc-clumps (1+ (truncate (1+ words) 2)))) + +(defun malloc-clumps (clumps) + (let ((x (with-inline-assembly (:returns :eax :side-effects t) + (:compile-form (:result-mode :ebx) clumps) + (:shll 1 :ebx) + (:globally (:call (:edi (:edi-offset malloc)))) + (:addl #.(movitz::tag :other) :eax)))) + (dotimes (i clumps) + (setf (memref x -6 i :lisp) nil + (memref x -2 i :lisp) nil)) + x))

1 0