X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftoplevel.lisp;h=3f5359470e4626c0ac6e50f2b2f117a0833f2425;hb=245101f127d61e28b9c864c720eb17973469a904;hp=3afa9ad6ccaf26e316189daeaac6d16952b34bb8;hpb=9c1a7443146bba92c2430689981bd46c66551c35;p=sbcl.git

diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp
index 3afa9ad..3f53594 100644
--- a/src/code/toplevel.lisp
+++ b/src/code/toplevel.lisp
@@ -88,7 +88,7 @@
 	 (error-error "Help! "
 		      *current-error-depth*
 		      " nested errors. "
-		      "KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.")
+		      "SB-KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.")
 	 t)
 	(t
 	 (/show0 "returning normally from INFINITE-ERROR-PROTECTOR")
@@ -115,7 +115,7 @@
 	  (error-error "Help! "
 		       *current-error-depth*
 		       " nested errors. "
-		       "KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.")
+		       "SB-KERNEL:*MAXIMUM-ERROR-DEPTH* exceeded.")
 	  (progn ,@forms)
 	  t)
 	 (t
@@ -173,7 +173,8 @@
   (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:fixnumize sb!vm:*control-stack-end*)
+	     sb!c:*backend-page-size*)))
     (labels
 	((scrub (ptr offset count)
 	   (declare (type system-area-pointer ptr)
@@ -205,7 +206,8 @@
 
   #!+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:fixnumize sb!vm:*control-stack-start*)
+			  sb!c:*backend-page-size*))
 	 (initial-offset (logand csp (1- bytes-per-scrub-unit))))
     (labels
 	((scrub (ptr offset count)