;; seem to add much value, and it takes a lot of space. Perhaps
;; we could do this dispatch with a big CASE statement instead?
(defun ,fn-name (name ,fp ,context ,sc-offsets)
- ;; FIXME: Perhaps put in OPTIMIZE declaration to make this
- ;; byte coded.
- ;;
;; FIXME: It would probably be good to do *STACK-TOP-HINT*
;; tricks to hide this internal error-handling logic from the
;; poor high level user, so his debugger tells him about
(handler-case
(let* ((*finding-name* t)
(frame (sb!di:frame-down (sb!di:frame-down (sb!di:top-frame))))
- (name (sb!di:debug-function-name
- (sb!di:frame-debug-function frame))))
+ (name (sb!di:debug-fun-name
+ (sb!di:frame-debug-fun frame))))
(sb!di:flush-frames-above frame)
(values name frame))
(error ()
nil)))))
(defun find-interrupted-name ()
+ (/show0 "entering FIND-INTERRUPTED-NAME")
(if *finding-name*
(values "<error finding interrupted name -- already finding name>" nil)
(handler-case
(let ((*finding-name* t))
+ (/show0 "in ordinary case")
(do ((frame (sb!di:top-frame) (sb!di:frame-down frame)))
((null frame)
+ (/show0 "null frame")
(values "<error finding interrupted name -- null frame>" nil))
+ (/show0 "at head of DO loop")
(when (and (sb!di::compiled-frame-p frame)
(sb!di::compiled-frame-escaped frame))
(sb!di:flush-frames-above frame)
- (return (values (sb!di:debug-function-name
- (sb!di:frame-debug-function frame))
+ (/show0 "returning from within DO loop")
+ (return (values (sb!di:debug-fun-name
+ (sb!di:frame-debug-fun frame))
frame)))))
(error ()
+ (/show0 "trapped ERROR")
(values "<error finding interrupted name -- trapped error>" nil))
(sb!di:debug-condition ()
+ (/show0 "trapped DEBUG-CONDITION")
(values "<error finding interrupted name -- trapped debug-condition>"
nil)))))
\f
;;;; INTERNAL-ERROR signal handler
(defun internal-error (context continuable)
- (declare (type system-area-pointer context) (ignore continuable))
+ (declare (type system-area-pointer context))
+ (declare (ignore continuable))
(/show0 "entering INTERNAL-ERROR, CONTEXT=..")
(/hexstr context)
(infinite-error-protect
- (let ((context (locally
- (declare (optimize (inhibit-warnings 3)))
- (sb!alien:sap-alien context (* os-context-t)))))
+ (/show0 "about to bind ALIEN-CONTEXT")
+ (let ((alien-context (locally
+ (declare (optimize (inhibit-warnings 3)))
+ (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 context)
+ (sb!vm:internal-error-arguments alien-context)
+ (/show0 "back from INTERNAL-ERROR-ARGUMENTS, ERROR-NUMBER=..")
+ (/hexstr error-number)
+ (/show0 "ARGUMENTS=..")
+ (/hexstr arguments)
(multiple-value-bind (name sb!debug:*stack-top-hint*)
(find-interrupted-name)
- (let ((fp (int-sap (sb!vm:context-register context
+ (/show0 "back from FIND-INTERRUPTED-NAME")
+ (let ((fp (int-sap (sb!vm:context-register alien-context
sb!vm::cfp-offset)))
(handler (and (< -1 error-number (length *internal-errors*))
(svref *internal-errors* error-number))))
(list error-number
(mapcar #'(lambda (sc-offset)
(sb!di::sub-access-debug-var-slot
- fp sc-offset context))
+ fp sc-offset alien-context))
arguments))))
((not (functionp handler))
(error 'simple-error
handler
(mapcar #'(lambda (sc-offset)
(sb!di::sub-access-debug-var-slot
- fp sc-offset context))
+ fp sc-offset alien-context))
arguments))))
(t
- (funcall handler name fp context arguments)))))))))
+ (funcall handler name fp alien-context arguments)))))))))