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

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv3521 Modified Files: variables.lisp Log Message: Use declaim rather than defvar for *build-number*. Date: Wed Mar 24 18:42:49 2004 Author: ffjeld Index: movitz/losp/muerte/variables.lisp diff -u movitz/losp/muerte/variables.lisp:1.2 movitz/losp/muerte/variables.lisp:1.3 --- movitz/losp/muerte/variables.lisp:1.2 Wed Mar 24 13:39:53 2004 +++ movitz/losp/muerte/variables.lisp Wed Mar 24 18:42:49 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Nov 5 21:53:34 2003 ;;;; -;;;; $Id: variables.lisp,v 1.2 2004/03/24 18:39:53 ffjeld Exp $ +;;;; $Id: variables.lisp,v 1.3 2004/03/24 23:42:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -38,4 +38,4 @@ (defvar internal-time-units-per-second) -(defvar *build-number* :unknown) \ No newline at end of file +(declaim (special *build-number*)) \ No newline at end of file

1 0

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv29515 Modified Files: functions.lisp Log Message: Removed small pieces of dead code. Date: Wed Mar 24 15:40:41 2004 Author: ffjeld Index: movitz/losp/muerte/functions.lisp diff -u movitz/losp/muerte/functions.lisp:1.4 movitz/losp/muerte/functions.lisp:1.5 --- movitz/losp/muerte/functions.lisp:1.4 Wed Mar 24 08:33:21 2004 +++ movitz/losp/muerte/functions.lisp Wed Mar 24 15:40:40 2004 @@ -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.4 2004/03/24 13:33:21 ffjeld Exp $ +;;;; $Id: functions.lisp,v 1.5 2004/03/24 20:40:40 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -56,8 +56,7 @@ complement-prototype (function ,(movitz:movitz-eval (translate-program function-form :cl :muerte.cl))))) - (t #+ignore (error "Non-constant complement forms not yet supported: ~S" form) - form))) + (t form))) (defun complement (function) (lambda (&rest args) @@ -72,8 +71,7 @@ (compiled-function (funobj-name edx)) (t '(unknown))))) - (error 'undefined-function :name function-name) - #+ignore (error "Unbound function-name ~S called with arguments ~S." function-name args))) + (error 'undefined-function :name function-name))) ;;; funobj object

1 0

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv28849 Modified Files: environment.lisp Log Message: Re-wrote trace-wrapper not to cons. Date: Wed Mar 24 14:33:40 2004 Author: ffjeld Index: movitz/losp/muerte/environment.lisp diff -u movitz/losp/muerte/environment.lisp:1.2 movitz/losp/muerte/environment.lisp:1.3 --- movitz/losp/muerte/environment.lisp:1.2 Mon Jan 19 06:23:46 2004 +++ movitz/losp/muerte/environment.lisp Wed Mar 24 14:33:40 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.2 2004/01/19 11:23:46 ffjeld Exp $ +;;;; $Id: environment.lisp,v 1.3 2004/03/24 19:33:40 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -88,14 +88,16 @@ (write-string " " *trace-output*)) (format *trace-output* "~D: (~S~{ ~S~})~%" *trace-level* function-name args)) - (let ((result (let ((*trace-level* (1+ *trace-level*))) - (multiple-value-list (apply function args)))) - (*trace-escape* t)) - (fresh-line *trace-output*) - (dotimes (i *trace-level*) - (write-string " " *trace-output*)) - (format *trace-output* "~D: => ~:S~%" *trace-level* result) - (values-list result))))))) + (multiple-value-call + (lambda (&rest results) + (declare (dynamic-extent results)) + (let ((*trace-escape* t)) + (fresh-line *trace-output*) + (dotimes (i *trace-level*) + (write-string " " *trace-output*)) + (format *trace-output* "~&~D: =>~{ ~W~^,~}.~%" *trace-level* results) + (values-list results))) + (apply function args))))))) (defun do-trace (function-name &key (callers t)) (when (assoc function-name *trace-map* :test #'equal)

1 0

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv15844 Modified Files: format.lisp Log Message: Fixed ~{ format directive which didn't play quite right with ~^. Date: Wed Mar 24 14:30:15 2004 Author: ffjeld Index: movitz/losp/muerte/format.lisp diff -u movitz/losp/muerte/format.lisp:1.2 movitz/losp/muerte/format.lisp:1.3 --- movitz/losp/muerte/format.lisp:1.2 Mon Jan 19 06:23:46 2004 +++ movitz/losp/muerte/format.lisp Wed Mar 24 14:30:15 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Mar 23 01:18:36 2002 ;;;; -;;;; $Id: format.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ +;;;; $Id: format.lisp,v 1.3 2004/03/24 19:30:15 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -241,10 +241,10 @@ (multiple-value-setq (i args) (format-by-string control-string (1+ i) (1- loop-limit) args)))) (t (let ((loop-args (pop args))) - (if (or (zerop loop-limit) (null loop-args)) - (setf i (skip-iteration control-string (1+ i))) - (setf i (format-by-string control-string (1+ i) - (1- loop-limit) loop-args))))))))) + (unless (or (zerop loop-limit) (null loop-args)) + (format-by-string control-string (1+ i) + (1- loop-limit) loop-args)) + (setf i (skip-iteration control-string (1+ i))))))))) (#\} (if (and args (or (not loop-limit) (not (zerop loop-limit)))) (setf loop-limit (and loop-limit (1- loop-limit)) i (1- start))

1 0

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv31107 Modified Files: variables.lisp Log Message: Added muerte:*build-number* magic variable that gets initialized to the build number, aka. bootblock ID. Date: Wed Mar 24 13:39:53 2004 Author: ffjeld Index: movitz/losp/muerte/variables.lisp diff -u movitz/losp/muerte/variables.lisp:1.1.1.1 movitz/losp/muerte/variables.lisp:1.2 --- movitz/losp/muerte/variables.lisp:1.1.1.1 Tue Jan 13 06:05:06 2004 +++ movitz/losp/muerte/variables.lisp Wed Mar 24 13:39:53 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Nov 5 21:53:34 2003 ;;;; -;;;; $Id: variables.lisp,v 1.1.1.1 2004/01/13 11:05:06 ffjeld Exp $ +;;;; $Id: variables.lisp,v 1.2 2004/03/24 18:39:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -37,3 +37,5 @@ (defparameter *debugger-hook* nil) (defvar internal-time-units-per-second) + +(defvar *build-number* :unknown) \ No newline at end of file

1 0

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv30219 Modified Files: packages.lisp Log Message: Added muerte:*build-number* magic variable that gets initialized to the build number, aka. bootblock ID. Date: Wed Mar 24 13:39:47 2004 Author: ffjeld Index: movitz/packages.lisp diff -u movitz/packages.lisp:1.9 movitz/packages.lisp:1.10 --- movitz/packages.lisp:1.9 Wed Mar 24 06:24:35 2004 +++ movitz/packages.lisp Wed Mar 24 13:39:47 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Nov 15 21:39:55 2003 ;;;; -;;;; $Id: packages.lisp,v 1.9 2004/03/24 11:24:35 ffjeld Exp $ +;;;; $Id: packages.lisp,v 1.10 2004/03/24 18:39:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1111,7 +1111,8 @@ stack-frame-call-site stack-frame-ref check-stack-limit - + + *build-number* *error-no-condition-for-debugger* formatted-error

1 0

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv30051 Modified Files: image.lisp Log Message: Added muerte:*build-number* magic variable that gets initialized to the build number, aka. bootblock ID. Date: Wed Mar 24 13:39:42 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.18 movitz/image.lisp:1.19 --- movitz/image.lisp:1.18 Wed Mar 24 08:20:24 2004 +++ movitz/image.lisp Wed Mar 24 13:39:42 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.18 2004/03/24 13:20:24 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.19 2004/03/24 18:39:42 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -718,6 +718,8 @@ (format t "~&;; Doing initiating dump..") (dump-image :path path :multiboot-p multiboot-p :ignore-dump-count t) (assert (plusp (dump-count *image*)))) + (setf (movitz-symbol-value (movitz-read 'muerte:*build-number*)) + (1+ *bootblock-build*)) (let ((load-address (image-start-address *image*))) (setf (image-cons-pointer *image*) (- load-address (image-ds-segment-base *image*))

1 0

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv11133 Modified Files: compiler.lisp Log Message: Improved propagation of :protect-registers somewhat. Date: Wed Mar 24 13:38:18 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.33 movitz/compiler.lisp:1.34 --- movitz/compiler.lisp:1.33 Thu Feb 26 08:48:42 2004 +++ movitz/compiler.lisp Wed Mar 24 13:38:18 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.33 2004/02/26 13:48:42 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.34 2004/03/24 18:38:18 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -2436,9 +2436,12 @@ (destructuring-bind (binding &key init-with-register init-with-type protect-registers protect-carry) (cdr i) - (declare (ignore binding protect-registers protect-carry init-with-type)) + (declare (ignore binding protect-carry init-with-type)) (when init-with-register - (setf free-so-far (remove init-with-register free-so-far))))) + (setf free-so-far (remove-if (lambda (x) + (or (eq x init-with-register) + (member x protect-registers))) + free-so-far))))) (t (case (instruction-is i) ((nil :call) (return nil)) @@ -5575,12 +5578,13 @@ (list source))) (define-extended-code-expander :store-lexical (instruction funobj frame-map) - (destructuring-bind (destination source &key shared-reference-p type) + (destructuring-bind (destination source &key shared-reference-p type protect-registers) (cdr instruction) (declare (ignore type)) (make-store-lexical (ensure-local-binding destination funobj) (ensure-local-binding source funobj) - shared-reference-p frame-map))) + shared-reference-p frame-map + :protect-registers protect-registers))) ;;;;;;;;;;;;;;;;;; Init-lexvar

1 0

[movitz-cvs] CVS update: movitz/special-operators-cl.lisp
by Frode Vatvedt Fjeld 24 Mar '04

24 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv29696 Modified Files: special-operators-cl.lisp Log Message: The compiler for m-v-bind was buggy when its binding were lended. This should fix it. Date: Wed Mar 24 13:36:41 2004 Author: ffjeld Index: movitz/special-operators-cl.lisp diff -u movitz/special-operators-cl.lisp:1.11 movitz/special-operators-cl.lisp:1.12 --- movitz/special-operators-cl.lisp:1.11 Sat Feb 14 12:33:40 2004 +++ movitz/special-operators-cl.lisp Wed Mar 24 13:36:41 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 24 16:31:11 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: special-operators-cl.lisp,v 1.11 2004/02/14 17:33:40 ffjeld Exp $ +;;;; $Id: special-operators-cl.lisp,v 1.12 2004/03/24 18:36:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -468,7 +468,8 @@ :protect-carry t :protect-registers (:eax :ebx)) (:store-lexical ,(first lexical-bindings) :eax - :type ,(type-specifier-primary values-type)) + :type ,(type-specifier-primary values-type) + :protect-registers (:ebx)) (:init-lexvar ,(second lexical-bindings) :protect-carry t :protect-registers (:ebx)) @@ -490,14 +491,17 @@ append (case pos (0 `((:init-lexvar ,binding - :protect-registers '(:eax :ebx :ecx)) - (:store-lexical ,binding :eax :type ,type))) + :protect-registers (:eax :ebx :ecx)) + (:store-lexical ,binding :eax :type ,type + :protect-registers (:eax :ebx :ecx)))) (1 `((:init-lexvar ,binding - :protect-registers '(:ebx :ecx)) - (:store-lexical ,binding :edi :type null) + :protect-registers (:ebx :ecx)) + (:store-lexical ,binding :edi :type null + :protect-registers (:ecx)) (:cmpl 1 :ecx) (:jbe ',skip-label) - (:store-lexical ,binding :ebx :type ,type) + (:store-lexical ,binding :ebx :type ,type + :protect-registers (:ecx)) ,skip-label)) (t (if *compiler-use-cmov-p* `((:init-lexvar ,binding :protect-registers '(:ecx)) @@ -506,7 +510,8 @@ (:locally (:cmova (:edi (:edi-offset values ,(* 4 (- pos 2)))) :eax)) - (:store-lexical ,binding :eax :type ,type)) + (:store-lexical ,binding :eax :type ,type + :protect-registers (:eax))) `((:init-lexvar ,binding :protect-registers '(:ecx)) (:movl :edi :eax) (:cmpl ,pos :ecx) @@ -515,7 +520,8 @@ ,(* 4 (- pos 2)))) :eax)) ,skip-label - (:store-lexical ,binding :eax :type ,type))))))))))))))) + (:store-lexical ,binding :eax :type ,type + :protect-registers (:ecx)))))))))))))))) (compiler-values-bind (&code body-code &returns body-returns-mode) (compiler-call #'compile-form-unprotected :defaults forward

1 0

[movitz-cvs] CVS update: movitz/losp/x86-pc/interrupt.lisp
by Frode Vatvedt Fjeld 24 Mar '04

24 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv16864 Modified Files: interrupt.lisp Log Message: Interrupts 67 and 68 are used as a very primitive tracing mechanism. Date: Wed Mar 24 08:36:26 2004 Author: ffjeld Index: movitz/losp/x86-pc/interrupt.lisp diff -u movitz/losp/x86-pc/interrupt.lisp:1.3 movitz/losp/x86-pc/interrupt.lisp:1.4 --- movitz/losp/x86-pc/interrupt.lisp:1.3 Mon Jan 19 06:23:52 2004 +++ movitz/losp/x86-pc/interrupt.lisp Wed Mar 24 08:36:26 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri May 4 18:08:50 2001 ;;;; -;;;; $Id: interrupt.lisp,v 1.3 2004/01/19 11:23:52 ffjeld Exp $ +;;;; $Id: interrupt.lisp,v 1.4 2004/03/24 13:36:26 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -176,7 +176,12 @@ (int-frame-ref int-frame :error-code :unsigned-byte32) $eax $ebx $ecx)) (68 (warn "EIP: ~@Z EAX: ~@Z EBX: ~@Z ECX: ~@Z EDX: ~@Z" - $eip $eax $ebx $ecx $edx)) + $eip $eax $ebx $ecx $edx) + (dotimes (i 100000) + (with-inline-assembly (:returns :nothing) (:nop)))) + (67 (muerte.debug:backtrace :fresh-lines nil :length 6) + (dotimes (i 100000) + (with-inline-assembly (:returns :nothing) (:nop)))) (66 (error "Unspecified type error in ~S with EAX=~@Z, ECX=~@Z." (@ (+ int-frame (int-frame-index :esi))) $eax $ecx))

1 0