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

[Frode Vatvedt Fjeld]

Update of /project/movitz/cvsroot/movitz
In directory common-lisp.net:/tmp/cvs-serv24384

Modified Files:
	bootblock.lisp 
Log Message:
Don't assume a lambda-form can be funcalled.

Date: Thu Jan 15 14:40:58 2004
Author: ffjeld

Index: movitz/bootblock.lisp
diff -u movitz/bootblock.lisp:1.1.1.1 movitz/bootblock.lisp:1.2
--- movitz/bootblock.lisp:1.1.1.1	Tue Jan 13 06:04:59 2004
+++ movitz/bootblock.lisp	Thu Jan 15 14:40:58 2004
@@ -9,7 +9,7 @@
 ;;;; Created at:    Mon Oct  9 20:47:19 2000
 ;;;; Distribution:  See the accompanying file COPYING.
 ;;;;                
-;;;; $Id: bootblock.lisp,v 1.1.1.1 2004/01/13 11:04:59 ffjeld Exp $
+;;;; $Id: bootblock.lisp,v 1.2 2004/01/15 19:40:58 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -341,6 +341,10 @@
 (defparameter +message+ "Ok.")
 (defparameter +halt-message+ "Halt!")
 
+(defun make-vga-string (string)
+  (loop for char across string
+      collect (complex (logior #x0700 (char-code char)) 2)))
+
 (defun mkasm-loader (image-size load-address call-address)
   "Make the 32-bit loader."
   (assert (<= load-address call-address (+ load-address image-size)) ()
@@ -404,9 +408,7 @@
 ;;;     (:halt)
 ;;;     (:jmp 'eternal)			; OS returned?
      ;; (% align 2)
-     i-am-32 (% fun ((lambda () 
-		       (loop for char across ,+message+
-			   collect (complex (logior #x0700 (char-code char)) 2)))))
+     i-am-32 (% fun (make-vga-string ,+message+))
 ;;;     halt-msg (% fun ((lambda () 
 ;;;			(loop for char across ,+halt-message+
 ;;;			    collect (complex (logior #x4700 (char-code char)) 2)))))