X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finterr.lisp;h=4ee10eef89819d77785c7aca40d462273a925071;hb=5bf4a6a677c80a71dfa31b5c9c374f986594392f;hp=143784d4e851af3bdfcac59da203d5a9d0f1a452;hpb=d40a76606c86722b0aef8179155f9f2840739b72;p=sbcl.git

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index 143784d..4ee10ee 100644
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -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-fun-error (object)
-  (error 'type-error
-	 :datum object
-	 :expected-type 'coerceable-to-fun))
-
-(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
@@ -245,20 +240,22 @@
 	 :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)))
 
 (deferr invalid-array-index-error (array bound index)
-  (error 'simple-error
+  (error 'simple-type-error
 	 :format-control
 	 "invalid array index ~W for ~S (should be nonnegative and <~W)"
-	 :format-arguments (list index array bound)))
+	 :format-arguments (list index array bound)
+	 :datum index
+	 :expected-type `(integer 0 (,bound))))
 
 (deferr object-not-simple-array-error (object)
   (error 'type-error
@@ -438,7 +435,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,11 +449,18 @@
 			  (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)
+
+       ;; There's a limit to how much error reporting we can usefully
+       ;; do before initialization is complete, but try to be a little
+       ;; bit helpful before we die.
+       (/show0 "back from INTERNAL-ERROR-ARGS, ERROR-NUMBER=..")
        (/hexstr error-number)
        (/show0 "cold/low ARGUMENTS=..")
        (/hexstr arguments)
+       (unless *cold-init-complete-p*
+	 (%primitive print "can't recover from error in cold init, halting")
+	 (%primitive sb!c:halt))
 
        (multiple-value-bind (name sb!debug:*stack-top-hint*)
 	   (find-interrupted-name)
@@ -487,3 +491,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))))
+
+
+