X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finterr.lisp;h=2ff5f81b3e4208a382cf5f84747d3445d80c79df;hb=6c129930bd75f25a66aa0cbf0e5bc8091401d5ce;hp=231992db337a6072264581d362ab3e76708dc4d1;hpb=e0814eee6f6dea52db010b45a330100f2fe65832;p=sbcl.git

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index 231992d..2ff5f81 100644
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -62,7 +62,7 @@
 (deferr unknown-error (&rest args)
   (error "unknown error:~{ ~S~})" args))
 
-(deferr object-not-function-error (object)
+(deferr object-not-fun-error (object)
   (error 'type-error
 	 :datum object
 	 :expected-type 'function))
@@ -173,23 +173,18 @@
 	 :datum object
 	 :expected-type 'symbol))
 
-(deferr undefined-symbol-error (fdefn-or-symbol)
+(deferr undefined-fun-error (fdefn-or-symbol)
   (error 'undefined-function
 	 :name (etypecase fdefn-or-symbol
 		 (symbol fdefn-or-symbol)
 		 (fdefn (fdefn-name fdefn-or-symbol)))))
 
-(deferr object-not-coerceable-to-function-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type 'coerceable-to-function))
-
-(deferr invalid-argument-count-error (nargs)
+(deferr invalid-arg-count-error (nargs)
   (error 'simple-program-error
 	 :format-control "invalid number of arguments: ~S"
 	 :format-arguments (list nargs)))
 
-(deferr bogus-argument-to-values-list-error (list)
+(deferr bogus-arg-to-values-list-error (list)
   (error 'simple-type-error
 	 :datum list
 	 :expected-type 'list
@@ -221,7 +216,7 @@
 	 :format-control "attempt to THROW to a tag that does not exist: ~S"
 	 :format-arguments (list tag)))
 
-(deferr nil-function-returned-error (function)
+(deferr nil-fun-returned-error (function)
   (error 'simple-control-error
 	 :format-control
 	 "A function with declared result type NIL returned:~%  ~S"
@@ -245,11 +240,11 @@
 	 :datum object
 	 :expected-type (layout-class layout)))
 
-(deferr odd-key-arguments-error ()
+(deferr odd-key-args-error ()
   (error 'simple-program-error
 	 :format-control "odd number of &KEY arguments"))
 
-(deferr unknown-key-argument-error (key-name)
+(deferr unknown-key-arg-error (key-name)
   (error 'simple-program-error
 	 :format-control "unknown &KEY argument: ~S"
 	 :format-arguments (list key-name)))
@@ -438,7 +433,7 @@
 
 ;;;; INTERNAL-ERROR signal handler
 
-(defvar *internal-error-arguments*)
+(defvar *internal-error-args*)
 
 (defun internal-error (context continuable)
   (declare (type system-area-pointer context))
@@ -452,8 +447,8 @@
 			  (sb!alien:sap-alien context (* os-context-t)))))
      (/show0 "about to bind ERROR-NUMBER and ARGUMENTS")
      (multiple-value-bind (error-number arguments)
-	 (sb!vm:internal-error-arguments alien-context)
-       (/show0 "back from INTERNAL-ERROR-ARGUMENTS, ERROR-NUMBER=..")
+	 (sb!vm:internal-error-args alien-context)
+       (/show0 "back from INTERNAL-ERROR-ARGS, ERROR-NUMBER=..")
        (/hexstr error-number)
        (/show0 "cold/low ARGUMENTS=..")
        (/hexstr arguments)
@@ -487,3 +482,13 @@
 				       arguments))))
 		 (t
 		  (funcall handler name fp alien-context arguments)))))))))
+
+(defun control-stack-exhausted-error ()
+  (let ((sb!debug:*stack-top-hint* nil))
+    (infinite-error-protect
+     (format *error-output*
+	     "Control stack guard page temporarily disabled: proceed with caution~%")
+     (error 'control-stack-exhausted))))
+
+
+