X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Finterr.lisp;h=2ca905099fd42e996720102bc6ca6e5a9c54fc67;hb=771b864c8f32af7734bc0550aeaf1539fc4df194;hp=02147a8139c52b5850723b242602ad76decf0979;hpb=dc5e3163fe667e2629c7769aa8cf2e501eeeefa6;p=sbcl.git diff --git a/src/code/interr.lisp b/src/code/interr.lisp index 02147a8..2ca9050 100644 --- a/src/code/interr.lisp +++ b/src/code/interr.lisp @@ -103,16 +103,6 @@ :datum object :expected-type 'simple-string)) -(deferr object-not-simple-bit-vector-error (object) - (error 'type-error - :datum object - :expected-type 'simple-bit-vector)) - -(deferr object-not-simple-vector-error (object) - (error 'type-error - :datum object - :expected-type 'simple-vector)) - (deferr object-not-fixnum-error (object) (error 'type-error :datum object @@ -128,6 +118,11 @@ :datum object :expected-type 'string)) +(deferr object-not-base-string-error (object) + (error 'type-error + :datum object + :expected-type 'base-string)) + (deferr object-not-bit-vector-error (object) (error 'type-error :datum object @@ -222,6 +217,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 @@ -238,7 +237,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 @@ -250,10 +249,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 @@ -270,76 +271,23 @@ :datum object :expected-type '(unsigned-byte 32))) -(deferr object-not-simple-array-unsigned-byte-2-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (unsigned-byte 2) (*)))) - -(deferr object-not-simple-array-unsigned-byte-4-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (unsigned-byte 4) (*)))) - -(deferr object-not-simple-array-unsigned-byte-8-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (unsigned-byte 8) (*)))) - -(deferr object-not-simple-array-unsigned-byte-16-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (unsigned-byte 16) (*)))) - -(deferr object-not-simple-array-unsigned-byte-32-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (unsigned-byte 32) (*)))) - -(deferr object-not-simple-array-signed-byte-8-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (signed-byte 8) (*)))) - -(deferr object-not-simple-array-signed-byte-16-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (signed-byte 16) (*)))) - -(deferr object-not-simple-array-signed-byte-30-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (signed-byte 30) (*)))) - -(deferr object-not-simple-array-signed-byte-32-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (signed-byte 32) (*)))) - -(deferr object-not-simple-array-single-float-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array single-float (*)))) - -(deferr object-not-simple-array-double-float-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array double-float (*)))) - -(deferr object-not-simple-array-complex-single-float-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (complex single-float) (*)))) - -(deferr object-not-simple-array-complex-double-float-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (complex double-float) (*)))) - -#!+long-float -(deferr object-not-simple-array-complex-long-float-error (object) - (error 'type-error - :datum object - :expected-type '(simple-array (complex long-float) (*)))) +(macrolet + ((define-simple-array-internal-errors () + `(progn + ,@(map 'list + (lambda (saetp) + `(deferr ,(symbolicate + "OBJECT-NOT-" + (sb!vm:saetp-primitive-type-name saetp) + "-ERROR") + (object) + (error 'type-error + :datum object + :expected-type '(simple-array + ,(sb!vm:saetp-specifier saetp) + (*))))) + sb!vm:*specialized-array-element-type-properties*)))) + (define-simple-array-internal-errors)) (deferr object-not-complex-error (object) (error 'type-error @@ -448,10 +396,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) @@ -488,6 +443,7 @@ (infinite-error-protect (format *error-output* "Control stack guard page temporarily disabled: proceed with caution~%") - (error "Control stack exhausted (no more space for function call frames). This is probably due to heavily nested or infinitely recursive function calls, or a tail call that SBCL cannot or has not optimized away.")))) + (error 'control-stack-exhausted)))) +