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

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv10915 Modified Files: storage-types.lisp Log Message: More small changes for GC scanning. Date: Wed Mar 24 08:22:31 2004 Author: ffjeld Index: movitz/storage-types.lisp diff -u movitz/storage-types.lisp:1.12 movitz/storage-types.lisp:1.13 --- movitz/storage-types.lisp:1.12 Mon Mar 22 11:45:39 2004 +++ movitz/storage-types.lisp Wed Mar 24 08:22:27 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.12 2004/03/22 16:45:39 ffjeld Exp $ +;;;; $Id: storage-types.lisp,v 1.13 2004/03/24 13:22:27 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -67,9 +67,9 @@ :other 6 :symbol 7 - :vector #x10 + :vector #x1a :defstruct #x20 - :funobj #x30 + :funobj #x3a :std-instance #x40 :run-time-context #x50 :infant-object #x65 @@ -81,6 +81,8 @@ ) (defconstant +fixnum-tags+ '(:even-fixnum :odd-fixnum)) +(defparameter +scan-skip-word+ #x00000003) + (defun tag (type) (bt:enum-value 'other-type-byte type))

1 0

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

24 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv961 Modified Files: multiboot.lisp Log Message: Re-arranged storage for multi-boot header so that it doesn't mess up (GC) scanning. Date: Wed Mar 24 08:20:50 2004 Author: ffjeld Index: movitz/multiboot.lisp diff -u movitz/multiboot.lisp:1.2 movitz/multiboot.lisp:1.3 --- movitz/multiboot.lisp:1.2 Mon Jan 19 06:23:41 2004 +++ movitz/multiboot.lisp Wed Mar 24 08:20:49 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.2 2004/01/19 11:23:41 ffjeld Exp $ +;;;; $Id: multiboot.lisp,v 1.3 2004/03/24 13:20:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -36,7 +36,16 @@ (defconstant +multiboot-header-magic-value+ #x1BADB002) (define-binary-class multiboot-header (movitz-heap-object) - ((magic + ((scan-skip-header + :binary-type word + :initform +scan-skip-word+) + (scan-skip-length + :binary-type word + :initform 0 + :map-binary-write (lambda (x type) + (declare (ignore x y)) + (- (sizeof 'multiboot-header) 8))) + (magic :accessor magic :initform +multiboot-header-magic-value+ :initarg :magic

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-serv31648 Modified Files: image.lisp Log Message: Re-arranged storage for multi-boot header so that it doesn't mess up (GC) scanning. Date: Wed Mar 24 08:20:25 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.17 movitz/image.lisp:1.18 --- movitz/image.lisp:1.17 Mon Mar 22 11:42:53 2004 +++ movitz/image.lisp Wed Mar 24 08:20:24 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.17 2004/03/22 16:42:53 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.18 2004/03/24 13:20:24 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -870,8 +870,12 @@ (format t "~&;; No multiboot header.") ;; Update multiboot header, symbolic and in the file.. (let* ((mb (image-multiboot-header *image*)) - (mb-address (+ (movitz-intern mb) (image-ds-segment-base *image*))) - (mb-file-position (- (+ mb-address 512) load-address))) + (mb-address (+ (movitz-intern mb) + (slot-offset 'multiboot-header 'magic) + (image-ds-segment-base *image*))) + (mb-file-position (- (+ mb-address 512) + load-address + (slot-offset 'multiboot-header 'magic)))) (when (< load-address #x100000) (warn "Multiboot load-address #x~x is below the 1MB mark." load-address))

1 0

[movitz-cvs] CVS update: movitz/losp/muerte/typep.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-serv17823 Modified Files: typep.lisp Log Message: Added a type pointer, which is approximately (not (or character fixnum null)). Date: Wed Mar 24 06:24:53 2004 Author: ffjeld Index: movitz/losp/muerte/typep.lisp diff -u movitz/losp/muerte/typep.lisp:1.3 movitz/losp/muerte/typep.lisp:1.4 --- movitz/losp/muerte/typep.lisp:1.3 Thu Feb 26 08:43:00 2004 +++ movitz/losp/muerte/typep.lisp Wed Mar 24 06:24:52 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 8 11:07:53 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: typep.lisp,v 1.3 2004/02/26 13:43:00 ffjeld Exp $ +;;;; $Id: typep.lisp,v 1.4 2004/03/24 11:24:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -187,6 +187,15 @@ (tag4 (make-tag-typep :tag4)) (tag5 (make-tag-typep :null)) (tag6 (make-tag-typep :other)) + (pointer + `(with-inline-assembly-case () + (do-case (t :boolean-zf=0 :labels (done)) + (:compile-form (:result-mode :eax) ,object) + (:testb ,movitz::+movitz-fixnum-zmask+ :al) + (:jz 'done) + (:leal (:eax 6) :ecx) ; => cons:7, other:4, symbol:5, fixnum:6 + (:testb #b100 :cl) + done))) (std-instance (make-other-typep :std-instance) #+ignore (make-tag-typep :std-instance)) @@ -205,7 +214,7 @@ (character `(with-inline-assembly (:returns :boolean-zf=1) (:compile-form (:result-mode :eax) ,object) - (:cmpb ,(movitz::tag :character) :al))) + (:cmpb ,(movitz:tag :character) :al))) ((function compiled-function) (make-other-typep :funobj)) ((vector array) @@ -327,10 +336,14 @@ (define-simple-typep (cons consp) (obj) (typep obj 'cons)) +(define-simple-typep (pointer pointerp) (obj) + (typep obj 'pointer)) + (define-typep cons (x &optional (car '*) (cdr '*)) (and (typep x 'cons) (or (eq '* car) (typep (car x) car)) (or (eq '* cdr) (typep (cdr x) cdr)))) + (define-simple-typep (atom atom) (x) (typep x 'atom))

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-serv14091 Modified Files: packages.lisp Log Message: Added a type pointer, which is approximately (not (or character fixnum null)). Date: Wed Mar 24 06:24:39 2004 Author: ffjeld Index: movitz/packages.lisp diff -u movitz/packages.lisp:1.8 movitz/packages.lisp:1.9 --- movitz/packages.lisp:1.8 Tue Mar 23 06:18:30 2004 +++ movitz/packages.lisp Wed Mar 24 06:24:35 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.8 2004/03/23 11:18:30 ffjeld Exp $ +;;;; $Id: packages.lisp,v 1.9 2004/03/24 11:24:35 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1155,6 +1155,7 @@ vector-u8 vector-u16 vector-u32 + pointer make-funobj funobj-type

1 0

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

23 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv12464 Modified Files: packages.lisp Log Message: Added funobj-num-jumpers. Date: Tue Mar 23 06:18:30 2004 Author: ffjeld Index: movitz/packages.lisp diff -u movitz/packages.lisp:1.7 movitz/packages.lisp:1.8 --- movitz/packages.lisp:1.7 Wed Mar 17 11:36:36 2004 +++ movitz/packages.lisp Tue Mar 23 06:18:30 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.7 2004/03/17 16:36:36 ffjeld Exp $ +;;;; $Id: packages.lisp,v 1.8 2004/03/23 11:18:30 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1165,6 +1165,7 @@ funobj-lambda-list funobj-name funobj-num-constants + funobj-num-jumpers funobj-constant-ref funobj-debug-info install-function

1 0

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

23 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv30688 Modified Files: basic-functions.lisp Log Message: Added operator %word-offset that constructs a new word by adding some offset. Use with extreme care, obviously. Date: Tue Mar 23 05:53:25 2004 Author: ffjeld Index: movitz/losp/muerte/basic-functions.lisp diff -u movitz/losp/muerte/basic-functions.lisp:1.4 movitz/losp/muerte/basic-functions.lisp:1.5 --- movitz/losp/muerte/basic-functions.lisp:1.4 Mon Mar 22 11:37:51 2004 +++ movitz/losp/muerte/basic-functions.lisp Tue Mar 23 05:53:25 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.4 2004/03/22 16:37:51 ffjeld Exp $ +;;;; $Id: basic-functions.lisp,v 1.5 2004/03/23 10:53:25 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -343,16 +343,15 @@ (defun halt-cpu () (halt-cpu)) -(defun malloc-words (words) - (malloc-clumps (1+ (truncate (1+ words) 2)))) +(define-compiler-macro %word-offset (&environment env word offset) + (if (movitz:movitz-constantp offset env) + `(with-inline-assembly (:returns :eax) + (:compile-form (:result-mode :eax) ,word) + (:addl ,(movitz:movitz-eval offset env) :eax)) + `(with-inline-assembly (:returns :eax) + (:compile-two-forms (:eax :ecx) ,word ,offset) + (:sarl ,movitz::+movitz-fixnum-shift+ :ecx) + (:addl :ecx :eax)))) -(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)) +(defun %word-offset (word offset) + (%word-offset word offset)) \ No newline at end of file

1 0

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

22 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv2225 Modified Files: io-space.lisp Log Message: Make print-object method for io-space-devices more safe. Date: Mon Mar 22 12:08:14 2004 Author: ffjeld Index: movitz/losp/x86-pc/io-space.lisp diff -u movitz/losp/x86-pc/io-space.lisp:1.2 movitz/losp/x86-pc/io-space.lisp:1.3 --- movitz/losp/x86-pc/io-space.lisp:1.2 Mon Jan 19 06:23:52 2004 +++ movitz/losp/x86-pc/io-space.lisp Mon Mar 22 12:08:14 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue May 6 10:50:36 2003 ;;;; -;;;; $Id: io-space.lisp,v 1.2 2004/01/19 11:23:52 ffjeld Exp $ +;;;; $Id: io-space.lisp,v 1.3 2004/03/22 17:08:14 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -79,8 +79,10 @@ (defmethod print-object ((device io-space-device) stream) (print-unreadable-object (device stream :type t) (format stream "~@[ ~A~]~@[ @ I/O #x~X~]" - (device-name device) - (io-range-start (first (io-space device))))) + (when (slot-boundp device 'device-name) + (device-name device)) + (when (slot-boundp device 'allocated-io-space) + (io-range-start (first (io-space device)))))) device) (defvar *io-space-register* nil) ; a list of io-space devices.

1 0

[movitz-cvs] CVS update: movitz/storage-types.lisp
by Frode Vatvedt Fjeld 22 Mar '04

22 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv9151 Modified Files: storage-types.lisp Log Message: Added a type-tag of a kind that probably won't ever be used for anything, but who knows. I'll document this when GC works. Date: Mon Mar 22 11:45:40 2004 Author: ffjeld Index: movitz/storage-types.lisp diff -u movitz/storage-types.lisp:1.11 movitz/storage-types.lisp:1.12 --- movitz/storage-types.lisp:1.11 Fri Mar 19 05:49:39 2004 +++ movitz/storage-types.lisp Mon Mar 22 11:45:39 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.11 2004/03/19 10:49:39 ffjeld Exp $ +;;;; $Id: storage-types.lisp,v 1.12 2004/03/22 16:45:39 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -72,6 +72,7 @@ :funobj #x30 :std-instance #x40 :run-time-context #x50 + :infant-object #x65 ;; :simple-vector #x20 ;; :character-vector

1 0

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

22 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv2624 Modified Files: image.lisp Log Message: Added a slot nursery-space to constant-block. Date: Mon Mar 22 11:42:54 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.16 movitz/image.lisp:1.17 --- movitz/image.lisp:1.16 Fri Feb 13 17:03:16 2004 +++ movitz/image.lisp Mon Mar 22 11:42:53 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.16 2004/02/13 22:03:16 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.17 2004/03/22 16:42:53 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -355,6 +355,13 @@ (physical-address-offset :binary-type lu32 :initform (image-ds-segment-base *image*)) + (nursery-space + :binary-type word + :initform nil + :map-binary-write 'movitz-read-and-intern + :map-binary-read-delayed (lambda (x type) + (declare (ignore x type)) + (movitz-read nil))) (stack-vector :binary-type word :initform nil @@ -694,12 +701,11 @@ (defun create-image (&key (init-file *default-image-init-file*) (start-address #x100000)) - (#+allegro excl:tenuring #-allegro progn - (psetq *image* (let ((*image* (make-movitz-image start-address))) - (when init-file - (movitz-compile-file init-file)) - *image*) - *i* (when (boundp '*image*) *image*))) + (psetq *image* (let ((*image* (make-movitz-image start-address))) + (when init-file + (movitz-compile-file init-file)) + *image*) + *i* (when (boundp '*image*) *image*)) *image*) (defun dump-image (&key (path *default-image-file*) ((:image *image*) *image*)

1 0