August 2006 - steeldump-cvs@common-lisp.net

[steeldump-cvs] r19 - trunk/sb-heapdump
by dlichteblau＠common-lisp.net 27 Aug '06

27 Aug '06

Author: dlichteblau Date: Sun Aug 27 15:43:29 2006 New Revision: 19 Modified: trunk/sb-heapdump/common.lisp trunk/sb-heapdump/dump.lisp trunk/sb-heapdump/load.lisp trunk/sb-heapdump/pack.lisp Log: update for SBCL 0.9.16 Modified: trunk/sb-heapdump/common.lisp ============================================================================== --- trunk/sb-heapdump/common.lisp (original) +++ trunk/sb-heapdump/common.lisp Sun Aug 27 15:43:29 2006 @@ -52,6 +52,9 @@ +function-fixup+ +ctor-fixup+ +slot-accessor-fixup+ + #+#.(cl:if (cl:find-symbol "METHOD-FUNCTION-PLIST" :sb-pcl) + '(and) + '(or)) +fast-method-fixup+ +raw-address-fixup+ +variable-fixup+ Modified: trunk/sb-heapdump/dump.lisp ============================================================================== --- trunk/sb-heapdump/dump.lisp (original) +++ trunk/sb-heapdump/dump.lisp Sun Aug 27 15:43:29 2006 @@ -629,7 +629,8 @@ sb-vm:other-pointer-lowtag))))) ;; fixme: can this be done by DUMP-PACKAGE? -(defun note-fast-method-plist (fun ctx) +(defun note-fast-method-plist (fun ctx) fun ctx + #+#.(cl:if (cl:find-symbol "METHOD-FUNCTION-PLIST" :sb-pcl) '(and) '(or)) (let ((plist (sb-pcl::method-function-plist fun))) (when plist (%build-fixup (make-fast-method-fixup +fast-method-fixup+ fun plist) Modified: trunk/sb-heapdump/load.lisp ============================================================================== --- trunk/sb-heapdump/load.lisp (original) +++ trunk/sb-heapdump/load.lisp Sun Aug 27 15:43:29 2006 @@ -159,6 +159,7 @@ (let ((x (fixup-id f))) (sb-pcl::ensure-accessor (fourth x) x (third x)) (fdefinition x))) + #+#.(cl:if (cl:find-symbol "METHOD-FUNCTION-PLIST" :sb-pcl) '(and) '(or)) (#.+fast-method-fixup+ (setf (sb-pcl::method-function-plist (fixup-id f)) (fixup-id2 f)) Modified: trunk/sb-heapdump/pack.lisp ============================================================================== --- trunk/sb-heapdump/pack.lisp (original) +++ trunk/sb-heapdump/pack.lisp Sun Aug 27 15:43:29 2006 @@ -130,7 +130,7 @@ (sb-mop:generic-function-name gf)))) ;; fixme: ist das folgende auch noetig fuer: ;; (slot-value method 'sb-pcl::function) - (let ((fm (sb-pcl::method-fast-function method))) + (let ((fm (sb-pcl::safe-method-fast-function method))) (when fm (when ;; FIXME!

1 0

[steeldump-cvs] r18 - trunk/scripts
by dlichteblau＠common-lisp.net 27 Aug '06

27 Aug '06

Author: dlichteblau Date: Sun Aug 27 13:19:52 2006 New Revision: 18 Modified: trunk/scripts/fetch-sbcl Log: nachtrag Modified: trunk/scripts/fetch-sbcl ============================================================================== --- trunk/scripts/fetch-sbcl (original) +++ trunk/scripts/fetch-sbcl Sun Aug 27 13:19:52 2006 @@ -2,7 +2,7 @@ set -x #mirror=http://osdn.dl.sourceforge.net/sourceforge mirror=http://belnet.dl.sourceforge.net/sourceforge -version=0.9.13 +version=0.9.14 cd /opt/steeldump ./scripts/aux/fetch-url \

1 0

[steeldump-cvs] r17 - trunk/steeldump-web
by dlichteblau＠common-lisp.net 27 Aug '06

27 Aug '06

Author: dlichteblau Date: Sun Aug 27 12:41:16 2006 New Revision: 17 Modified: trunk/steeldump-web/index.html Log: new release 2006-08-27 Modified: trunk/steeldump-web/index.html ============================================================================== --- trunk/steeldump-web/index.html (original) +++ trunk/steeldump-web/index.html Sun Aug 27 12:41:16 2006 @@ -94,7 +94,7 @@ <li><a href="http://weitz.de/cl-fad/">cl-fad</a></li> </td> <td align="right"> - 0.5.0 + 0.5.1 </td> </tr> <tr> @@ -110,7 +110,7 @@ <li><a href="http://weitz.de/cl-ppcre/">cl-ppcre</a></li> </td> <td align="right"> - 1.2.14 + 1.2.16 </td> </tr> <tr> @@ -136,7 +136,7 @@ <li><a href="http://weitz.de/flexi-streams/">flexi-streams</a></li> </td> <td align="right"> - 0.5.5 + 0.5.7 </td> </tr> <tr> @@ -230,6 +230,11 @@ <h3>News</h3> + 2006-08-27 + + Belatedly, a release based on SBCL 0.9.14. + + 2006-05-28 New release based on SBCL 0.9.13.

1 0

[steeldump-cvs] r16 - in trunk/scripts: . lisp patches
by dlichteblau＠common-lisp.net 27 Aug '06

27 Aug '06

Author: dlichteblau Date: Sun Aug 27 11:53:36 2006 New Revision: 16 Added: trunk/scripts/fetch-sbcl-cvs (contents, props changed) trunk/scripts/patches/esa.diff trunk/scripts/patches/mcclim.diff Modified: trunk/scripts/VERSION trunk/scripts/build-eclipse (props changed) trunk/scripts/fetch-cl-fad trunk/scripts/fetch-cl-ppcre trunk/scripts/fetch-esa trunk/scripts/fetch-flexi-streams trunk/scripts/fetch-mcclim trunk/scripts/fetch-sbcl trunk/scripts/lisp/build-climacs.lisp trunk/scripts/lisp/build-flexi-streams.lisp trunk/scripts/lisp/build-gsharp.lisp trunk/scripts/lisp/build-mcclim.lisp trunk/scripts/makedeb-all trunk/scripts/makedeb-eclipse (props changed) trunk/scripts/patches/climacs.diff Log: various updates for current packages (SBCL still at 0.9.13) Modified: trunk/scripts/VERSION ============================================================================== --- trunk/scripts/VERSION (original) +++ trunk/scripts/VERSION Sun Aug 27 11:53:36 2006 @@ -1 +1 @@ -2006-05-28 +2006-08-27 Modified: trunk/scripts/fetch-cl-fad ============================================================================== --- trunk/scripts/fetch-cl-fad (original) +++ trunk/scripts/fetch-cl-fad Sun Aug 27 11:53:36 2006 @@ -4,5 +4,5 @@ z \ http://weitz.de/files/ \ cl-fad.tar.gz \ - cl-fad-0.5.0 \ + cl-fad-0.5.1 \ cl-fad Modified: trunk/scripts/fetch-cl-ppcre ============================================================================== --- trunk/scripts/fetch-cl-ppcre (original) +++ trunk/scripts/fetch-cl-ppcre Sun Aug 27 11:53:36 2006 @@ -4,5 +4,5 @@ z \ http://weitz.de/files/ \ cl-ppcre.tar.gz \ - cl-ppcre-1.2.14 \ + cl-ppcre-1.2.16 \ cl-ppcre Modified: trunk/scripts/fetch-esa ============================================================================== --- trunk/scripts/fetch-esa (original) +++ trunk/scripts/fetch-esa Sun Aug 27 11:53:36 2006 @@ -4,3 +4,5 @@ :pserver:anonymous:anonymous@common-lisp.net:/project/climacs/cvsroot \ esa \ "-r HEAD" +cd /opt/steeldump/src/esa +patch -p0 </opt/steeldump/scripts/patches/esa.diff Modified: trunk/scripts/fetch-flexi-streams ============================================================================== --- trunk/scripts/fetch-flexi-streams (original) +++ trunk/scripts/fetch-flexi-streams Sun Aug 27 11:53:36 2006 @@ -4,5 +4,5 @@ z \ http://weitz.de/files/ \ flexi-streams.tar.gz \ - flexi-streams-0.5.5 \ + flexi-streams-0.5.7 \ flexi-streams Modified: trunk/scripts/fetch-mcclim ============================================================================== --- trunk/scripts/fetch-mcclim (original) +++ trunk/scripts/fetch-mcclim Sun Aug 27 11:53:36 2006 @@ -4,3 +4,5 @@ :pserver:anonymous:anonymous@common-lisp.net:/project/mcclim/cvsroot \ mcclim \ "-r HEAD" +cd /opt/steeldump/src/mcclim +patch -p0 </opt/steeldump/scripts/patches/mcclim.diff Modified: trunk/scripts/fetch-sbcl ============================================================================== --- trunk/scripts/fetch-sbcl (original) +++ trunk/scripts/fetch-sbcl Sun Aug 27 11:53:36 2006 @@ -2,13 +2,14 @@ set -x #mirror=http://osdn.dl.sourceforge.net/sourceforge mirror=http://belnet.dl.sourceforge.net/sourceforge +version=0.9.13 cd /opt/steeldump ./scripts/aux/fetch-url \ j \ $mirror/sbcl/ \ - sbcl-0.9.13-source.tar.bz2 \ - sbcl-0.9.13 \ + sbcl-$version-source.tar.bz2 \ + sbcl-$version \ sbcl ./scripts/aux/fetch-svn \ svn://common-lisp.net/project/steeldump/svn/trunk/sb-heapdump \ Added: trunk/scripts/fetch-sbcl-cvs ============================================================================== --- (empty file) +++ trunk/scripts/fetch-sbcl-cvs Sun Aug 27 11:53:36 2006 @@ -0,0 +1,15 @@ +#!/bin/sh -e +set -x +# (normal version of this script for releases is fetch-sbcl) + +rev="-D 04 Jun 2006 UTC" + +cd /opt/steeldump +/opt/steeldump/scripts/aux/fetch-cvs \ + :pserver:anonymous@sbcl.cvs.sourceforge.net:/cvsroot/sbcl \ + sbcl \ + "$rev" +./scripts/aux/fetch-svn \ + svn://common-lisp.net/project/steeldump/svn/trunk/sb-heapdump \ + sb-heapdump +cp -r src/sb-heapdump src/sbcl/contrib Modified: trunk/scripts/lisp/build-climacs.lisp ============================================================================== --- trunk/scripts/lisp/build-climacs.lisp (original) +++ trunk/scripts/lisp/build-climacs.lisp Sun Aug 27 11:53:36 2006 @@ -18,12 +18,13 @@ (defmethod sb-heapdump:dump-system ((c (eql (asdf:find-system :climacs)))) (dump-clim-application - '("CLIMACS-SLIDEMACS-EDITOR" "CLIMACS-TTCN3-SYNTAX" "CLIMACS-GUI" - ;; "ESA" + '("CLIMACS" + "CLIMACS-SLIDEMACS-EDITOR" "CLIMACS-TTCN3-SYNTAX" "CLIMACS-GUI" "CLIMACS-LISP-SYNTAX" "CLIMACS-CL-SYNTAX" "CLIMACS-PROLOG-SYNTAX" "CLIMACS-HTML-SYNTAX" "CLIMACS-FUNDAMENTAL-SYNTAX" "CLIMACS-PANE" "UNDO" "CLIMACS-KILL-RING" "CLIMACS-SYNTAX" "CLIMACS-ABBREV" "CLIMACS-BASE" - "CLIMACS-BUFFER" "BINSEQ" "AUTOMATON" "EQV-HASH") + "CLIMACS-BUFFER" "BINSEQ" "AUTOMATON" "EQV-HASH" "CLIMACS-MOTION" + "CLIMACS-EDITING" "CLIMACS-CORE" "CLIMACS-COMMANDS") "climacs.heap" *new-command-tables* :systems '(:climacs :climacs.tests) Modified: trunk/scripts/lisp/build-flexi-streams.lisp ============================================================================== --- trunk/scripts/lisp/build-flexi-streams.lisp (original) +++ trunk/scripts/lisp/build-flexi-streams.lisp Sun Aug 27 11:53:36 2006 @@ -9,7 +9,7 @@ "flexi-streams.heap" :if-exists :rename-and-delete :systems '(:flexi-streams) - :system-packages '(:flexi-streams.system))) + :system-packages '())) (let ((*default-pathname-defaults* (truename (sb-ext:posix-getenv "SBCL_HOME")))) Modified: trunk/scripts/lisp/build-gsharp.lisp ============================================================================== --- trunk/scripts/lisp/build-gsharp.lisp (original) +++ trunk/scripts/lisp/build-gsharp.lisp Sun Aug 27 11:53:36 2006 @@ -6,10 +6,10 @@ (defmethod sb-heapdump:dump-system ((c (eql (asdf:find-system :gsharp)))) (dump-clim-application - '("GSHARP-UTILITIES" "GF" "SDL" "SCORE-PANE" "GSHARP-BUFFER" - "GSHARP-NUMBERING" "OBSEQ" "GSHARP-MEASURE" "GSHARP-POSTSCRIPT" - "GSHARP-GLYPHS" "GSHARP-BEAMING" "GSHARP-CURSOR" "GSHARP-DRAWING" - "MIDI" "GSHARP-PLAY" "GSHARP") + '("GSHARP-UTILITIES" "MF" "SDL" "SCORE-PANE" "GSHARP-BUFFER" + "GSHARP-NUMBERING" "OBSEQ" "GSHARP-MEASURE" "GSHARP-BEAMING" + "GSHARP-CURSOR" "GSHARP-DRAWING" "MIDI" "GSHARP-PLAY" "GSHARP" + "FONTVIEW") "gsharp.heap" nil :force (list #'(setf clim:output-record-start-cursor-position) Modified: trunk/scripts/lisp/build-mcclim.lisp ============================================================================== --- trunk/scripts/lisp/build-mcclim.lisp (original) +++ trunk/scripts/lisp/build-mcclim.lisp Sun Aug 27 11:53:36 2006 @@ -4,6 +4,8 @@ (asdf:operate 'asdf:load-op :clim-examples) (asdf:operate 'asdf:load-op :clim-listener) +(load (compile-file "/opt/steeldump/src/gsharp/bezier.lisp")) + (defmethod sb-heapdump:dump-system ((c (eql (asdf:find-system :mcclim)))) (let ((packages (mapcar #'find-package Modified: trunk/scripts/makedeb-all ============================================================================== --- trunk/scripts/makedeb-all (original) +++ trunk/scripts/makedeb-all Sun Aug 27 11:53:36 2006 @@ -5,22 +5,25 @@ --sysinit /dev/null \ --load "/opt/steeldump/scripts/lisp/relocate.lisp" -/opt/steeldump/scripts/makedeb-sbcl -/opt/steeldump/scripts/makedeb-climacs -/opt/steeldump/scripts/makedeb-clx -/opt/steeldump/scripts/makedeb-esa -/opt/steeldump/scripts/makedeb-flexichain -/opt/steeldump/scripts/makedeb-gsharp -/opt/steeldump/scripts/makedeb-mcclim -/opt/steeldump/scripts/makedeb-spatial-trees -/opt/steeldump/scripts/makedeb-split-sequence -/opt/steeldump/scripts/makedeb-cl-ppcre -/opt/steeldump/scripts/makedeb-cl-fad -/opt/steeldump/scripts/makedeb-tab-layout -/opt/steeldump/scripts/makedeb-trivial-gray-streams -/opt/steeldump/scripts/makedeb-flexi-streams -/opt/steeldump/scripts/makedeb-trivial-sockets -/opt/steeldump/scripts/makedeb-cl-irc -/opt/steeldump/scripts/makedeb-beirc -/opt/steeldump/scripts/makedeb-eclipse -/opt/steeldump/scripts/makedeb-stumpwm +cd /opt/steeldump/scripts/ +./makedeb-sbcl +./makedeb-climacs +./makedeb-clx +./makedeb-esa +./makedeb-flexichain +./makedeb-gsharp +./makedeb-mcclim +./makedeb-spatial-trees +./makedeb-split-sequence +./makedeb-cl-ppcre +./makedeb-cl-fad +./makedeb-tab-layout +./makedeb-trivial-gray-streams +./makedeb-flexi-streams +./makedeb-trivial-sockets +./makedeb-cl-irc +./makedeb-beirc +./makedeb-eclipse +./makedeb-stumpwm + +./generate-dists Modified: trunk/scripts/patches/climacs.diff ============================================================================== --- trunk/scripts/patches/climacs.diff (original) +++ trunk/scripts/patches/climacs.diff Sun Aug 27 11:53:36 2006 @@ -1,15 +1,24 @@ Index: packages.lisp =================================================================== RCS file: /project/climacs/cvsroot/climacs/packages.lisp,v -retrieving revision 1.96 -diff -u -u -r1.96 packages.lisp ---- packages.lisp 14 May 2006 20:35:44 -0000 1.96 -+++ packages.lisp 21 May 2006 14:54:58 -0000 -@@ -204,6 +204,7 @@ - (defpackage :climacs-lisp-syntax - (:use :clim-lisp :clim :clim-extensions :climacs-buffer :climacs-base - :climacs-syntax :flexichain :climacs-pane :climacs-gui) -+ (:shadow :form) - (:export :lisp-string)) +retrieving revision 1.112 +diff -u -u -r1.112 packages.lisp +--- packages.lisp 20 Aug 2006 13:06:38 -0000 1.112 ++++ packages.lisp 27 Aug 2006 15:26:20 -0000 +@@ -444,7 +444,7 @@ + (defpackage :climacs-prolog-syntax + (:use :clim-lisp :clim :climacs-buffer :climacs-base + :climacs-syntax :flexichain :climacs-pane :climacs-core) +- (:shadow #:atom #:close #:exp #:integer #:open #:variable)) ++ (:shadow #:name #:atom #:close #:exp #:integer #:open #:variable)) + (defpackage :climacs-cl-syntax + (:use :clim-lisp :clim :climacs-buffer :climacs-base +@@ -455,6 +455,7 @@ + (:use :clim-lisp :clim :clim-extensions :climacs-buffer :climacs-base + :climacs-syntax :flexichain :climacs-pane :climacs-gui + :climacs-motion :climacs-editing :climacs-core) ++ (:shadow #:form #:path) + (:export #:lisp-string + #:edit-definition)) Added: trunk/scripts/patches/esa.diff ============================================================================== --- (empty file) +++ trunk/scripts/patches/esa.diff Sun Aug 27 11:53:36 2006 @@ -0,0 +1,12 @@ +--- esa-io.lisp 20 Aug 2006 12:43:40 +0200 1.4 ++++ esa-io.lisp 27 Aug 2006 17:35:41 +0200 +@@ -23,6 +23,9 @@ + (defgeneric buffers (application-frame) + (:documentation "Return a list of all the buffers of the application")) + ++(defgeneric (setf buffers) (newval application-frame) ++ (:documentation "Set the list of all the buffers of the application")) ++ + (defgeneric current-buffer (application-frame) + (:documentation "Return the current buffer of APPLICATION-FRAME")) + Added: trunk/scripts/patches/mcclim.diff ============================================================================== --- (empty file) +++ trunk/scripts/patches/mcclim.diff Sun Aug 27 11:53:36 2006 @@ -0,0 +1,11 @@ +--- mcclim.asd 03 Jul 2006 06:58:41 +0200 1.23 ++++ mcclim.asd 27 Aug 2006 16:30:23 +0200 +@@ -318,7 +318,7 @@ + ;;; The actual McCLIM system that people should to use in their ASDF + ;;; package dependency lists. + (defsystem :mcclim +- :depends-on (:clim-looks)) ++ :depends-on (:clim-looks :flexichain)) + + ;;; CLIM-Examples depends on having at least one backend loaded. + (defsystem :clim-examples

1 0

[steeldump-cvs] r15 - trunk/sb-heapdump
by dlichteblau＠common-lisp.net 27 Aug '06

27 Aug '06

Author: dlichteblau Date: Sun Aug 27 11:52:53 2006 New Revision: 15 Modified: trunk/sb-heapdump/relocate.c Log: second try at a fix for SBCL 0.9.13.22 Modified: trunk/sb-heapdump/relocate.c ============================================================================== --- trunk/sb-heapdump/relocate.c (original) +++ trunk/sb-heapdump/relocate.c Sun Aug 27 11:52:53 2006 @@ -104,7 +104,9 @@ large_object_size = los; } -#define GEN 2 +/* FIXME: This used to be 2, which stopped working in SBCL 0.9.13.22 + * (Gen. 6 also works, but 0 is arguable better than that.) */ +#define GEN 0 void * map_dumpfile(int fd, long offset, int verbose)

1 0

[steeldump-cvs] r14 - trunk/sb-heapdump
by dlichteblau＠common-lisp.net 26 Aug '06

26 Aug '06

Author: dlichteblau Date: Sat Aug 26 13:58:08 2006 New Revision: 14 Modified: trunk/sb-heapdump/relocate.c Log: revert r11:13 Modified: trunk/sb-heapdump/relocate.c ============================================================================== --- trunk/sb-heapdump/relocate.c (original) +++ trunk/sb-heapdump/relocate.c Sat Aug 26 13:58:08 2006 @@ -104,6 +104,8 @@ large_object_size = los; } +#define GEN 2 + void * map_dumpfile(int fd, long offset, int verbose) { @@ -113,7 +115,6 @@ long start_page, end_page; long npages; long i; - int gen = 2; /* fixme: why not 1? */ if (!reloctab_initialized) { relocate_init(); @@ -174,14 +175,10 @@ #endif ); - while (gen < HIGHEST_NORMAL_GENERATION - && !generations[gen].bytes_allocated) - gen++; - for (i = 0; i < npages; i++) { long page = start_page + i; page_table[page].allocated = BOXED_PAGE_FLAG; - page_table[page].gen = gen; + page_table[page].gen = GEN; page_table[page].large_object = 0; page_table[page].first_object_offset = -(PAGE_BYTES * i); page_table[page].bytes_used = PAGE_BYTES; @@ -194,11 +191,11 @@ page_table[page].dont_move = 0; } page_table[end_page - 1].bytes_used = length - PAGE_BYTES * (npages-1); - generations[gen].bytes_allocated += length; + generations[GEN].bytes_allocated += length; #if 0 /* fixme: do we need these? */ bytes_allocated += length; - generations[gen].cum_sum_bytes_allocated += length; + generations[GEN].cum_sum_bytes_allocated += length; #endif if (last_free_page < end_page)

1 0

[steeldump-cvs] r13 - trunk/sb-heapdump
by dlichteblau＠common-lisp.net 26 Aug '06

26 Aug '06

Author: dlichteblau Date: Sat Aug 26 11:51:47 2006 New Revision: 13 Modified: trunk/sb-heapdump/relocate.c Log: oops Modified: trunk/sb-heapdump/relocate.c ============================================================================== --- trunk/sb-heapdump/relocate.c (original) +++ trunk/sb-heapdump/relocate.c Sat Aug 26 11:51:47 2006 @@ -174,7 +174,7 @@ #endif ); - while (gen <= HIGHEST_NORMAL_GENERATION + while (gen < HIGHEST_NORMAL_GENERATION && !generations[gen].bytes_allocated) gen++;

1 0

[steeldump-cvs] r12 - trunk/sb-heapdump
by dlichteblau＠common-lisp.net 26 Aug '06

26 Aug '06

Author: dlichteblau Date: Sat Aug 26 11:48:20 2006 New Revision: 12 Modified: trunk/sb-heapdump/NEWS trunk/sb-heapdump/relocate.c Log: Map heap files into the youngest non-empty (!) generation >= 2. Previously generation 2 was always used, which seems to have stopped working in SBCL 0.9.13.22. Modified: trunk/sb-heapdump/NEWS ============================================================================== --- trunk/sb-heapdump/NEWS (original) +++ trunk/sb-heapdump/NEWS Sat Aug 26 11:48:20 2006 @@ -1,3 +1,6 @@ +Changes in svn: + writeme + Changes in sb-heapdump-05 * x86-64 fixes * PowerPC/cheneygc port Modified: trunk/sb-heapdump/relocate.c ============================================================================== --- trunk/sb-heapdump/relocate.c (original) +++ trunk/sb-heapdump/relocate.c Sat Aug 26 11:48:20 2006 @@ -104,8 +104,6 @@ large_object_size = los; } -#define GEN 2 - void * map_dumpfile(int fd, long offset, int verbose) { @@ -115,6 +113,7 @@ long start_page, end_page; long npages; long i; + int gen = 2; /* fixme: why not 1? */ if (!reloctab_initialized) { relocate_init(); @@ -175,10 +174,14 @@ #endif ); + while (gen <= HIGHEST_NORMAL_GENERATION + && !generations[gen].bytes_allocated) + gen++; + for (i = 0; i < npages; i++) { long page = start_page + i; page_table[page].allocated = BOXED_PAGE_FLAG; - page_table[page].gen = GEN; + page_table[page].gen = gen; page_table[page].large_object = 0; page_table[page].first_object_offset = -(PAGE_BYTES * i); page_table[page].bytes_used = PAGE_BYTES; @@ -191,11 +194,11 @@ page_table[page].dont_move = 0; } page_table[end_page - 1].bytes_used = length - PAGE_BYTES * (npages-1); - generations[GEN].bytes_allocated += length; + generations[gen].bytes_allocated += length; #if 0 /* fixme: do we need these? */ bytes_allocated += length; - generations[GEN].cum_sum_bytes_allocated += length; + generations[gen].cum_sum_bytes_allocated += length; #endif if (last_free_page < end_page)

1 0