[movitz-cvs] CVS update: movitz/image.lisp

[Frode Vatvedt Fjeld]

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))