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

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

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv18304 Modified Files: arrays.lisp Log Message: Properly allocate vectors specialized to (unsigned-byte 32). Date: Mon Mar 29 14:19:51 2004 Author: ffjeld Index: movitz/losp/muerte/arrays.lisp diff -u movitz/losp/muerte/arrays.lisp:1.13 movitz/losp/muerte/arrays.lisp:1.14 --- movitz/losp/muerte/arrays.lisp:1.13 Mon Mar 29 09:32:12 2004 +++ movitz/losp/muerte/arrays.lisp Mon Mar 29 14:19:51 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.13 2004/03/29 14:32:12 ffjeld Exp $ +;;;; $Id: arrays.lisp,v 1.14 2004/03/29 19:19:51 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -546,30 +546,25 @@ (replace array initial-contents))) array)) ((member element-type '(u32 (unsigned-byte 32)) :test #'equal) - (let ((a (inline-malloc (+ #.(bt:sizeof 'movitz::movitz-vector) (* 4 dimensions)) - :other-tag :vector - :wide-other-tag #.(bt:enum-value 'movitz::movitz-vector-element-type - :u32)))) - (setf (memref a #.(bt:slot-offset 'movitz::movitz-vector 'movitz::flags) + (let ((array (malloc-words dimensions))) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::flags) 0 :unsigned-byte16) 0) - (setf (memref a #.(bt:slot-offset 'movitz::movitz-vector 'movitz::num-elements) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::num-elements) 0 :unsigned-byte16) dimensions) - (setf (fill-pointer a) fill-pointer) + (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::type) + 0 :unsigned-byte16) + #.(movitz:vector-type-tag :u32)) + (setf (fill-pointer array) fill-pointer) (cond (initial-element (dotimes (i dimensions) - (setf (aref a i) initial-element))) + (setf (aref array i) initial-element))) (initial-contents - (replace a initial-contents))) - a)) - (t (let ((array (malloc-words dimensions) - #+ignore - (inline-malloc (+ #.(bt:sizeof 'movitz::movitz-vector) (* 4 dimensions)) - :other-tag :vector - :wide-other-tag #.(bt:enum-value 'movitz::movitz-vector-element-type - :any-t)))) + (replace array initial-contents))) + array)) + (t (let ((array (malloc-words dimensions))) (setf (memref array #.(bt:slot-offset 'movitz::movitz-vector 'movitz::flags) 0 :unsigned-byte16) 0)

1 0

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

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/lib In directory common-lisp.net:/tmp/cvs-serv26560 Modified Files: repl.lisp Log Message: Don't print the results of toplevel-commands. Date: Mon Mar 29 14:16:19 2004 Author: ffjeld Index: movitz/losp/lib/repl.lisp diff -u movitz/losp/lib/repl.lisp:1.7 movitz/losp/lib/repl.lisp:1.8 --- movitz/losp/lib/repl.lisp:1.7 Fri Mar 26 08:54:45 2004 +++ movitz/losp/lib/repl.lisp Mon Mar 29 14:16:19 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.7 2004/03/26 13:54:45 ffjeld Exp $ +;;;; $Id: repl.lisp,v 1.8 2004/03/29 19:16:19 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -52,34 +52,36 @@ (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) - (declare (dynamic-extent results)) - (unless (packagep *package*) - (warn "Resetting *package*") - (setf *package* previous-package)) - (unless (boundp '*) - (warn "* was unbound!") - (setf * nil)) - (apply #'format t *repl-print-format* results) - (psetq +++ ++ ++ + + form) - (psetq *** ** ** * * (car results)) - (psetq /// // // / / (if *repl-consless* - nil - (copy-list results))) - (values-list results)) - form previous-package + (flet ((process-expresion (form previous-package printp &rest results) + (declare (dynamic-extent results)) + (unless (packagep *package*) + (warn "Resetting *package*") + (setf *package* previous-package)) + (unless (boundp '*) + (warn "* was unbound!") + (setf * nil)) + (when printp + (apply #'format t *repl-print-format* results)) + (psetq +++ ++ ++ + + form) + (psetq *** ** ** * * (car results)) + (psetq /// // // / / (if *repl-consless* + nil + (copy-list results))) + (values-list results))) (if (not (keywordp form)) - (eval form) - (apply 'muerte.toplevel:invoke-toplevel-command - form - (loop for arg = (multiple-value-bind (arg x) - (simple-read-from-string buffer-string nil '#0=#:eof - :start buffer-pointer) - (setq buffer-pointer x) - arg) - until (eq arg '#0#) - collect arg))))))) + (multiple-value-call #'process-expresion + form previous-package t (eval form)) + (multiple-value-call #'process-expresion + form previous-package nil + (apply 'muerte.toplevel:invoke-toplevel-command + form + (loop for arg = (multiple-value-bind (arg x) + (simple-read-from-string buffer-string nil '#0=#:eof + :start buffer-pointer) + (setq buffer-pointer x) + arg) + until (eq arg '#0#) + collect arg)))))))) (muerte.readline::readline-break (c) (declare (ignore c)) (values))))

1 0

[movitz-cvs] CVS update: movitz/doc/ChangeLog
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/doc In directory common-lisp.net:/tmp/cvs-serv11714 Modified Files: ChangeLog Log Message: *** empty log message *** Date: Mon Mar 29 10:26:39 2004 Author: ffjeld Index: movitz/doc/ChangeLog diff -u movitz/doc/ChangeLog:1.2 movitz/doc/ChangeLog:1.3 --- movitz/doc/ChangeLog:1.2 Mon Jan 19 06:23:43 2004 +++ movitz/doc/ChangeLog Mon Mar 29 10:26:39 2004 @@ -1,3 +1,9 @@ +2004-03-29 Frode Vatvedt Fjeld <frodef(a)cs.uit.no> + + * Added basic GC functionality. The Movitz platform is now I + believe viable for at least some real-world applications! Also, + there have been many bug-fixes that I've forgotten to record here. + 2004-01-19 Frode Vatvedt Fjeld <frodef(a)cs.uit.no> * Fixed the bootloader slightly so it should now work with VMWare.

1 0

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

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv11138 Modified Files: inspect.lisp Log Message: Teach shallow-copy about structure-objects. Date: Mon Mar 29 10:26:26 2004 Author: ffjeld Index: movitz/losp/muerte/inspect.lisp diff -u movitz/losp/muerte/inspect.lisp:1.5 movitz/losp/muerte/inspect.lisp:1.6 --- movitz/losp/muerte/inspect.lisp:1.5 Mon Mar 29 09:33:29 2004 +++ movitz/losp/muerte/inspect.lisp Mon Mar 29 10:26:25 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Fri Oct 24 09:50:41 2003 ;;;; -;;;; $Id: inspect.lisp,v 1.5 2004/03/29 14:33:29 ffjeld Exp $ +;;;; $Id: inspect.lisp,v 1.6 2004/03/29 15:26:25 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -185,7 +185,8 @@ :fill-pointer (fill-pointer old))) (function (copy-funobj old)) - )) + (structure-object + (copy-structure old)))) (defun malloc-words (words) (malloc-clumps (1+ (truncate (1+ words) 2))))

1 0

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

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv20814 Modified Files: equalp.lisp Log Message: Make equalp behave for structure-objects. Date: Mon Mar 29 09:56:26 2004 Author: ffjeld Index: movitz/losp/muerte/equalp.lisp diff -u movitz/losp/muerte/equalp.lisp:1.2 movitz/losp/muerte/equalp.lisp:1.3 --- movitz/losp/muerte/equalp.lisp:1.2 Mon Jan 19 06:23:46 2004 +++ movitz/losp/muerte/equalp.lisp Mon Mar 29 09:56:26 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Mar 13 17:09:08 2001 ;;;; -;;;; $Id: equalp.lisp,v 1.2 2004/01/19 11:23:46 ffjeld Exp $ +;;;; $Id: equalp.lisp,v 1.3 2004/03/29 14:56:26 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -57,4 +57,10 @@ ((= i length) t) (unless (equalp (aref x i) (aref y i)) (return nil))))))) + (structure-object + (and (eq (class-of x) (class-of y)) + (dotimes (i (structure-object-length x) t) + (unless (equalp (structure-ref x i) + (structure-ref y i)) + (return nil))))) (t (equal x y))))

1 0

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

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv16704 Modified Files: defstruct.lisp Log Message: Added standard function copy-structure. Date: Mon Mar 29 09:53:14 2004 Author: ffjeld Index: movitz/losp/muerte/defstruct.lisp diff -u movitz/losp/muerte/defstruct.lisp:1.4 movitz/losp/muerte/defstruct.lisp:1.5 --- movitz/losp/muerte/defstruct.lisp:1.4 Fri Mar 26 08:57:12 2004 +++ movitz/losp/muerte/defstruct.lisp Mon Mar 29 09:53:13 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Mon Jan 22 13:10:59 2001 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: defstruct.lisp,v 1.4 2004/03/26 13:57:12 ffjeld Exp $ +;;;; $Id: defstruct.lisp,v 1.5 2004/03/29 14:53:13 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -19,9 +19,22 @@ (in-package muerte) -(defun structure-object-length (obj) - (check-type obj structure-object) - (movitz-accessor-u16 obj movitz-struct length)) +(defun structure-object-length (object) + (check-type object structure-object) + (movitz-accessor-u16 object movitz-struct length)) + +(defun copy-structure (object) + (check-type object structure-object) + (let* ((length (structure-object-length object)) + (copy (malloc-words length))) + (setf (memref copy -6 0 :lisp) + (memref object -6 0 :lisp)) + (setf (memref copy -6 1 :unsigned-byte32) + (memref object -6 1 :unsigned-byte32)) + (dotimes (i length) + (setf (structure-ref copy i) + (structure-ref object i))) + copy)) (defun struct-predicate-prototype (obj) "Prototype function for predicates of user-defined struct.

1 0

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

29 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv22850 Modified Files: packages.lisp Log Message: Some new symbols in the muerte package. Date: Mon Mar 29 09:36:43 2004 Author: ffjeld Index: movitz/packages.lisp diff -u movitz/packages.lisp:1.10 movitz/packages.lisp:1.11 --- movitz/packages.lisp:1.10 Wed Mar 24 13:39:47 2004 +++ movitz/packages.lisp Mon Mar 29 09:36:43 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.10 2004/03/24 18:39:47 ffjeld Exp $ +;;;; $Id: packages.lisp,v 1.11 2004/03/29 14:36:43 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1120,12 +1120,23 @@ #:package-object-internal-symbols #:package-object-external-symbols + #:map-heap-words + #:map-stack-words + #:malloc-clumps + #:malloc-cons-pointer + #:malloc-buffer-start + + #:%word-offset + #:%run-time-context-slot + #:shallow-copy + vector-element-type vector-element-size with-subvector-accessor svref%unsafe bvref-u16 object-location + location-in-object-p inline-malloc define-compile-time-variable define-primitive-function

1 0

[movitz-cvs] CVS update: movitz/losp/los0.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv21601 Modified Files: los0.lisp Log Message: Include los-gc, and install it when booting up. Date: Mon Mar 29 09:36:15 2004 Author: ffjeld Index: movitz/losp/los0.lisp diff -u movitz/losp/los0.lisp:1.7 movitz/losp/los0.lisp:1.8 --- movitz/losp/los0.lisp:1.7 Thu Mar 25 20:53:53 2004 +++ movitz/losp/los0.lisp Mon Mar 29 09:36:15 2004 @@ -9,7 +9,7 @@ ;;;; Created at: Fri Dec 1 18:08:32 2000 ;;;; Distribution: See the accompanying file COPYING. ;;;; -;;;; $Id: los0.lisp,v 1.7 2004/03/26 01:53:53 ffjeld Exp $ +;;;; $Id: los0.lisp,v 1.8 2004/03/29 14:36:15 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -39,7 +39,9 @@ muerte.mop muerte.debug #+ignore muerte.x86-pc.serial)) - + +(require :los0-gc) + (in-package muerte.init) (declaim (special muerte::*multiboot-data*)) @@ -838,12 +840,16 @@ (incf extended-memsize (io-port #x71 :unsigned-byte8)) (format t "Extended memory: ~D KB" extended-memsize)) +;;; (loop for i from #x40600 below #x80000 +;;; do (setf (memref i 0 0 :unsigned-byte32) #xababe13)) + + (install-los0-consing) + (let ((*repl-readline-context* (make-readline-context :history-size 16)) (*backtrace-stack-frame-barrier* (stack-frame-uplink (current-stack-frame))) #+ignore (*error-no-condition-for-debugger* t) (*debugger-function* #'los0-debugger) (*package* nil)) - (with-simple-restart (continue "Abort LOS0 boot-up initialization.") (setf *cpu-features* (find-cpu-features)) @@ -944,5 +950,5 @@ (#\esc (break "Under the bridge.")) (#\e (error "this is an error!")))))))) - + (genesis)

1 0

[movitz-cvs] CVS update: movitz/losp/los0-gc.lisp
by Frode Vatvedt Fjeld 29 Mar '04

29 Mar '04

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv16736 Added Files: los0-gc.lisp Log Message: Implementation of a simple GC architecture, used by los0. Date: Mon Mar 29 09:35:45 2004 Author: ffjeld

1 0

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

29 Mar '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv14048 Modified Files: storage-types.lisp Log Message: The wide-tag :infant-object should _not_ have the same low-tag as cons or null. Date: Mon Mar 29 09:35:17 2004 Author: ffjeld Index: movitz/storage-types.lisp diff -u movitz/storage-types.lisp:1.14 movitz/storage-types.lisp:1.15 --- movitz/storage-types.lisp:1.14 Fri Mar 26 08:53:06 2004 +++ movitz/storage-types.lisp Mon Mar 29 09:35:17 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.14 2004/03/26 13:53:06 ffjeld Exp $ +;;;; $Id: storage-types.lisp,v 1.15 2004/03/29 14:35:17 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -72,8 +72,8 @@ :funobj #x3a :std-instance #x40 :run-time-context #x50 - :infant-object #x65 :illegal #x13 + :infant-object #x23 ;; :simple-vector #x20 ;; :character-vector

1 0