From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Thu, 8 May 2003 11:17:24 +0000 (+0000)
Subject: 0.8alpha.0.18:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=9c1a7443146bba92c2430689981bd46c66551c35;p=sbcl.git

0.8alpha.0.18:
	Some minor package alterations:
	... export CONTROL-STACK-POINTER-VALID-P from SB!VM;
	... along with new *{BINDING,CONTROL}-STACK-FOO* to replace old
		non-asterisked versions;
	make CONTROL-STACK-POINTER-VALID-P not style-warn on each use.
---

diff --git a/package-data-list.lisp-expr b/package-data-list.lisp-expr
index 4234d03..51c5434 100644
--- a/package-data-list.lisp-expr
+++ b/package-data-list.lisp-expr
@@ -2008,8 +2008,9 @@ structure representations"
              "SYMBOL-HASH-SLOT" "SYMBOL-HEADER-WIDETAG" "SYMBOL-NAME-SLOT"
              "SYMBOL-PACKAGE-SLOT" "SYMBOL-PLIST-SLOT"
              "SYMBOL-SIZE" "SYMBOL-UNUSED-SLOT" "SYMBOL-VALUE-SLOT"
-             "BINDING-STACK-START" "BINDING-STACK-END" 
-             "CONTROL-STACK-START" "CONTROL-STACK-END"
+             "*BINDING-STACK-START*"
+             "*CONTROL-STACK-START*" "*CONTROL-STACK-END*"
+	     "CONTROL-STACK-POINTER-VALID-P"
              "DYNAMIC-SPACE-START" "DYNAMIC-SPACE-END"
 	     #!+c-stack-is-control-stack "ALTERNATE-SIGNAL-STACK-START"
 	     #!-gencgc "DYNAMIC-0-SPACE-START" 
diff --git a/src/code/debug-int.lisp b/src/code/debug-int.lisp
index 9dbacc8..a7ce184 100644
--- a/src/code/debug-int.lisp
+++ b/src/code/debug-int.lisp
@@ -527,14 +527,15 @@
 #!-sb-fluid (declaim (inline control-stack-pointer-valid-p))
 (defun control-stack-pointer-valid-p (x)
   (declare (type system-area-pointer x))
-  (let* ((control-stack-start
-	  (descriptor-sap sb!vm::*control-stack-start*))
+  (let* (#!-stack-grows-downward-not-upward
+	 (control-stack-start
+	  (descriptor-sap *control-stack-start*))
+	 #!+stack-grows-downward-not-upward
 	 (control-stack-end
-	  (descriptor-sap sb!vm::*control-stack-end*)))
+	  (descriptor-sap *control-stack-end*)))
     #!-stack-grows-downward-not-upward
     (and (sap< x (current-sp))
-	 (sap<= control-stack-start
-		x)
+	 (sap<= control-stack-start x)
 	 (zerop (logand (sap-int x) #b11)))
     #!+stack-grows-downward-not-upward
     (and (sap>= x (current-sp))
diff --git a/src/code/gc.lisp b/src/code/gc.lisp
index 9566365..3bcc1d9 100644
--- a/src/code/gc.lisp
+++ b/src/code/gc.lisp
@@ -52,14 +52,14 @@
 (defun control-stack-usage ()
   #!-stack-grows-downward-not-upward
   (- (sb!sys:sap-int (sb!c::control-stack-pointer-sap))
-     (sb!vm:fixnumize sb!vm::*control-stack-start*))
+     (sb!vm:fixnumize sb!vm:*control-stack-start*))
   #!+stack-grows-downward-not-upward
-  (- (sb!vm:fixnumize sb!vm::*control-stack-end*)
+  (- (sb!vm:fixnumize sb!vm:*control-stack-end*)
      (sb!sys:sap-int (sb!c::control-stack-pointer-sap))))
 
 (defun binding-stack-usage ()
   (- (sb!sys:sap-int (sb!c::binding-stack-pointer-sap))
-     (sb!vm:fixnumize sb!vm::*binding-stack-start*)))
+     (sb!vm:fixnumize sb!vm:*binding-stack-start*)))
 
 ;;;; ROOM
 
diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp
index 1fc56c9..3afa9ad 100644
--- a/src/code/toplevel.lisp
+++ b/src/code/toplevel.lisp
@@ -173,7 +173,7 @@
   (let* ((csp (sap-int (sb!c::control-stack-pointer-sap)))
 	 (initial-offset (logand csp (1- bytes-per-scrub-unit)))
 	 (end-of-stack
-	  (- sb!vm::*control-stack-end* sb!c:*backend-page-size*)))
+	  (- sb!vm:*control-stack-end* sb!c:*backend-page-size*)))
     (labels
 	((scrub (ptr offset count)
 	   (declare (type system-area-pointer ptr)
@@ -205,7 +205,7 @@
 
   #!+stack-grows-downward-not-upward
   (let* ((csp (sap-int (sb!c::control-stack-pointer-sap)))
-	 (end-of-stack (+ sb!vm::*control-stack-start* sb!c:*backend-page-size*))
+	 (end-of-stack (+ sb!vm:*control-stack-start* sb!c:*backend-page-size*))
 	 (initial-offset (logand csp (1- bytes-per-scrub-unit))))
     (labels
 	((scrub (ptr offset count)
diff --git a/version.lisp-expr b/version.lisp-expr
index dc89546..e9db82d 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.8alpha.0.17"
+"0.8alpha.0.18"