Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1:/tmp/cvs-serv11446/src/code
Modified Files:
debug-int.lisp toplevel.lisp gc.lisp
Log Message:
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.
Index: debug-int.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/debug-int.lisp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- debug-int.lisp 3 Apr 2003 18:27:11 -0000 1.70
+++ debug-int.lisp 8 May 2003 11:17:25 -0000 1.71
@@ -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))
Index: toplevel.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/toplevel.lisp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- toplevel.lisp 3 May 2003 18:22:57 -0000 1.45
+++ toplevel.lisp 8 May 2003 11:17:25 -0000 1.46
@@ -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)
Index: gc.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/gc.lisp,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- gc.lisp 5 May 2003 23:27:07 -0000 1.45
+++ gc.lisp 8 May 2003 11:17:25 -0000 1.46
@@ -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
|