December 2004 - movitz-cvs@common-lisp.net

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

10 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv1677 Modified Files: scavenge.lisp Log Message: Forget about old-vectors. Date: Fri Dec 10 13:47:39 2004 Author: ffjeld Index: movitz/losp/muerte/scavenge.lisp diff -u movitz/losp/muerte/scavenge.lisp:1.36 movitz/losp/muerte/scavenge.lisp:1.37 --- movitz/losp/muerte/scavenge.lisp:1.36 Fri Nov 26 15:59:31 2004 +++ movitz/losp/muerte/scavenge.lisp Fri Dec 10 13:47:37 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Mon Mar 29 14:54:08 2004 ;;;; -;;;; $Id: scavenge.lisp,v 1.36 2004/11/26 14:59:31 ffjeld Exp $ +;;;; $Id: scavenge.lisp,v 1.37 2004/12/10 12:47:37 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -139,8 +139,6 @@ #.(bt:enum-value 'movitz:movitz-vector-element-type :any-t)) (setf *scan-last* (%word-offset scan #.(movitz:tag :other))) (error "Scanned unknown basic-vector-header ~S at location #x~X." x scan))) - ((scavenge-typep x :old-vector) - (error "Scanned old-vector ~Z at address #x~X." x scan)) ((eq x 3) (setf *scan-last* scan) (incf scan)

1 0

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

10 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv1661 Modified Files: named-integers.lisp Log Message: *** empty log message *** Date: Fri Dec 10 13:47:23 2004 Author: ffjeld Index: movitz/losp/lib/named-integers.lisp diff -u movitz/losp/lib/named-integers.lisp:1.5 movitz/losp/lib/named-integers.lisp:1.6 --- movitz/losp/lib/named-integers.lisp:1.5 Thu Dec 9 15:12:41 2004 +++ movitz/losp/lib/named-integers.lisp Fri Dec 10 13:47:22 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.5 2004/12/09 14:12:41 ffjeld Exp $ +;;;; $Id: named-integers.lisp,v 1.6 2004/12/10 12:47:22 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -85,7 +85,7 @@ ',integer-list ',name-list)))) (eval-when (:compile-toplevel) - ,@constant-declarations +;;; ,@constant-declarations (export ',constant-exports)) ,@constant-declarations ',type-name))))

1 0

[movitz-cvs] CVS update: movitz/storage-types.lisp
by ffjeld＠common-lisp.net 10 Dec '04

10 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv1643 Modified Files: storage-types.lisp Log Message: Starting to add movitz-code-vector. Date: Fri Dec 10 13:46:54 2004 Author: ffjeld Index: movitz/storage-types.lisp diff -u movitz/storage-types.lisp:1.44 movitz/storage-types.lisp:1.45 --- movitz/storage-types.lisp:1.44 Wed Nov 10 16:35:32 2004 +++ movitz/storage-types.lisp Fri Dec 10 13:46:52 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Sun Oct 22 00:22:43 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: storage-types.lisp,v 1.44 2004/11/10 15:35:32 ffjeld Exp $ +;;;; $Id: storage-types.lisp,v 1.45 2004/12/10 12:46:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -69,7 +69,7 @@ :other 6 :symbol 7 - :old-vector #x1a + :code-vector #x1a :basic-vector #x22 :defstruct #x2a :funobj #x3a @@ -80,7 +80,6 @@ :run-time-context #x50 :illegal #x13 :infant-object #x23 - :basic-restart #x32 ) @@ -330,6 +329,27 @@ (setf (movitz-last-cdr (movitz-cdr movitz-list)) value))) ;;; movitz-vectors + +(define-binary-class movitz-code-vector (movitz-heap-object-other) + ((type + :binary-type other-type-byte + :reader movitz-vector-type + :initform :code-vector) + (blurg) + (num-elements + :binary-type word + :initarg :num-elements + :reader movitz-vector-num-elements + :map-binary-write 'movitz-read-and-intern + :map-binary-read-delayed 'movitz-word-and-print) + (data + :binary-lisp-type :label) ; data follows physically here + (symbolic-data + :initarg :symbolic-data + :initform nil + :accessor movitz-vector-symbolic-data)) + (:slot-align type #.+other-type-offset+)) + (define-binary-class movitz-basic-vector (movitz-heap-object-other) ((type

1 0

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

10 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv1616 Modified Files: compiler.lisp Log Message: Just some testing stuff. Date: Fri Dec 10 13:46:31 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.118 movitz/compiler.lisp:1.119 --- movitz/compiler.lisp:1.118 Thu Dec 9 14:36:46 2004 +++ movitz/compiler.lisp Fri Dec 10 13:46:30 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.118 2004/12/09 13:36:46 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.119 2004/12/10 12:46:30 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -965,6 +965,17 @@ (setf (ldb (byte 5 0) (slot-value funobj 'debug-info)) x)) (t (warn "Can't encode start-stack-frame-setup label ~D into debug-info for ~S." x (movitz-funobj-name funobj))))) + (let* ((a (or (cdr (assoc 'entry%1op code-symtab)) 0)) + (b (or (cdr (assoc 'entry%2op code-symtab)) a)) + (c (or (cdr (assoc 'entry%3op code-symtab)) b))) + (unless (<= a b c) + (warn "Weird code-entries: ~D, ~D, ~D." a b c)) + (unless (<= 0 a 255) + (break "entry%1: ~D" a)) + (unless (<= 0 b 2047) + (break "entry%2: ~D" b)) + (unless (<= 0 c 4095) + (break "entry%3: ~D" c))) (loop for ((entry-label slot-name)) on '((entry%1op code-vector%1op) (entry%2op code-vector%2op) (entry%3op code-vector%3op))

1 0

[movitz-cvs] CVS update: movitz/special-operators-cl.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-serv23840 Modified Files: special-operators-cl.lisp Log Message: *** empty log message *** Date: Thu Dec 9 23:45:37 2004 Author: ffjeld Index: movitz/special-operators-cl.lisp diff -u movitz/special-operators-cl.lisp:1.38 movitz/special-operators-cl.lisp:1.39 --- movitz/special-operators-cl.lisp:1.38 Tue Nov 23 17:12:25 2004 +++ movitz/special-operators-cl.lisp Thu Dec 9 23:45:36 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.38 2004/11/23 16:12:25 ffjeld Exp $ +;;;; $Id: special-operators-cl.lisp,v 1.39 2004/12/09 22:45:36 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -313,7 +313,7 @@ `((:locally (:call (:edi ,(bt:slot-offset 'movitz-run-time-context 'dynamic-variable-install)))) (:locally (:movl :esp (:edi (:edi-offset dynamic-env)))))) - (if (not recompile-body-p) + (if (or nil (not recompile-body-p)) body-code (progn #+ignore (warn "recompile..") ; XXX (compile-body))) @@ -659,7 +659,6 @@ (lexical-catch-tag-variable (gensym "tagbody-lexical-catch-tag-")) (label-set-name (gensym "label-set-")) (tagbody-env (make-instance 'tagbody-env - :label-set-name label-set-name :uplink env :funobj funobj :save-esp-variable save-esp-variable

1 0

[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