movitz-cvs December 2004

movitz-cvs@common-lisp.net

1 participants
40 discussions

[movitz-cvs] CVS update: movitz/losp/muerte/more-macros.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv30693 Modified Files: more-macros.lisp Log Message: *** empty log message *** Date: Thu Dec 9 15:20:43 2004 Author: ffjeld Index: movitz/losp/muerte/more-macros.lisp diff -u movitz/losp/muerte/more-macros.lisp:1.21 movitz/losp/muerte/more-macros.lisp:1.22 --- movitz/losp/muerte/more-macros.lisp:1.21 Sat Nov 20 18:36:07 2004 +++ movitz/losp/muerte/more-macros.lisp Thu Dec 9 15:20:43 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.21 2004/11/20 17:36:07 ffjeld Exp $ +;;;; $Id: more-macros.lisp,v 1.22 2004/12/09 14:20:43 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -380,7 +380,7 @@ (defmacro without-interrupts (&body body) (let ((var (gensym "interrupts-enabled-p-"))) - `(let ((,var (logbitp ,(position :if +eflags-map+) (eflags)))) + `(let ((,var (logbitp ,(position :if (symbol-value '+eflags-map+)) (eflags)))) (unwind-protect (progn (cli) ,@body) (when ,var (sti))))))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/basic-macros.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv30671 Modified Files: basic-macros.lisp Log Message: Fixed defpackage macro a bit, for CLisp compatibility. Date: Thu Dec 9 15:20:14 2004 Author: ffjeld Index: movitz/losp/muerte/basic-macros.lisp diff -u movitz/losp/muerte/basic-macros.lisp:1.52 movitz/losp/muerte/basic-macros.lisp:1.53 --- movitz/losp/muerte/basic-macros.lisp:1.52 Thu Nov 25 19:05:32 2004 +++ movitz/losp/muerte/basic-macros.lisp Thu Dec 9 15:20:14 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.52 2004/11/25 18:05:32 ffjeld Exp $ +;;;; $Id: basic-macros.lisp,v 1.53 2004/12/09 14:20:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -70,14 +70,16 @@ ,(cons 'cl:progn body))) (defmacro defpackage (package-name &rest options) - (let ((uses (if (not (assoc :use options)) - (list 'muerte.cl) - (cdr (assoc :use options))))) + (let ((uses (union (if (not (assoc :use options)) + (list 'muerte.cl) + (cdr (assoc :use options))) + (when (find-package package-name) + (mapcar #'package-name (package-use-list package-name)))))) (setf uses (mapcar (lambda (use) (if (member use (cons :common-lisp (package-nicknames :common-lisp)) :test #'string=) :muerte.cl - use)) + use)) uses)) (when (or (member :muerte.cl uses :test #'string=) (member :muerte.common-lisp uses :test #'string=)) @@ -85,7 +87,7 @@ (let ((movitz-options (cons (cons :use uses) (remove :use options :key #'car)))) `(eval-when (:compile-toplevel) - (defpackage ,package-name ,@movitz-options))))) + (defpackage ,package-name ,@movitz-options))))) (defmacro cond (&rest clauses) (if (null clauses) @@ -873,16 +875,19 @@ (if (not (movitz:movitz-constantp symbol env)) form (let* ((type (movitz:movitz-eval symbol env)) - (cl-type (movitz::translate-program type :muerte.cl :cl))) + (movitz-type (movitz-program type)) + (cl-type (host-program type))) (cond ((eq t cl-type) `(load-global-constant the-class-t)) - ((member type (movitz::image-classes-map movitz:*image*)) + ((member movitz-type (movitz::image-classes-map movitz:*image*)) `(with-inline-assembly (:returns :register) (:globally (:movl (:edi (:edi-offset classes)) (:result-register))) - (:movl ((:result-register) ,(movitz::class-object-offset type)) + (:movl ((:result-register) ,(movitz::class-object-offset movitz-type)) (:result-register)))) - (t (warn "unknown find-class: ~A" cl-type) + (t (warn "unknown find-class: ~S [~S] [~S]" cl-type + (and (symbolp cl-type) (symbol-package cl-type)) + (and (symbolp movitz-type) (symbol-package movitz-type))) form)) #+ignore (case cl-type

1 0

[movitz-cvs] CVS update: movitz/losp/lib/net/ethernet.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv30634 Modified Files: ethernet.lisp Log Message: Cleaned up constants a bit. Date: Thu Dec 9 15:18:37 2004 Author: ffjeld Index: movitz/losp/lib/net/ethernet.lisp diff -u movitz/losp/lib/net/ethernet.lisp:1.6 movitz/losp/lib/net/ethernet.lisp:1.7 --- movitz/losp/lib/net/ethernet.lisp:1.6 Wed Nov 24 11:07:11 2004 +++ movitz/losp/lib/net/ethernet.lisp Thu Dec 9 15:18:37 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Sep 17 15:25:31 2002 ;;;; -;;;; $Id: ethernet.lisp,v 1.6 2004/11/24 10:07:11 ffjeld Exp $ +;;;; $Id: ethernet.lisp,v 1.7 2004/12/09 14:18:37 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -47,7 +47,20 @@ #:+destination-mac+ #:+max-ethernet-frame-size+ #:+min-ethernet-frame-size+ - #:+broadcast-address+)) + #:+broadcast-address+ + + #:+ether-type-ip4+ + #:+ether-type-chaosnet+ + #:+ether-type-arp+ + #:+ether-type-symbolics+ + #:+ether-type-rarp+ + #:+ether-type-snmp+ + #:+ether-type-ip6+ + #:+ether-type-ppp+ + #:+ether-type-mswin-heartbeat+ + #:+ether-type-loopback+ + + )) (in-package muerte.ethernet) @@ -114,20 +127,18 @@ ;;; -(define-named-integer ether-type (:export-constants t) - ;; http://www.iana.org/assignments/ethernet-numbers - ;; These are just a random selection, really. - (#x0800 ip4) - (#x0804 chaosnet) - (#x0806 arp) - (#x081c symbolics) - (#x0835 rarp) - (#x814c snmp) - (#x86dd ip6) - (#x880b ppp) - ;; http://www.microsoft.com/technet/treeview/default.asp?url=/TechNet/prodtech… - (#x886f mswin-heartbeat) - (#x9000 loopback)) +(defconstant +ether-type-ip4+ #x0800) +(defconstant +ether-type-chaosnet+ #x0804) +(defconstant +ether-type-arp+ #x0806) +(defconstant +ether-type-symbolics+ #x081c) +(defconstant +ether-type-rarp+ #x0835) +(defconstant +ether-type-snmp+ #x814c) +(defconstant +ether-type-ip6+ #x86dd) +(defconstant +ether-type-ppp+ #x880b) +;; http://www.microsoft.com/technet/treeview/default.asp? +;; url=/TechNet/prodtechnol/windows2000serv/deploy/confeat/nlbovw.asp +(defconstant +ether-type-mswin-heartbeat+ #x886f) +(defconstant +ether-type-loopback+ #x9000) ;;;

1 0

[movitz-cvs] CVS update: movitz/losp/lib/readline.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv30352 Modified Files: readline.lisp Log Message: Use #\Rubout rrather than #\delete. Date: Thu Dec 9 15:16:14 2004 Author: ffjeld Index: movitz/losp/lib/readline.lisp diff -u movitz/losp/lib/readline.lisp:1.6 movitz/losp/lib/readline.lisp:1.7 --- movitz/losp/lib/readline.lisp:1.6 Wed Nov 24 17:23:45 2004 +++ movitz/losp/lib/readline.lisp Thu Dec 9 15:16:13 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Nov 2 13:58:58 2001 ;;;; -;;;; $Id: readline.lisp,v 1.6 2004/11/24 16:23:45 ffjeld Exp $ +;;;; $Id: readline.lisp,v 1.7 2004/12/09 14:16:13 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -219,7 +219,7 @@ (write-char #\space)) (setf (cursor-x console) x end pos))) - ((#\delete #\^d) + ((#\Rubout #\^d) (when (< pos end) (dotimes (i (- end pos)) (setf (char buffer (+ pos i))

1 0

[movitz-cvs] CVS update: movitz/losp/lib/named-integers.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv29887 Modified Files: named-integers.lisp Log Message: *** empty log message *** Date: Thu Dec 9 15:12:42 2004 Author: ffjeld Index: movitz/losp/lib/named-integers.lisp diff -u movitz/losp/lib/named-integers.lisp:1.4 movitz/losp/lib/named-integers.lisp:1.5 --- movitz/losp/lib/named-integers.lisp:1.4 Wed May 5 10:24:21 2004 +++ movitz/losp/lib/named-integers.lisp Thu Dec 9 15:12:41 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Jan 4 16:13:46 2002 ;;;; -;;;; $Id: named-integers.lisp,v 1.4 2004/05/05 08:24:21 ffjeld Exp $ +;;;; $Id: named-integers.lisp,v 1.5 2004/12/09 14:12:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -85,6 +85,7 @@ ',integer-list ',name-list)))) (eval-when (:compile-toplevel) + ,@constant-declarations (export ',constant-exports)) ,@constant-declarations ',type-name))))

1 0

[movitz-cvs] CVS update: movitz/parse.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv29832 Modified Files: parse.lisp Log Message: Cleaned up parsing functions and translate-program a bit, so it should now work more reliably, also on CLisp. Date: Thu Dec 9 15:09:59 2004 Author: ffjeld Index: movitz/parse.lisp diff -u movitz/parse.lisp:1.4 movitz/parse.lisp:1.5 --- movitz/parse.lisp:1.4 Wed Nov 24 11:02:59 2004 +++ movitz/parse.lisp Thu Dec 9 15:09:58 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 24 16:49:17 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: parse.lisp,v 1.4 2004/11/24 10:02:59 ffjeld Exp $ +;;;; $Id: parse.lisp,v 1.5 2004/12/09 14:09:58 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -23,24 +23,20 @@ (defun parse-declarations-and-body (forms &optional (declare-symbol 'muerte.cl::declare)) "From the list of FORMS, return first the list of non-declaration forms, ~ second the list of declaration-specifiers." - (loop for form on forms - while (declare-form-p (car form) declare-symbol) - append (cdar form) into declarations - finally (return (values form declarations)))) + (loop for declaration-form = (when (declare-form-p (car forms) declare-symbol) + (pop forms)) + while declaration-form + append (cdr declaration-form) into declarations + finally (return (values forms declarations)))) (defun parse-docstring-declarations-and-body (forms &optional (declare-symbol 'muerte.cl::declare)) "From the list of FORMS, return first the non-declarations forms, second the declarations, ~ and third the documentation string." - (loop for rest-forms on forms - with docstring = nil - if (declare-form-p (first rest-forms) declare-symbol) - append (cdar rest-forms) into declarations - else if (and (null docstring) - (not (endp (rest rest-forms))) - (stringp (first rest-forms))) - do (setf docstring (first rest-forms)) - else do (loop-finish) - finally (return (values rest-forms declarations docstring)))) + (let ((docstring (when (and (cdr forms) (stringp (car forms))) + (pop forms)))) + (multiple-value-bind (body declarations) + (parse-declarations-and-body forms declare-symbol) + (values body declarations docstring)))) (defun unfold-circular-list (list) "If LIST is circular (through cdr), return (a copy of) the non-circular portion of LIST, and the index (in LIST) of the cons-cell pointed to by (cdr (last LIST))." @@ -54,11 +50,7 @@ cdr-index))))) (defun symbol-package-fix-cl (symbol) - *package* - #+ignore - (if (eq (find-package :cl) (symbol-package symbol)) - (find-package :muerte.cl) - (symbol-package symbol))) + *package*) (eval-when (:execute :compile-toplevel :load-toplevel) (defun muerte::translate-program @@ -71,12 +63,18 @@ (setf from-package (find-package from-package)) (setf to-package (find-package to-package)) (flet ((translate-symbol (s) - (multiple-value-bind (symbol status) - (find-symbol (symbol-name s) to-package) - (if (eq :external status) symbol s)))) + (if (not (eq s (find-symbol (symbol-name s) from-package))) + s + (multiple-value-bind (symbol status) + (find-symbol (symbol-name s) to-package) + (when (or (and (find-symbol (symbol-name s) to-package) + (not (find-symbol (symbol-name s) from-package))) + (and (find-symbol (symbol-name s) from-package) + (not (find-symbol (symbol-name s) to-package)))) + (error "blurgh ~S" s)) + (or symbol s) #+ignore (if (eq :external status) symbol s))))) (cond - ((and (symbolp program) ; single symbol? - (eq (symbol-package program) from-package)) + ((symbolp program) ; single symbol? (translate-symbol program)) ((simple-vector-p program) (map 'vector @@ -96,22 +94,6 @@ (setf (cdr (last translated-program)) (nthcdr cdr-index translated-program)) translated-program))) - #+ignore ((and (eq quote-symbol (car program)) ; triple-quote? - (consp (cadr program)) - (eq quote-symbol (caadr program)) - (consp (cadadr program)) - (eq quote-symbol (car (cadadr program)))) - (cons (translate-symbol (car program)) - (muerte::translate-program (rest program) from-package to-package - :when when - :remove-double-quotes-p remove-double-quotes-p - :quote-symbol quote-symbol))) - #+ignore ((and (eq quote-symbol (car program)) ; double-quote? - (consp (cadr program)) - (eq quote-symbol (caadr program))) - (if remove-double-quotes-p - (cadadr program) - program)) ; .. then don't mess with it. ((and (eq :translate-when (first program)) (or (string= t (second program)) (and when (eq when (second program))))) @@ -119,8 +101,7 @@ ((and (eq :translate-when (first program)) (eq nil (second program))) (third program)) - ((and (symbolp (car program)) - (eq (symbol-package (car program)) from-package)) + ((symbolp (car program)) (cons (translate-symbol (car program)) (muerte::translate-program (cdr program) from-package to-package :when when @@ -139,7 +120,11 @@ (muerte::translate-program (cdr program) from-package to-package :when when :remove-double-quotes-p remove-double-quotes-p - :quote-symbol quote-symbol))))))) + :quote-symbol quote-symbol)))))) + (defun muerte::movitz-program (program) + (translate-program program :common-lisp :muerte.cl)) + (defun muerte::host-program (program) + (translate-program program :muerte.cl :common-lisp))) (defun decode-normal-lambda-list (lambda-list &optional host-symbols-p) "3.4.1 Ordinary Lambda Lists.

1 0

[movitz-cvs] CVS update: movitz/load.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv29803 Modified Files: load.lisp Log Message: Recent CLisp fixed this bug. Date: Thu Dec 9 15:05:54 2004 Author: ffjeld Index: movitz/load.lisp diff -u movitz/load.lisp:1.10 movitz/load.lisp:1.11 --- movitz/load.lisp:1.10 Wed Feb 18 15:42:59 2004 +++ movitz/load.lisp Thu Dec 9 15:05:52 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Thu Jan 15 18:40:58 2004 ;;;; -;;;; $Id: load.lisp,v 1.10 2004/02/18 14:42:59 ffjeld Exp $ +;;;; $Id: load.lisp,v 1.11 2004/12/09 14:05:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -48,20 +48,21 @@ (setf (system::gsgc-parameter :generation-spread) 12) (sys:resize-areas :new (* 64 1024 1024))) -#+clisp (load "packages") -#+clisp (defconstant movitz::&all 'movitz::&all) ; CLisp has this wonderful bug.. -#+clisp (defconstant movitz::&code 'movitz::&code) -#+clisp (defconstant movitz::&form 'movitz::&form) -#+clisp (defconstant movitz::&returns 'movitz::&returns) -#+clisp (defconstant movitz::&functional-p 'movitz::&functional-p) -#+clisp (defconstant movitz::&modifies 'movitz::&modifies) -#+clisp (defconstant movitz::&type 'movitz::&type) -#+clisp (defconstant movitz::&final-form 'movitz::&final-form) -#+clisp (defconstant movitz::&funobj 'movitz::&funobj) -#+clisp (defconstant movitz::&top-level-p 'movitz::&top-level-p) -#+clisp (defconstant movitz::&result-mode 'movitz::&result-mode) -#+clisp (defconstant movitz::&env 'movitz::&env) -#+clisp (defconstant movitz::&producer 'movitz::&producer) +#+clisp-older-than-2.33-or-so +(progn (load "packages") + (defconstant movitz::&all 'movitz::&all) ; CLisp has this wonderful bug.. + (defconstant movitz::&code 'movitz::&code) + (defconstant movitz::&form 'movitz::&form) + (defconstant movitz::&returns 'movitz::&returns) + (defconstant movitz::&functional-p 'movitz::&functional-p) + (defconstant movitz::&modifies 'movitz::&modifies) + (defconstant movitz::&type 'movitz::&type) + (defconstant movitz::&final-form 'movitz::&final-form) + (defconstant movitz::&funobj 'movitz::&funobj) + (defconstant movitz::&top-level-p 'movitz::&top-level-p) + (defconstant movitz::&result-mode 'movitz::&result-mode) + (defconstant movitz::&env 'movitz::&env) + (defconstant movitz::&producer 'movitz::&producer)) #-allegro (do () (nil)

1 0

[movitz-cvs] CVS update: movitz/image.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv29777 Modified Files: image.lisp Log Message: Added function set-file-position that tolerats the behavior of CLisp's file-position (on windows). Date: Thu Dec 9 15:04:55 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.83 movitz/image.lisp:1.84 --- movitz/image.lisp:1.83 Thu Nov 25 19:05:17 2004 +++ movitz/image.lisp Thu Dec 9 15:04:54 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.83 2004/11/25 18:05:17 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.84 2004/12/09 14:04:54 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -846,6 +846,16 @@ *i* (when (boundp '*image*) *image*)) *image*) +(defun set-file-position (stream position &optional who) + (or (ignore-errors (file-position stream position)) + (let* ((end (file-position stream :end)) + (diff (- position end))) + (assert (< 0 diff 10000)) + (dotimes (i diff) + (write-byte 0 stream)) + (assert (= position (file-position stream))))) + (values)) + (defun dump-image (&key (path *default-image-file*) ((:image *image*) *image*) (multiboot-p t) ignore-dump-count) "When <multiboot-p> is true, include a MultiBoot-compliant header in the image." @@ -959,8 +969,7 @@ :direction :output :if-exists :supersede :if-does-not-exist :create) - (assert (file-position stream 512) () ; leave room for bootblock. - "Couldn't set file-position for ~W." (pathname stream)) + (set-file-position stream 512) ; leave room for bootblock. (let* ((stack-vector (make-instance 'movitz-basic-vector :num-elements #x3ffe :fill-pointer 0 @@ -978,12 +987,12 @@ (kernel-size (- image-end image-start))) (format t "~&;; Kernel size: ~D octets.~%" kernel-size) (unless (zerop (mod image-end 512)) ; Ensure image is multiple of 512 octets - (file-position stream (+ image-end (- 511 (mod image-end 512)))) + (set-file-position stream (+ image-end (- 511 (mod image-end 512))) 'pad-image-tail) (write-byte #x0 stream)) (format t "~&;; Image file size: ~D octets.~%" image-end) ;; Write simple stage1 bootblock into sector 0.. (format t "~&;; Dump count: ~D." (incf (dump-count *image*))) - (assert (file-position stream 0)) + (set-file-position stream 0) (flet ((global-slot-position (slot-name) (+ 512 (image-nil-word *image*) @@ -1004,13 +1013,12 @@ #+ignore(warn "stack-v-pos: ~S => ~S" stack-vector-position stack-vector-word) - (assert (file-position stream (global-slot-position 'stack-vector) - #+ignore stack-vector-position)) + (set-file-position stream (global-slot-position 'stack-vector) 'stack-vector) (write-binary 'word stream stack-vector-word) - (assert (file-position stream (global-slot-position 'stack-bottom))) + (set-file-position stream (global-slot-position 'stack-bottom) 'stack-bottom) (write-binary 'lu32 stream (+ 8 (* 4 4096) ; cushion (- stack-vector-word (tag :other)))) - (assert (file-position stream (global-slot-position 'stack-top))) + (set-file-position stream (global-slot-position 'stack-top) 'stack-top) (write-binary 'lu32 stream (+ 8 (- stack-vector-word (tag :other)) (* 4 (movitz-vector-num-elements stack-vector))))) (if (not multiboot-p) @@ -1030,10 +1038,7 @@ (warn "Multiboot header at position ~D is above the 8KB mark, ~ this image will not be Multiboot compatible." (+ mb-file-position (sizeof mb)))) - (assert (file-position stream mb-file-position) () - "Couldn't set file-position for ~W to ~W." - (pathname stream) - mb-file-position) + (set-file-position stream mb-file-position 'multiboot-header) ;; (format t "~&;; Multiboot load-address: #x~X." load-address) (setf (header-address mb) mb-address (load-address mb) load-address @@ -1077,7 +1082,7 @@ (assert (<= 0 pad-delta 31) () "pad-delta ~S for ~S, p: ~S, new-pos: ~S" pad-delta obj p new-pos)) (incf pad-size pad-delta)) - (assert (file-position stream new-pos))) + (set-file-position stream new-pos obj)) ;; (warn "Dump at address #x~X, filepos #x~X: ~A" p (file-position stream) obj) (let ((old-pos (file-position stream)) (write-size (write-binary-record obj stream))) @@ -1109,10 +1114,10 @@ (sum (+ symbols-size conses-size funobjs-size strings-size simple-vectors-size code-vectors-size pad-size))) (format t "~&;;~%;; ~D symbols (~D gensyms) (~,1F KB ~~ ~,1F%), ~D conses (~,1F KB ~~ ~,1F%), -;; ~D funobjs (~,1F KB ~~ ~,1F%), ~D strings (~,1F KB ~~ ~,1F%), -;; ~D simple-vectors (~,1F KB ~~ ~,1F%), ~D code-vectors (~,1F KB ~~ ~,1F%). -;; ~,1F KB (~,1F%) of padding. -;; In sum this accounts for ~,1F%, or ~D bytes.~%;;~%" +~D funobjs (~,1F KB ~~ ~,1F%), ~D strings (~,1F KB ~~ ~,1F%), +~D simple-vectors (~,1F KB ~~ ~,1F%), ~D code-vectors (~,1F KB ~~ ~,1F%). +~,1F KB (~,1F%) of padding. +In sum this accounts for ~,1F%, or ~D bytes.~%;;~%" symbols-numof gensyms-numof (/ symbols-size 1024) (/ (* symbols-size 100) total-size) conses-numof (/ conses-size 1024) (/ (* conses-size 100) total-size) @@ -1160,13 +1165,13 @@ (t #+ignore (warn "Package ~S ~@[for symbol ~S ~]is not a Movitz package." name symbol) name))) - (ensure-package (package-name lisp-package) + (ensure-package (package-name lisp-package &optional context) (assert (not (member (package-name lisp-package) #+allegro '(excl common-lisp sys aclmop) #-allegro '(common-lisp) :test #'string=)) () - "I don't think you really want to dump the package ~A with Movitz." - lisp-package) + "I don't think you really want to dump the package ~A ~@[for symbol ~S~] with Movitz." + lisp-package context) (setf (gethash lisp-package lisp-to-movitz-package) (or (gethash package-name packages-hash nil) (let ((p (funcall 'muerte::make-package-object @@ -1175,7 +1180,8 @@ :external-symbols (make-hash-table :test #'equal) :internal-symbols (make-hash-table :test #'equal) :use-list (mapcar #'(lambda (up) - (ensure-package (movitz-package-name (package-name up)) up)) + (ensure-package (movitz-package-name (package-name up)) + up context)) (package-use-list lisp-package))))) (setf (gethash package-name packages-hash) p) p))))) @@ -1188,7 +1194,7 @@ as package-name = (and lisp-package (movitz-package-name (package-name lisp-package) symbol)) when package-name - do (let* ((movitz-package (ensure-package package-name lisp-package))) + do (let* ((movitz-package (ensure-package package-name lisp-package symbol))) (multiple-value-bind (symbol status) (find-symbol (symbol-name symbol) (symbol-package symbol)) (ecase status @@ -1219,7 +1225,7 @@ ;;; do (when (string= symbol :method) ;;; (warn "XXXX ~S ~S ~S" symbol lisp-package package-name)) when package-name - do (let* ((movitz-package (ensure-package package-name lisp-package))) + do (let* ((movitz-package (ensure-package package-name lisp-package symbol))) (setf (movitz-symbol-package (movitz-read symbol)) (movitz-read movitz-package)))) movitz-packages))))

1 0

[movitz-cvs] CVS update: movitz/environment.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv29741 Modified Files: environment.lisp Log Message: minor edits. Date: Thu Dec 9 15:03:30 2004 Author: ffjeld Index: movitz/environment.lisp diff -u movitz/environment.lisp:1.9 movitz/environment.lisp:1.10 --- movitz/environment.lisp:1.9 Mon Oct 11 15:46:25 2004 +++ movitz/environment.lisp Thu Dec 9 15:03:28 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Nov 3 11:40:15 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: environment.lisp,v 1.9 2004/10/11 13:46:25 ffjeld Exp $ +;;;; $Id: environment.lisp,v 1.10 2004/12/09 14:03:28 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -248,10 +248,10 @@ ;;; (warn "..with body ~W" macro-function) (let ((expansion (funcall macro-function form environment))) (cond - #+ignore ((member (if (atom form) form (car form)) - '(<= <=%2op <=%3op) :test #'string=) - (warn "Expanded ~S to ~S" form expansion) - expansion) +;; ((member (if (atom form) form (car form)) +;; '(do) :test #'string=) +;; (warn "Expanded ~S to ~S" form expansion) +;; expansion) (t ;; (warn "Expanded macro named ~A." (if (atom form) form (car form))) expansion))))) @@ -424,7 +424,7 @@ (environment nil) (recurse-p t)) (loop for env = (or environment *movitz-global-environment*) - then (and recurse-p (movitz-environment-uplink env)) + then (when recurse-p (movitz-environment-uplink env)) for plist = (and env (getf (movitz-environment-plists env) symbol)) while env do (let ((val (getf plist indicator '#0=#:not-found)))

1 0

[movitz-cvs] CVS update: movitz/compiler.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv28313 Modified Files: compiler.lisp Log Message: Added *compiler-verbose-p* Date: Thu Dec 9 14:36:47 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.117 movitz/compiler.lisp:1.118 --- movitz/compiler.lisp:1.117 Wed Nov 24 11:02:42 2004 +++ movitz/compiler.lisp Thu Dec 9 14:36:46 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.117 2004/11/24 10:02:42 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.118 2004/12/09 13:36:46 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -17,6 +17,8 @@ (defvar *warn-function-change-p* t "Emit a warning whenever a named function's code-vector changes size.") +(defvar *compiler-verbose-p* nil) + (defvar *compiler-do-optimize* t "Apply the peephole optimizer to function code.") @@ -1334,7 +1336,7 @@ :declaration-context :funobj)) (file-code (with-compilation-unit () - (add-bindings-from-lambda-list () function-env) + (add-bindings-from-lambda-list () function-env) (with-open-file (stream path :direction :input) (setf (funobj-env funobj) funobj-env) (loop for form = (with-movitz-syntax () @@ -1346,7 +1348,12 @@ (cond ((symbolp form) form) ((symbolp (car form)) (car form)))) - #+lispworks-personal-edition (hcl:mark-and-sweep 2) + (when *compiler-verbose-p* + (format *query-io* "~&Movitz Compiling ~S..~%" + (cond + ((symbolp form) form) + ((symbolp (car form)) + (xsubseq form 0 2))))) (compiler-call #'compile-form :form form :funobj funobj

1 0

[movitz-cvs] CVS update: movitz/eval.lisp
by ffjeld＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv27587 Modified Files: eval.lisp Log Message: Add rule for evaluation of keywords. Date: Thu Dec 9 14:27:29 2004 Author: ffjeld Index: movitz/eval.lisp diff -u movitz/eval.lisp:1.8 movitz/eval.lisp:1.9 --- movitz/eval.lisp:1.8 Mon Oct 11 15:46:56 2004 +++ movitz/eval.lisp Thu Dec 9 14:27:28 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.8 2004/10/11 13:46:56 ffjeld Exp $ +;;;; $Id: eval.lisp,v 1.9 2004/12/09 13:27:28 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -111,6 +111,8 @@ "3.1.2.1.1 Symbols as Forms" (declare (ignore top-level-p)) (cond + ((keywordp form) + (eval-self-evaluating form env top-level-p)) ((typep (movitz-binding form env) 'constant-object-binding) (translate-program (movitz-print (constant-object (movitz-binding form env))) :cl :muerte.cl))

1 0

[movitz-cvs] CVS update: movitz/losp/x86-pc/keyboard.lisp
by ffjeld＠common-lisp.net 08 Dec '04

08 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv19471 Modified Files: keyboard.lisp Log Message: Say #\escape rather than #\esc, since that seems to be more generally acceptable. Date: Thu Dec 9 00:40:24 2004 Author: ffjeld Index: movitz/losp/x86-pc/keyboard.lisp diff -u movitz/losp/x86-pc/keyboard.lisp:1.4 movitz/losp/x86-pc/keyboard.lisp:1.5 --- movitz/losp/x86-pc/keyboard.lisp:1.4 Wed Nov 24 17:20:14 2004 +++ movitz/losp/x86-pc/keyboard.lisp Thu Dec 9 00:40:24 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Sep 24 16:04:12 2001 ;;;; -;;;; $Id: keyboard.lisp,v 1.4 2004/11/24 16:20:14 ffjeld Exp $ +;;;; $Id: keyboard.lisp,v 1.5 2004/12/08 23:40:24 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -42,14 +42,14 @@ nil nil nil nil nil :pause nil nil)) ; #x40 (defparameter *scan-codes* - #(#\null #\esc #\1 #\2 #\3 #\4 #\5 #\6 ; #x00 + #(#\null #\escape #\1 #\2 #\3 #\4 #\5 #\6 ; #x00 #\7 #\8 #\9 #\0 #\- #\= #\backspace #\tab ; #x08 #\q #\w #\e #\r #\t #\y #\u #\i ; #x10 #\o #\p #\[ #\] #\newline :ctrl-left #\a #\s ; #x18 #\d #\f #\g #\h #\j #\k #\l #\; ; #x20 #\' #\` :shift-left #\\ #\z #\x #\c #\v ; #x28 - #\b #\n #\m #\, #\. #\/ :shift-right #\esc ; #x30 + #\b #\n #\m #\, #\. #\/ :shift-right #\escape ; #x30 :alt-left #\space :caps-lock :f1 :f2 :f3 :f4 :f5 ; #x38 :f6 :f7 :f8 :f9 :f10 :break :scroll-lock nil ; #x40 @@ -74,7 +74,7 @@ nil nil nil nil nil nil nil :home ; #xc0 :up :page-up nil :left nil :right nil :end ; #xc8 - :down :page-down :insert #\delete nil nil nil nil ; #xd0 + :down :page-down :insert nil #+ignore #\delete nil nil nil nil nil ; #xd0 :alt-right nil nil nil :win :menu nil nil)) ; #xd8 (defun lowlevel-event-p ()

1 0

[movitz-cvs] CVS update: movitz/losp/lib/net/tftp.lisp
by ffjeld＠common-lisp.net 08 Dec '04

08 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv19455 Modified Files: tftp.lisp Log Message: Say #\escape rather than #\esc, since that seems to be more generally acceptable. Date: Thu Dec 9 00:40:15 2004 Author: ffjeld Index: movitz/losp/lib/net/tftp.lisp diff -u movitz/losp/lib/net/tftp.lisp:1.3 movitz/losp/lib/net/tftp.lisp:1.4 --- movitz/losp/lib/net/tftp.lisp:1.3 Thu Nov 25 03:09:55 2004 +++ movitz/losp/lib/net/tftp.lisp Thu Dec 9 00:40:15 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Oct 6 12:42:51 2004 ;;;; -;;;; $Id: tftp.lisp,v 1.3 2004/11/25 02:09:55 ffjeld Exp $ +;;;; $Id: tftp.lisp,v 1.4 2004/12/08 23:40:15 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -56,14 +56,14 @@ (tftp/ethernet-write :129.242.16.151 file-name data :mac (polling-arp :129.242.16.1 (lambda () - (eql #\esc (muerte.x86-pc.keyboard:poll-char))))))) + (eql #\space (muerte.x86-pc.keyboard:poll-char))))))) (defun tftp/ethernet-write (ip file-name data-vector &key (mode "octet") mac quiet (timeout 2) (data-length (length data-vector)) (breaker (lambda () - (eql #\esc (muerte.x86-pc.keyboard:poll-char))))) + (eql #\space (muerte.x86-pc.keyboard:poll-char))))) "TFTP write data-vector to file-name on host ip using *ip4-nic*. The host's MAC is looked up by ARP unless provided." (let ((speak (if quiet nil *query-io*))

1 0

[movitz-cvs] CVS update: movitz/losp/lib/net/ip4.lisp
by ffjeld＠common-lisp.net 08 Dec '04

08 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/lib/net In directory common-lisp.net:/tmp/cvs-serv19437 Modified Files: ip4.lisp Log Message: Say #\escape rather than #\esc, since that seems to be more generally acceptable. Date: Thu Dec 9 00:40:03 2004 Author: ffjeld Index: movitz/losp/lib/net/ip4.lisp diff -u movitz/losp/lib/net/ip4.lisp:1.15 movitz/losp/lib/net/ip4.lisp:1.16 --- movitz/losp/lib/net/ip4.lisp:1.15 Thu Nov 25 16:06:02 2004 +++ movitz/losp/lib/net/ip4.lisp Thu Dec 9 00:40:03 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Wed Apr 30 13:52:57 2003 ;;;; -;;;; $Id: ip4.lisp,v 1.15 2004/11/25 15:06:02 ffjeld Exp $ +;;;; $Id: ip4.lisp,v 1.16 2004/12/08 23:40:03 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -493,7 +493,7 @@ (setf *ip4-router* (ip4-address :129.242.16.1))) ;; This is to announce our presence on the LAN.. (assert (polling-arp *ip4-router* (lambda () - (eql #\esc (muerte.x86-pc.keyboard:poll-char)))) + (eql #\space (muerte.x86-pc.keyboard:poll-char)))) () "Unable to resolve ~/ip4:pprint-ip4/ by ARP." *ip4-router*) (values *ip4-nic* *ip4-ip*)) @@ -508,11 +508,11 @@ *ip4-router* (polling-arp *ip4-router* (lambda () - (eql #\esc (muerte.x86-pc.keyboard:poll-char)))))) + (eql #\space (muerte.x86-pc.keyboard:poll-char)))))) (loop (case (muerte.x86-pc.keyboard:poll-char) ((nil)) - ((#\esc) (break "You broke ip4!")) + ((#\space) (break "You broke ip4!")) (t (return (values)))) (let ((packet (and (packet-available-p ethernet) (receive ethernet))))

1 0

[movitz-cvs] CVS update: movitz/losp/los0-gc.lisp
by ffjeld＠common-lisp.net 08 Dec '04

08 Dec '04

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv19409 Modified Files: los0-gc.lisp Log Message: Say #\escape rather than #\esc, since that seems to be more generally acceptable. Date: Thu Dec 9 00:39:51 2004 Author: ffjeld Index: movitz/losp/los0-gc.lisp diff -u movitz/losp/los0-gc.lisp:1.44 movitz/losp/los0-gc.lisp:1.45 --- movitz/losp/los0-gc.lisp:1.44 Fri Nov 26 15:59:18 2004 +++ movitz/losp/los0-gc.lisp Thu Dec 9 00:39:51 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Sat Feb 21 17:48:32 2004 ;;;; -;;;; $Id: los0-gc.lisp,v 1.44 2004/11/26 14:59:18 ffjeld Exp $ +;;;; $Id: los0-gc.lisp,v 1.45 2004/12/08 23:39:51 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -234,7 +234,7 @@ (break "GC break.") (loop ; This is a nice opportunity to poll the keyboard.. (case (muerte.x86-pc.keyboard:poll-char) - ((#\esc) + ((#\escape) (break "Los0 GC keyboard poll.")) ((nil) (return))))))))) @@ -310,8 +310,8 @@ (values)))) -(defparameter *x* #4000()) ; Have this in static space. -(defparameter *xx* #4000()) ; Have this in static space. +(defparameter *x* #4000(nil)) ; Have this in static space. +(defparameter *xx* #4000(nil)) ; Have this in static space. (defun stop-and-copy (&optional evacuator)

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 December 2004