From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Mon, 4 Jul 2005 10:01:40 +0000 (+0000)
Subject: 0.9.2.19:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=1807d88b69d69a212fab127a049b3f8c8e011375;p=sbcl.git

0.9.2.19:
	Merge THS patch "Fix headerptr initialization for cheneygc"
	... use the dynamic space that's in use.
	... (this is in something called from ldb -- not surprising
		no-one noticed)
---

diff --git a/src/runtime/parse.c b/src/runtime/parse.c
index 8054641..d007193 100644
--- a/src/runtime/parse.c
+++ b/src/runtime/parse.c
@@ -258,15 +258,12 @@ static boolean lookup_symbol(char *name, lispobj *result)
     }
 
     /* Search dynamic space. */
-    headerptr = (lispobj *)DYNAMIC_SPACE_START;
-#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
-    count =
-	dynamic_space_free_pointer -
-	(lispobj *)DYNAMIC_SPACE_START;
+#ifndef LISP_FEATURE_GENCGC
+    headerptr = (lispobj *)current_dynamic_space;
+    count = dynamic_space_free_pointer - headerptr;
 #else
-    count =
-	(lispobj *)SymbolValue(ALLOCATION_POINTER,0) -
-	(lispobj *)DYNAMIC_SPACE_START;
+    headerptr = (lispobj *)DYNAMIC_SPACE_START;
+    count = ((lispobj *)SymbolValue(ALLOCATION_POINTER,0)) - headerptr;
 #endif
     if (search_for_symbol(name, &headerptr, &count)) {
         *result = make_lispobj(headerptr, OTHER_POINTER_LOWTAG);
diff --git a/version.lisp-expr b/version.lisp-expr
index 0a68216..8d7c6be 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.2.18"
+"0.9.2.19"