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

diff --git a/src/code/toplevel.lisp b/src/code/toplevel.lisp
index d1df348..3f53594 100644
--- a/src/code/toplevel.lisp
+++ b/src/code/toplevel.lisp
@@ -46,7 +46,7 @@
 ;;; by QUIT) is caught and any final processing and return codes are
 ;;; handled appropriately.
 (defmacro handling-end-of-the-world (&body body)
-  (let ((caught (gensym "CAUGHT")))
+  (with-unique-names (caught)
     `(let ((,caught (catch '%end-of-the-world
 		      (/show0 "inside CATCH '%END-OF-THE-WORLD")
 		      ,@body)))
@@ -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)