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

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

21 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv30735 Modified Files: memref.lisp Log Message: Fixed (memref :signed-byte30+2) Date: Tue Dec 21 15:28:02 2004 Author: ffjeld Index: movitz/losp/muerte/memref.lisp diff -u movitz/losp/muerte/memref.lisp:1.39 movitz/losp/muerte/memref.lisp:1.40 --- movitz/losp/muerte/memref.lisp:1.39 Tue Nov 23 17:07:37 2004 +++ movitz/losp/muerte/memref.lisp Tue Dec 21 15:28:02 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Mar 6 21:25:49 2001 ;;;; -;;;; $Id: memref.lisp,v 1.39 2004/11/23 16:07:37 ffjeld Exp $ +;;;; $Id: memref.lisp,v 1.40 2004/12/21 14:28:02 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -205,6 +205,33 @@ ;; Two values: the 30 upper bits as signed integer, ;; and secondly the lower 2 bits as unsigned. (assert (= 2 movitz::+movitz-fixnum-shift+)) + (let ((fix-ecx `((:leal ((:ecx 4)) :ebx) + (:andl -4 :ecx) + (:andl #b1100 :ebx) + (:movl :ecx :eax) + (:movl 2 :ecx) + (:stc)))) + (cond + ((and (eq 0 offset) (eq 0 index)) + `(with-inline-assembly (:returns :multiple-values) + (:compile-form (:result-mode :eax) ,object) + (:movl (:eax ,(offset-by 4)) :ecx) + ,@fix-ecx)) + ((eq 0 offset) + `(with-inline-assembly (:returns :multiple-values) + (:compile-two-forms (:eax :ecx) ,object ,index) + (:movl (:eax :ecx ,(offset-by 4)) :ecx) + ,@fix-ecx)) + (t (let ((object-var (gensym "memref-object-"))) + `(let ((,object-var ,object)) + (with-inline-assembly (:returns :ecx :type (unsigned-byte 29)) + (:compile-two-forms (:ecx :ebx) ,offset ,index) + (:sarl ,movitz::+movitz-fixnum-shift+ :ecx) + (:load-lexical (:lexical-binding ,object-var) :eax) + (:addl :ebx :ecx) + (:movl (:eax :ecx ,(offset-by 4)) :ecx) + ,@fix-ecx)))))) + #+ignore `(with-inline-assembly (:returns :multiple-values) (:compile-form (:result-mode :push) ,object) (:compile-two-forms (:ecx :ebx) ,offset ,index) @@ -242,18 +269,18 @@ (assert (= 4 movitz::+movitz-fixnum-factor+)) (cond ((and (eq 0 offset) (eq 0 index)) - `(with-inline-assembly (:returns :ecx :type (unsigned-byte 29)) + `(with-inline-assembly (:returns :ecx :type (signed-byte 30)) (:compile-form (:result-mode :eax) ,object) (:movl (:eax ,(offset-by 4)) :ecx) (:andl -4 :ecx))) ((eq 0 offset) - `(with-inline-assembly (:returns :ecx :type (unsigned-byte 29)) + `(with-inline-assembly (:returns :ecx :type (signed-byte 30)) (:compile-two-forms (:eax :ecx) ,object ,index) (:movl (:eax :ecx ,(offset-by 4)) :ecx) (:andl -4 :ecx))) (t (let ((object-var (gensym "memref-object-"))) `(let ((,object-var ,object)) - (with-inline-assembly (:returns :ecx :type (unsigned-byte 29)) + (with-inline-assembly (:returns :ecx :type (signed-byte 30)) (:compile-two-forms (:ecx :ebx) ,offset ,index) (:sarl ,movitz::+movitz-fixnum-shift+ :ecx) (:load-lexical (:lexical-binding ,object-var) :eax)

1 0

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

21 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv30652 Modified Files: inspect.lisp Log Message: Added %find-code-vector. Date: Tue Dec 21 15:27:09 2004 Author: ffjeld Index: movitz/losp/muerte/inspect.lisp diff -u movitz/losp/muerte/inspect.lisp:1.44 movitz/losp/muerte/inspect.lisp:1.45 --- movitz/losp/muerte/inspect.lisp:1.44 Tue Nov 23 17:03:35 2004 +++ movitz/losp/muerte/inspect.lisp Tue Dec 21 15:27:09 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.44 2004/11/23 16:03:35 ffjeld Exp $ +;;;; $Id: inspect.lisp,v 1.45 2004/12/21 14:27:09 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -163,6 +163,37 @@ (when (member :catch types) (format t "~&catch: ~Z: ~S" tag tag)))))) +(define-compiler-macro %location-object (&environment env location tag) + (assert (movitz:movitz-constantp tag env)) + `(with-inline-assembly (:returns :eax) + (:compile-form (:result-mode :eax) ,location) + (:addl ,tag :eax))) + +(defun %find-code-vector (location &optional (stop-location (if (< location #x2000) + 0 + (- location #x2000)))) + "Find the code-vector that holds a location by searching for a code-vector object header." + (do ((l (logand location -2) (- l 2))) + ((< l stop-location) + (error "Unable to find code-vector for location ~S." location)) + (multiple-value-bind (upper30 lower2) + (memref l 0 :type :signed-byte30+2) + (when (and (= 2 lower2) + (= #.(movitz:basic-vector-type-tag :code)) + ;; If the vector has a fill-pointer, it should be equal to the length. + (multiple-value-bind (len len-tag) + (memref l 4 :type :signed-byte30+2) + (and (= 0 len-tag) + (typecase len + ((integer 0 #x3fff) + (= len (memref l 2 :type :unsigned-byte14))) + (positive-fixnum t) + (t nil))))) + (let ((code-vector (%location-object l 6))) + (check-type code-vector code-vector) + (assert (location-in-object-p code-vector location)) + (return code-vector)))))) + (defun %shallow-copy-object (object word-count) "Copy any object with size word-count." (check-type word-count (integer 2 *)) @@ -373,9 +404,10 @@ (do ((frame start-frame)) ((eq 0 frame)) (let ((uplink (stack-frame-uplink nil frame))) - (setf (stack-frame-ref copy 0 (- frame start-frame) :lisp) - (if (eql 0 uplink) - 0 - (- uplink start-frame))) + (unless (= 0 uplink) + (setf (stack-frame-ref copy 0 (- frame start-frame) :lisp) + (- uplink start-frame)) + + ) (setf frame uplink))) copy))

1 0

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

21 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv30619 Modified Files: compiler.lisp Log Message: Add a check for whether (middle-of) code-vectors can look like code-vector headers. Date: Tue Dec 21 15:23:50 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.122 movitz/compiler.lisp:1.123 --- movitz/compiler.lisp:1.122 Wed Dec 15 14:58:04 2004 +++ movitz/compiler.lisp Tue Dec 21 15:23:49 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.122 2004/12/15 13:58:04 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.123 2004/12/21 14:23:49 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -987,6 +987,7 @@ ((some (lambda (label) (assoc label code-symtab)) (mapcar #'car rest)) (vector-push 0 code-vector)))) + (check-locate-concistency code-vector) (setf (movitz-funobj-code-vector funobj) (make-movitz-vector (length code-vector) :fill-pointer code-length @@ -998,6 +999,13 @@ (slot-value funobj 'code-vector%2op) (slot-value funobj 'code-vector%3op))))) funobj) + +(defun check-locate-concistency (code-vector) + (loop for x from 0 below (length code-vector) by 8 + do (when (and (= (tag :basic-vector) (aref code-vector x)) + (= (enum-value 'movitz-vector-element-type :code) (aref code-vector (1+ x)))) + (break "Code-vector can break %find-code-vector at offset ~D." x))) + (values)) #+ignore (defun make-compiled-function-body-default (form funobj env top-level-p)

1 0

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

20 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv20219 Modified Files: los-closette.lisp Log Message: Fixed typo in "bootstrap". Date: Mon Dec 20 14:42:51 2004 Author: ffjeld Index: movitz/losp/muerte/los-closette.lisp diff -u movitz/losp/muerte/los-closette.lisp:1.23 movitz/losp/muerte/los-closette.lisp:1.24 --- movitz/losp/muerte/los-closette.lisp:1.23 Tue Nov 23 17:06:37 2004 +++ movitz/losp/muerte/los-closette.lisp Mon Dec 20 14:42:51 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Jul 23 14:29:10 2002 ;;;; -;;;; $Id: los-closette.lisp,v 1.23 2004/11/23 16:06:37 ffjeld Exp $ +;;;; $Id: los-closette.lisp,v 1.24 2004/12/20 13:42:51 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -786,8 +786,8 @@ (let ((x (std-gf-classes-to-emf-table gf))) (cond ((not x) - (unless (get 'clos-bootsrap 'breaking-on-auto-bootstrap) - (setf (get 'clos-bootsrap 'breaking-on-auto-bootstrap) t) + (unless (get 'clos-bootstrap 'breaking-on-auto-bootstrap) + (setf (get 'clos-bootstrap 'breaking-on-auto-bootstrap) t) (break "Auto-bootstrapping CLOS.")) (clos-bootstrap) (unless (get 'clos-bootstrap 'have-bootstrapped)

1 0

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

20 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv11859 Modified Files: storage-types.lisp Log Message: *** empty log message *** Date: Mon Dec 20 11:53:47 2004 Author: ffjeld Index: movitz/storage-types.lisp diff -u movitz/storage-types.lisp:1.46 movitz/storage-types.lisp:1.47 --- movitz/storage-types.lisp:1.46 Mon Dec 13 12:24:09 2004 +++ movitz/storage-types.lisp Mon Dec 20 11:53:47 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.46 2004/12/13 11:24:09 ffjeld Exp $ +;;;; $Id: storage-types.lisp,v 1.47 2004/12/20 10:53:47 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -69,7 +69,6 @@ :other 6 :symbol 7 - :code-vector #x1a :basic-vector #x22 :defstruct #x2a :funobj #x3a @@ -333,41 +332,6 @@ ;;; 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) - (entry1 - :binary-type u8 - :initarg :entry1) - (num-elements - :binary-type lu16 - :initarg :num-elements - :reader movitz-vector-num-elements) - (entry2 - :binary-type lu16 - :initarg :num-elements - :map-binary-write (lambda (x &optional type) - (declare (ignore type)) - (check-type x (unsigned-byte 14)) - (* x 4)) - :map-binary-read (lambda (x &optional type) - (declare (ignore type)) - (assert (zerop (mod x 4))) - (truncate x 4))) - (entry3 - :binary-type lu16 - :initarg :num-elements) - (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 :binary-type other-type-byte @@ -553,19 +517,6 @@ :fill-pointer (if (integerp fill-pointer) fill-pointer size)))) - -(defun make-movitz-code-vector (code entry1 entry2 entry3) - (make-instance 'movitz-code-vector - :symbolic-data code - :num-elements (1- (ceiling (length code) 8)) - :entry1 entry1 - :entry2 entry2 - :entry3 entry3)) - -(defmethod write-binary-record ((obj movitz-code-vector) stream) - (+ (call-next-method) ; header - (loop for data across (movitz-vector-symbolic-data obj) - summing (write-binary 'u8 stream data)))) (defun make-movitz-string (string) (make-movitz-vector (length string)

1 0

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

20 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv11821 Modified Files: basic-functions.lisp Log Message: Removed dead code. Date: Mon Dec 20 11:51:53 2004 Author: ffjeld Index: movitz/losp/muerte/basic-functions.lisp diff -u movitz/losp/muerte/basic-functions.lisp:1.14 movitz/losp/muerte/basic-functions.lisp:1.15 --- movitz/losp/muerte/basic-functions.lisp:1.14 Fri Nov 12 15:51:56 2004 +++ movitz/losp/muerte/basic-functions.lisp Mon Dec 20 11:51:52 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.14 2004/11/12 14:51:56 ffjeld Exp $ +;;;; $Id: basic-functions.lisp,v 1.15 2004/12/20 10:51:52 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -68,29 +68,6 @@ (:xorl :ecx :ecx) (:call (:esi #.(movitz::slot-offset 'movitz::movitz-funobj 'movitz::code-vector))))) -#+ignore -(defun funcall%1ops (function-name arg0) - (funcall%1ops function-name arg0) ; compiler-macro - #+ignore (with-inline-assembly (:returns :multiple-values) - (:compile-form (:result-mode :esi) (etypecase function-name - (symbol (symbol-function function-name)) - (compiled-function function-name))) - (:compile-form (:result-mode :edx) function-name) - (:compile-form (:result-mode :eax) arg0) - (:call (:esi #.(movitz::slot-offset 'movitz::movitz-funobj 'movitz::code-vector%1op))))) - -#+ignore -(defun funcall%2ops (function arg0 arg1) - (funcall%2ops function arg0 arg1) ; compiler-macro. - #+ignore (with-inline-assembly (:returns :multiple-values) - (:compile-form (:result-mode :esi) (etypecase function - (symbol (symbol-function function)) - (compiled-function function))) - (:compile-form (:result-mode :edx) function) - (:compile-form (:result-mode :eax) arg0) - (:compile-form (:result-mode :ebx) arg1) - (:call (:esi #.(movitz::slot-offset 'movitz::movitz-funobj 'movitz::code-vector%2op))))) - (defun funcall (function-or-name &rest args) (numargs-case (1 (function-or-name)

1 0

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

15 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv14326 Modified Files: sequences.lisp Log Message: *** empty log message *** Date: Wed Dec 15 14:58:34 2004 Author: ffjeld Index: movitz/losp/muerte/sequences.lisp diff -u movitz/losp/muerte/sequences.lisp:1.18 movitz/losp/muerte/sequences.lisp:1.19 --- movitz/losp/muerte/sequences.lisp:1.18 Thu Sep 2 11:44:15 2004 +++ movitz/losp/muerte/sequences.lisp Wed Dec 15 14:58:34 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Sep 11 14:19:23 2001 ;;;; -;;;; $Id: sequences.lisp,v 1.18 2004/09/02 09:44:15 ffjeld Exp $ +;;;; $Id: sequences.lisp,v 1.19 2004/12/15 13:58:34 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -684,12 +684,24 @@ (defun fill (sequence item &key (start 0) end) "=> sequence" - (sequence-dispatch sequence + (etypecase sequence (list (do ((p (nthcdr start sequence) (cdr p)) (i start (1+ i))) ((or (null p) (and end (>= i end)))) (setf (car p) item))) + ((simple-array (unsigned-byte 32) 1) + (let* ((length (array-dimension sequence 0)) + (end (or end length))) + (unless (<= 0 end length) + (error 'index-out-of-range :index end :range length)) + (do ((i start (1+ i))) + ((>= i end)) + (declare (type index i)) + (setf (memref sequence (movitz-type-slot-offset 'movitz-basic-vector 'data) + :index i + :type :unsigned-byte32) + item)))) (vector (let ((end (or end (length sequence)))) (with-subvector-accessor (sequence-ref sequence start end)

1 0

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

15 Dec '04

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv14307 Modified Files: los0.lisp Log Message: *** empty log message *** Date: Wed Dec 15 14:58:27 2004 Author: ffjeld Index: movitz/losp/los0.lisp diff -u movitz/losp/los0.lisp:1.34 movitz/losp/los0.lisp:1.35 --- movitz/losp/los0.lisp:1.34 Mon Dec 13 12:27:58 2004 +++ movitz/losp/los0.lisp Wed Dec 15 14:58:26 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.34 2004/12/13 11:27:58 ffjeld Exp $ +;;;; $Id: los0.lisp,v 1.35 2004/12/15 13:58:26 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -1187,6 +1187,8 @@ ;;; (vector-push code-vector ts)))) ;; (muerte::cli) (pic8259-end-of-interrupt 0) + (when (eql #\esc (muerte.x86-pc.keyboard:poll-char)) + (break "Test-timer keyboard break.")) (with-inline-assembly (:returns :nothing) (:compile-form (:result-mode :ecx) muerte.x86-pc::*screen*) (:shrl 2 :ecx)

1 0

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

15 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv14281 Modified Files: image.lisp Log Message: *** empty log message *** Date: Wed Dec 15 14:58:15 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.85 movitz/image.lisp:1.86 --- movitz/image.lisp:1.85 Mon Dec 13 12:22:50 2004 +++ movitz/image.lisp Wed Dec 15 14:58:08 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.85 2004/12/13 11:22:50 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.86 2004/12/15 13:58:08 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -847,6 +847,7 @@ *image*) (defun set-file-position (stream position &optional who) + (declare (ignore who)) (or (ignore-errors (file-position stream position)) (let* ((end (file-position stream :end)) (diff (- position end)))

1 0

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

15 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv14262 Modified Files: compiler.lisp Log Message: *** empty log message *** Date: Wed Dec 15 14:58:04 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.121 movitz/compiler.lisp:1.122 --- movitz/compiler.lisp:1.121 Mon Dec 13 18:10:32 2004 +++ movitz/compiler.lisp Wed Dec 15 14:58:04 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.121 2004/12/13 17:10:32 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.122 2004/12/15 13:58:04 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -988,11 +988,11 @@ (mapcar #'car rest)) (vector-push 0 code-vector)))) (setf (movitz-funobj-code-vector funobj) - #+ignore (make-movitz-vector (length code-vector) :fill-pointer code-length :element-type 'code :initial-contents code-vector) + #+ignore (make-movitz-code-vector code-vector (slot-value funobj 'code-vector%1op) (slot-value funobj 'code-vector%2op)

1 0

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

14 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv16187 Modified Files: primitive-functions.lisp Log Message: *** empty log message *** Date: Tue Dec 14 17:22:10 2004 Author: ffjeld Index: movitz/losp/muerte/primitive-functions.lisp diff -u movitz/losp/muerte/primitive-functions.lisp:1.57 movitz/losp/muerte/primitive-functions.lisp:1.58 --- movitz/losp/muerte/primitive-functions.lisp:1.57 Thu Nov 25 19:06:02 2004 +++ movitz/losp/muerte/primitive-functions.lisp Tue Dec 14 17:22:08 2004 @@ -10,7 +10,7 @@ ;;;; Author: Frode Vatvedt Fjeld <frodef(a)acm.org> ;;;; Created at: Tue Oct 2 21:02:18 2001 ;;;; -;;;; $Id: primitive-functions.lisp,v 1.57 2004/11/25 18:06:02 ffjeld Exp $ +;;;; $Id: primitive-functions.lisp,v 1.58 2004/12/14 16:22:08 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -18,6 +18,18 @@ (provide :muerte/primitive-functions) (in-package muerte) + +(defconstant +funobj-trampoline-table+ + #(trampoline-funcall%1op + trampoline-funcall%2op + trampoline-funcall%3op + trampoline-cl-dispatch-1or2 + assert-1arg + assert-2args + assert-3args + decode-args-1or2)) + +(defconstant +funobj-trampoline-table-size+ 16) (define-primitive-function trampoline-funcall%1op () "Call a function with 1 argument"

1 0

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

14 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv16137 Modified Files: functions.lisp Log Message: *** empty log message *** Date: Tue Dec 14 17:20:57 2004 Author: ffjeld Index: movitz/losp/muerte/functions.lisp diff -u movitz/losp/muerte/functions.lisp:1.24 movitz/losp/muerte/functions.lisp:1.25 --- movitz/losp/muerte/functions.lisp:1.24 Thu Oct 21 22:34:04 2004 +++ movitz/losp/muerte/functions.lisp Tue Dec 14 17:20:57 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.24 2004/10/21 20:34:04 ffjeld Exp $ +;;;; $Id: functions.lisp,v 1.25 2004/12/14 16:20:57 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -18,7 +18,7 @@ (require :muerte/setf) (provide :muerte/functions) -(In-package muerte) +(in-package muerte) (defun identity (x) x)

1 0

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

13 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv9675 Modified Files: compiler.lisp Log Message: *** empty log message *** Date: Mon Dec 13 18:10:33 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.120 movitz/compiler.lisp:1.121 --- movitz/compiler.lisp:1.120 Mon Dec 13 12:21:48 2004 +++ movitz/compiler.lisp Mon Dec 13 18:10:32 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.120 2004/12/13 11:21:48 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.121 2004/12/13 17:10:32 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -988,15 +988,15 @@ (mapcar #'car rest)) (vector-push 0 code-vector)))) (setf (movitz-funobj-code-vector funobj) + #+ignore (make-movitz-vector (length code-vector) :fill-pointer code-length :element-type 'code :initial-contents code-vector) - #+ignore (make-movitz-code-vector code-vector - (car (slot-value funobj 'code-vector%1op)) - (car (slot-value funobj 'code-vector%2op)) - (car (slot-value funobj 'code-vector%3op)))))) + (slot-value funobj 'code-vector%1op) + (slot-value funobj 'code-vector%2op) + (slot-value funobj 'code-vector%3op))))) funobj) #+ignore

1 0

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

13 Dec '04

Update of /project/movitz/cvsroot/movitz/losp In directory common-lisp.net:/tmp/cvs-serv24723 Modified Files: los0.lisp Log Message: *** empty log message *** Date: Mon Dec 13 12:27:59 2004 Author: ffjeld Index: movitz/losp/los0.lisp diff -u movitz/losp/los0.lisp:1.33 movitz/losp/los0.lisp:1.34 --- movitz/losp/los0.lisp:1.33 Fri Nov 26 15:59:59 2004 +++ movitz/losp/los0.lisp Mon Dec 13 12:27:58 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.33 2004/11/26 14:59:59 ffjeld Exp $ +;;;; $Id: los0.lisp,v 1.34 2004/12/13 11:27:58 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -23,7 +23,7 @@ (require :lib/readline) (require :lib/toplevel) -(require :lib/net/ip6) +;; (require :lib/net/ip6) (require :lib/net/ip4) (require :lib/repl) @@ -37,7 +37,7 @@ #:muerte.readline #:muerte.toplevel #:muerte.ethernet - #:muerte.ip6 +;; #:muerte.ip6 #:muerte.ip4 #:muerte.mop #+ignore muerte.x86-pc.serial)) @@ -624,7 +624,7 @@ -s#+ignore +#+ignore (defun test-ncase (x y z) (numargs-case (1 (x) (values x 'one)) @@ -931,7 +931,7 @@ (prog () loop (case (muerte.x86-pc.keyboard:poll-char) - ((#\esc) + ((#\escape) (break "Console pager")) ((#\n #\N) ; No more (return-from paging (values))) @@ -1151,7 +1151,7 @@ (defparameter *timer-stack* nil) (defparameter *timer-prevstack* nil) (defparameter *timer-esi* nil) -(defparameter *timer-frame* #100()) +(defparameter *timer-frame* #100(nil)) (defparameter *timer-base* 2) (defparameter *timer-variation* 1000) @@ -1281,7 +1281,7 @@ :quiet t :mac (muerte.ip4::polling-arp :129.242.16.1 (lambda () - (eql #\esc (muerte.x86-pc.keyboard:poll-char))))))) + (eql #\escape (muerte.x86-pc.keyboard:poll-char))))))) (defun mumbojumbo (x) (with-inline-assembly (:returns :eax) @@ -1436,7 +1436,7 @@ (when (receive outside buffer) (transmit inside buffer)) (case (muerte.x86-pc.keyboard:poll-char) - (#\esc (break "Under the bridge.")) + (#\escape (break "Under the bridge.")) (#\e (error "this is an error!"))))))))

1 0

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

13 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/muerte In directory common-lisp.net:/tmp/cvs-serv24697 Modified Files: typep.lisp Log Message: Fixed deftype expander vs. CL package. Date: Mon Dec 13 12:25:44 2004 Author: ffjeld Index: movitz/losp/muerte/typep.lisp diff -u movitz/losp/muerte/typep.lisp:1.39 movitz/losp/muerte/typep.lisp:1.40 --- movitz/losp/muerte/typep.lisp:1.39 Wed Nov 24 11:08:28 2004 +++ movitz/losp/muerte/typep.lisp Mon Dec 13 12:25:41 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.39 2004/11/24 10:08:28 ffjeld Exp $ +;;;; $Id: typep.lisp,v 1.40 2004/12/13 11:25:41 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -436,8 +436,9 @@ (format nil "~A-~A" 'deftype name))))) `(progn (eval-when (:compile-toplevel) - (unless (eq (symbol-package (cadr ',form)) (find-package :common-lisp)) - ,form) + (unless (find-symbol (symbol-name (cadr ',form)) :common-lisp) + #+ignore (eq (symbol-package (cadr ',form)) (find-package :common-lisp)) + (eval ',form)) (setf (gethash (translate-program ',name :cl :muerte.cl) *compiler-derived-typespecs*) (lambda ,lambda ,@body))

1 0

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

13 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv24668 Modified Files: storage-types.lisp Log Message: Fixed unbound. Date: Mon Dec 13 12:24:10 2004 Author: ffjeld Index: movitz/storage-types.lisp diff -u movitz/storage-types.lisp:1.45 movitz/storage-types.lisp:1.46 --- movitz/storage-types.lisp:1.45 Fri Dec 10 13:46:52 2004 +++ movitz/storage-types.lisp Mon Dec 13 12:24:09 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.45 2004/12/10 12:46:52 ffjeld Exp $ +;;;; $Id: storage-types.lisp,v 1.46 2004/12/13 11:24:09 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -151,9 +151,12 @@ (defun movitz-read-and-intern (expr type) (ecase type (word - (if (typep expr 'movitz-object) - (movitz-intern expr) - (movitz-intern (movitz-read expr)))) + (cond + ((eq expr 'unbound) + (slot-value (image-run-time-context *image*) 'new-unbound-value)) + ((typep expr 'movitz-object) + (movitz-intern expr)) + (t (movitz-intern (movitz-read expr))))) (code-vector-word (movitz-intern-code-vector expr)))) @@ -335,13 +338,27 @@ :binary-type other-type-byte :reader movitz-vector-type :initform :code-vector) - (blurg) + (entry1 + :binary-type u8 + :initarg :entry1) (num-elements - :binary-type word + :binary-type lu16 :initarg :num-elements - :reader movitz-vector-num-elements - :map-binary-write 'movitz-read-and-intern - :map-binary-read-delayed 'movitz-word-and-print) + :reader movitz-vector-num-elements) + (entry2 + :binary-type lu16 + :initarg :num-elements + :map-binary-write (lambda (x &optional type) + (declare (ignore type)) + (check-type x (unsigned-byte 14)) + (* x 4)) + :map-binary-read (lambda (x &optional type) + (declare (ignore type)) + (assert (zerop (mod x 4))) + (truncate x 4))) + (entry3 + :binary-type lu16 + :initarg :num-elements) (data :binary-lisp-type :label) ; data follows physically here (symbolic-data @@ -537,11 +554,23 @@ fill-pointer size)))) +(defun make-movitz-code-vector (code entry1 entry2 entry3) + (make-instance 'movitz-code-vector + :symbolic-data code + :num-elements (1- (ceiling (length code) 8)) + :entry1 entry1 + :entry2 entry2 + :entry3 entry3)) + +(defmethod write-binary-record ((obj movitz-code-vector) stream) + (+ (call-next-method) ; header + (loop for data across (movitz-vector-symbolic-data obj) + summing (write-binary 'u8 stream data)))) + (defun make-movitz-string (string) (make-movitz-vector (length string) :element-type 'character :initial-contents (map 'list #'identity string))) -;; (map 'list #'make-movitz-character string))) (defun movitz-stringp (x) (and (typep x '(or movitz-basic-vector)) @@ -565,7 +594,7 @@ :binary-type word :map-binary-write 'movitz-read-and-intern :map-binary-read-delayed 'movitz-word - :initform 'muerte::unbound ; + :initform 'unbound :accessor movitz-symbol-value :initarg :value) (plist @@ -883,7 +912,7 @@ (standard-gf-function ; a movitz-funobj which is called by dispatcher (in code-vector) :accessor standard-gf-function :initarg :function - :initform 'muerte::unbound + :initform 'muerte::unbound-function :binary-type word :map-binary-write 'movitz-read-and-intern-function-value) (num-required-arguments @@ -922,7 +951,7 @@ nil) (defun make-standard-gf (class slots &key lambda-list (name "unnamed") - (function 'muerte::unbound) + (function 'muerte::unbound-function) num-required-arguments classes-to-emf-table) (make-instance 'movitz-funobj-standard-gf

1 0

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

13 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv24645 Modified Files: image.lisp Log Message: Fixed some unbound stuff. Date: Mon Dec 13 12:22:50 2004 Author: ffjeld Index: movitz/image.lisp diff -u movitz/image.lisp:1.84 movitz/image.lisp:1.85 --- movitz/image.lisp:1.84 Thu Dec 9 15:04:54 2004 +++ movitz/image.lisp Mon Dec 13 12:22:50 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.84 2004/12/09 14:04:54 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.85 2004/12/13 11:22:50 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -824,7 +824,7 @@ that function's code-vector." (let ((code-vector (movitz-symbol-value (movitz-read name)))) - (unless (and code-vector (not (eq 'muerte::unbound code-vector))) + (unless (and code-vector (not (eq 'unbound code-vector))) (cerror "Install an empty vector instead." "Global constant primitive function ~S is not defined!" name) (setf code-vector @@ -922,7 +922,7 @@ (setf (slot-value run-time-context gcf-name) 0) (cond ((or (not gcf-funobj) - (eq 'muerte::unbound gcf-funobj)) + (eq 'unbound gcf-funobj)) (warn "Global constant function ~S is not defined!" gcf-name)) (t (check-type gcf-funobj movitz-funobj) (setf (slot-value run-time-context gcf-name)

1 0

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

13 Dec '04

Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv24615 Modified Files: compiler.lisp Log Message: *** empty log message *** Date: Mon Dec 13 12:21:49 2004 Author: ffjeld Index: movitz/compiler.lisp diff -u movitz/compiler.lisp:1.119 movitz/compiler.lisp:1.120 --- movitz/compiler.lisp:1.119 Fri Dec 10 13:46:30 2004 +++ movitz/compiler.lisp Mon Dec 13 12:21:48 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.119 2004/12/10 12:46:30 ffjeld Exp $ +;;;; $Id: compiler.lisp,v 1.120 2004/12/13 11:21:48 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -86,7 +86,7 @@ (defvar *compiler-trust-user-type-declarations-p* t) -(defvar *compiling-function-name*) +(defvar *compiling-function-name* nil) (defvar muerte.cl:*compile-file-pathname* nil) (defvar *extended-code-expanders* @@ -933,8 +933,7 @@ (let ((ia-x86:*instruction-compute-extra-prefix-map* '((:call . compute-call-extra-prefix)))) (ia-x86:proglist-encode :octet-vector :32-bit #x00000000 - (ia-x86:read-proglist (append combined-code - #+ignore `((% bytes 8 0 0 0)))) + (ia-x86:read-proglist combined-code) :symtab-lookup (lambda (label) (case label @@ -951,8 +950,6 @@ (* 4 pos))))))))) (setf (movitz-funobj-symtab funobj) code-symtab) (let ((code-length (- (length code-vector) 3 -3))) -;;; (assert (not (mismatch #(0 0 0) code-vector :start2 code-length)) () -;;; "No space in code-vector was allocated for entry-points.") (setf (fill-pointer code-vector) code-length) ;; debug info (setf (ldb (byte 1 5) (slot-value funobj 'debug-info)) @@ -991,11 +988,15 @@ (mapcar #'car rest)) (vector-push 0 code-vector)))) (setf (movitz-funobj-code-vector funobj) - (make-movitz-vector (length code-vector) - :fill-pointer code-length - :element-type 'code - :initial-contents code-vector - )))) + (make-movitz-vector (length code-vector) + :fill-pointer code-length + :element-type 'code + :initial-contents code-vector) + #+ignore + (make-movitz-code-vector code-vector + (car (slot-value funobj 'code-vector%1op)) + (car (slot-value funobj 'code-vector%2op)) + (car (slot-value funobj 'code-vector%3op)))))) funobj) #+ignore @@ -2809,8 +2810,7 @@ (and (not (instruction-is i :init-lexvar)) (member binding (find-read-bindings i) :test #'binding-eql))) - (cdr init-pc) - #-sbcl :end #-sbcl 15)) + (cdr init-pc))) (binding-destination (third load-instruction)) (distance (position load-instruction (cdr init-pc)))) (multiple-value-bind (free-registers more-later-p) @@ -3020,8 +3020,7 @@ (truncate (or (position-if (lambda (i) (member b (find-read-bindings i))) - (cdr init-pc) - #-sbcl :end #-sbcl 10) + (cdr init-pc)) 15) count))))))))) ;; First, make several passes while trying to locate bindings

1 0

[movitz-cvs] CVS update: public_html/index.html
by ffjeld＠common-lisp.net 12 Dec '04

12 Dec '04

Update of /project/movitz/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv19926 Modified Files: index.html Log Message: *** empty log message *** Date: Sun Dec 12 13:38:42 2004 Author: ffjeld Index: public_html/index.html diff -u public_html/index.html:1.20 public_html/index.html:1.21 --- public_html/index.html:1.20 Wed Aug 18 11:27:57 2004 +++ public_html/index.html Sun Dec 12 13:38:40 2004 @@ -15,22 +15,20 @@ <h3>Most recent news</h3> + December 12, 2004: Various bits and pieces have been + cleaned up so that recent (2.33) CLisp can now compile Movitz kernels + just fine (mostly to do with CLisp having CL symbols with e.g. CLOS + as home package). + + QEMU's NE2000 device seems to work ok with Movitz, both in ISA + and PCI modes. + August 18, 2004: Movitz finally runs in <a href="http://fabrice.bellard.free.fr/qemu/">QEMU</a>, which is a very nice x86 emulator. It uses some sort of JIT technique, so it's much faster than Bochs. There was a bug in QEMU's (version 0.6.0) emulation of the x86 <tt>bounds</tt> instruction, which didn't agree with Movitz, and which is now fixed in QEMU's CVS. - - July 8, 2004: The data-structure for vectors has been - changed. The vectors length is now represented by a fixnum, - increasing the maximum length from <tt>#xffff</tt> to - <tt>most-positive-fixnum</tt>. - - The example GC system is changed to reflect the new vector - data-structure, so that the hard 256 KB limit on newspaces is no - more. The default size is set to 2 MB, and this newspace size is used - in the new <a href="files/los0.img"><tt>los0.img</tt></a>. For more news, see the <a href="files/ChangeLog"><tt>ChangeLog</tt></a>.

1 0

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

10 Dec '04

Update of /project/movitz/cvsroot/movitz/losp/x86-pc In directory common-lisp.net:/tmp/cvs-serv1703 Modified Files: keyboard.lisp Log Message: Avoid the named-integer cruft. Date: Fri Dec 10 13:48:34 2004 Author: ffjeld Index: movitz/losp/x86-pc/keyboard.lisp diff -u movitz/losp/x86-pc/keyboard.lisp:1.5 movitz/losp/x86-pc/keyboard.lisp:1.6 --- movitz/losp/x86-pc/keyboard.lisp:1.5 Thu Dec 9 00:40:24 2004 +++ movitz/losp/x86-pc/keyboard.lisp Fri Dec 10 13:48:34 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.5 2004/12/08 23:40:24 ffjeld Exp $ +;;;; $Id: keyboard.lisp,v 1.6 2004/12/10 12:48:34 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------ @@ -115,10 +115,9 @@ (t (values (ldb (byte 7 0) first-code) (logbitp 7 first-code)))))) -(define-named-integer qualifier (:only-constants t) - (0 shift) - (1 ctrl) - (2 alt)) +(defconstant +qualifier-shift+ 0) +(defconstant +qualifier-ctrl+ 1) +(defconstant +qualifier-alt+ 2) (defvar *qualifier-state* 0)

1 0

[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

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