Update of /project/movitz/cvsroot/movitz In directory common-lisp.net:/tmp/cvs-serv2976
Modified Files: image.lisp Log Message: Move the initialization of the interrupt-handler array to inside dump-image, so that we can capture the function-value of interrupt-default-handler.
Date: Thu Apr 15 09:04:52 2004 Author: ffjeld
Index: movitz/image.lisp diff -u movitz/image.lisp:1.22 movitz/image.lisp:1.23 --- movitz/image.lisp:1.22 Wed Apr 14 18:51:24 2004 +++ movitz/image.lisp Thu Apr 15 09:04:51 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.22 2004/04/14 22:51:24 ffjeld Exp $ +;;;; $Id: image.lisp,v 1.23 2004/04/15 13:04:51 ffjeld Exp $ ;;;; ;;;;------------------------------------------------------------------
@@ -683,8 +683,6 @@ (ldb (byte 3 0) (image-nil-word *image*)) (tag :null)) (setf (image-constant-block *image*) (make-movitz-constant-block)) - (setf (movitz-constant-block-interrupt-handlers (image-constant-block *image*)) - (movitz-read (make-array 256 :initial-element 'muerte::interrupt-default-handler))) (setf (movitz-constant-block-interrupt-descriptor-table (image-constant-block *image*)) (movitz-read (make-initial-interrupt-descriptors))) (setf (image-t-symbol *image*) (movitz-read t)) @@ -726,6 +724,9 @@ (assert (plusp (dump-count *image*)))) (setf (movitz-symbol-value (movitz-read 'muerte:*build-number*)) (1+ *bootblock-build*)) + (let ((handler (movitz-env-symbol-function 'muerte::interrupt-default-handler))) + (setf (movitz-constant-block-interrupt-handlers (image-constant-block *image*)) + (movitz-read (make-array 256 :initial-element handler)))) (let ((load-address (image-start-address *image*))) (setf (image-cons-pointer *image*) (- load-address (image-ds-segment-base *image*))