X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finterr.lisp;h=60959dad505cc3c69f25f7df4f0dfe0ee9514bd0;hb=310d5f86d736ecf9525711b087b04797c549879c;hp=24191be31f86f4a90ef59a03a46af0aac7543c6b;hpb=80304981972c91c1b3f3fca75f36dacf1fecf307;p=sbcl.git

diff --git a/src/code/interr.lisp b/src/code/interr.lisp
index 24191be..60959da 100644
--- a/src/code/interr.lisp
+++ b/src/code/interr.lisp
@@ -173,17 +173,12 @@
 	 :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-arg-count-error (nargs)
   (error 'simple-program-error
 	 :format-control "invalid number of arguments: ~S"
@@ -227,6 +222,10 @@
 	 "A function with declared result type NIL returned:~%  ~S"
 	 :format-arguments (list function)))
 
+(deferr nil-array-accessed-error (array)
+  (error 'nil-array-accessed-error
+	 :datum array :expected-type '(not (array nil))))
+
 (deferr division-by-zero-error (this that)
   (error 'division-by-zero
 	 :operation 'division
@@ -243,7 +242,7 @@
 (deferr layout-invalid-error (object layout)
   (error 'layout-invalid
 	 :datum object
-	 :expected-type (layout-class layout)))
+	 :expected-type (layout-classoid layout)))
 
 (deferr odd-key-args-error ()
   (error 'simple-program-error
@@ -255,10 +254,12 @@
 	 :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
@@ -275,6 +276,11 @@
 	 :datum object
 	 :expected-type '(unsigned-byte 32)))
 
+(deferr object-not-simple-array-nil-error (object)
+  (error 'type-error
+	 :datum object
+	 :expected-type '(simple-array nil (*))))
+
 (deferr object-not-simple-array-unsigned-byte-2-error (object)
   (error 'type-error
 	 :datum object
@@ -453,10 +459,17 @@
      (/show0 "about to bind ERROR-NUMBER and ARGUMENTS")
      (multiple-value-bind (error-number arguments)
 	 (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 +500,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))))
+
+
+