[movitz-cvs] CVS update: movitz/losp/lib/malloc-init.lisp

[Frode Vatvedt Fjeld]

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

Modified Files:
	malloc-init.lisp 
Log Message:
This rather substantial check-in is a clean-up of all things related
to dynamic memory allocation. In particular, the separation between
the muerte kernel with its 'default' memory management (which simply
allocates objects consecutively until it runs out) and the los0 GC
implementation is improved.

Date: Thu Jul 15 14:06:38 2004
Author: ffjeld

Index: movitz/losp/lib/malloc-init.lisp
diff -u movitz/losp/lib/malloc-init.lisp:1.4 movitz/losp/lib/malloc-init.lisp:1.5
--- movitz/losp/lib/malloc-init.lisp:1.4	Wed Jul  7 10:37:11 2004
+++ movitz/losp/lib/malloc-init.lisp	Thu Jul 15 14:06:38 2004
@@ -10,7 +10,7 @@
 ;;;; Author:        Frode Vatvedt Fjeld <frodef at acm.org>
 ;;;; Created at:    Wed Jan  9 15:57:22 2002
 ;;;;                
-;;;; $Id: malloc-init.lisp,v 1.4 2004/07/07 17:37:11 ffjeld Exp $
+;;;; $Id: malloc-init.lisp,v 1.5 2004/07/15 21:06:38 ffjeld Exp $
 ;;;;                
 ;;;;------------------------------------------------------------------
 
@@ -20,14 +20,18 @@
 (in-package muerte.lib)
 
 (let* ((stack-vector (%run-time-context-slot 'muerte::stack-vector))
-       (kernel-end (+ (* 4 (muerte:object-location stack-vector))
-		      8 (* 4 (array-dimension stack-vector 0))))
-       (memsize (muerte.x86-pc::memory-size))
-       (start (truncate (+ kernel-end 4095) 4096)))
-  (muerte:malloc-initialize start (- (* memsize #x100) start))
-  (loop for x from (truncate kernel-end 4) below (* start 1024)
+       ;; We assume the kernel static are ends with the stack-vector.
+       (kernel-end-location (+ 2 (muerte:object-location stack-vector)
+			       (array-dimension stack-vector 0)))
+       (memsize-mb (muerte.x86-pc::memory-size))
+       ;; Start-location is kernel-end rounded up to the next 4096 edge.
+       (start-location (logand (+ kernel-end-location (1- 4096/4)) -4096/4))
+       ;; End-location is the end of the memory.
+       (end-location (* (1- memsize-mb) 1024 1024/4)))
+  (muerte:malloc-initialize start-location end-location)
+  (setf (cdar muerte::%memory-map%) end-location)
+  (loop for x from kernel-end-location below start-location
       do (setf (memref x 0 0 :unsigned-byte32) 0))
-  ;; (format t "Memory: ~D MB. Malloc area at ~D K.~%" memsize (* start 4))
   (values))