X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=contrib%2Fsb-aclrepl%2Fdebug.lisp;h=c42cff1cfb3f3e9e95b79f7f0833e289504a370f;hb=f7e3e709f7c2207f1923375942f7fb1c092f92b0;hp=2c96948b41cf8d5d605f0d640993d2d66f239666;hpb=01af9d7ee59a7427f9cc5c6f9fea41fe87851367;p=sbcl.git

diff --git a/contrib/sb-aclrepl/debug.lisp b/contrib/sb-aclrepl/debug.lisp
index 2c96948..c42cff1 100644
--- a/contrib/sb-aclrepl/debug.lisp
+++ b/contrib/sb-aclrepl/debug.lisp
@@ -6,22 +6,112 @@
 
 (cl:in-package :sb-aclrepl)
 
+;;; FIXME: These declaims violate package locks. Are they needed at
+;;; all? Seems not.
+#+ignore
+(declaim (special
+          sb-debug::*debug-command-level*
+          sb-debug::*real-stack-top* sb-debug::*stack-top*
+          sb-debug::*stack-top-hint* sb-debug::*current-frame*
+          sb-debug::*flush-debug-errors*))
+
+(defun debug-loop ()
+  (let* ((sb-debug::*debug-command-level* (1+ sb-debug::*debug-command-level*))
+         (sb-debug::*real-stack-top* (sb-di:top-frame))
+         (sb-debug::*stack-top* (or sb-debug::*stack-top-hint*
+                                    sb-debug::*real-stack-top*))
+         (sb-debug::*stack-top-hint* nil)
+         (sb-debug::*current-frame* sb-debug::*stack-top*)
+         (continuable (continuable-break-p)))
+    (handler-bind ((sb-di:debug-condition
+                    (lambda (condition)
+                      (princ condition sb-debug::*debug-io*)
+                      (sb-int:/show0 "handling d-c by THROWing DEBUG-LOOP-CATCHER")
+                      (throw 'debug-loop-catcher nil))))
+      (fresh-line)
+      ;;(sb-debug::print-frame-call sb-debug::*current-frame* :verbosity 2)
+      (loop ;; only valid to way to exit invoke-debugger is by a restart
+       (catch 'debug-loop-catcher
+         (handler-bind ((error (lambda (condition)
+                                 (when sb-debug::*flush-debug-errors*
+                                   (clear-input *debug-io*)
+                                   (princ condition)
+                                   ;; FIXME: Doing input on *DEBUG-IO*
+                                   ;; and output on T seems broken.
+                                   (format t
+                                           "~&error flushed (because ~
+                                             ~S is set)"
+                                          'sb-debug::*flush-debug-errors*)
+                                   (sb-int:/show0 "throwing DEBUG-LOOP-CATCHER")
+                                   (throw 'debug-loop-catcher nil)))))
+
+           (if (zerop *break-level*) ; restart added by SBCL
+               (repl :continuable continuable)
+               (let ((level *break-level*))
+                 (with-simple-restart
+                     (abort "~@<Reduce debugger level (to break level ~W).~@:>"
+                            level)
+                   (let ((sb-debug::*debug-restarts* (compute-restarts)))
+                     (repl :continuable continuable)))))))
+       (throw 'repl-catcher (values :debug :exit))
+       ))))
+
+
+(defun continuable-break-p ()
+  (when (eq 'continue
+            (restart-name (car (compute-restarts))))
+    t))
+
+#+ignore
+(when (boundp 'sb-debug::*debug-loop-fun*)
+  (setq sb-debug::*debug-loop-fun* #'debug-loop))
+
+(defun print-restarts ()
+  ;;  (format *output* "~&Restart actions (select using :continue)~%")
+  (format *standard-output* "~&Restart actions (select using :continue)~%")
+  (let ((restarts (compute-restarts)))
+    (dotimes (i (length restarts))
+      (format *standard-output* "~&~2D: ~A~%" i (nth i restarts)))))
+
+
+#+ignore
 (defun debugger (condition)
   "Enter the debugger."
-  (print "Entering debugger")
   (let ((old-hook *debugger-hook*))
     (when old-hook
       (let ((*debugger-hook* nil))
-	(funcall old-hook condition old-hook))))
+        (funcall old-hook condition old-hook))))
+  (%debugger condition))
 
-  (format t "~&Error: ~A~%" condition)
-  (format t "~&  [Condition type: ~A]~%" (type-of condition))
-  (format t "~%")
-  (format t "~&Restart actions (select using :continue)~%")
-  (let ((restarts (compute-restarts)))
-    (dotimes (i (length restarts))
-      (format t "~&~2D: ~A~%" i (nth i restarts)))
-    (new-break :restarts (cons condition restarts)))
-  (sb-impl::toplevel-repl nil))
+#+ignore
+(when (boundp 'sb-debug::*invoke-debugger-fun*)
+  (setq sb-debug::*invoke-debugger-fun* #'debugger))
+
+#+ignore
+(defun print-condition (condition)
+  (format *output* "~&Error: ~A~%" condition))
+
+#+ignore
+(defun print-condition-type (condition)
+  (format *output* "~&  [Condition type: ~A]~%" (type-of condition)))
+
+#+ignore
+(defun %debugger (condition)
+  (print-condition condition)
+  (print-condition-type condition)
+  (princ #\newline *output*)
+  (print-restarts)
+  (acldebug-loop))
+
+
+#+ignore
+(defun acldebug-loop ()
+  (let ((continuable (continuable-break-p)))
+    (if continuable
+        (aclrepl :continuable t)
+        (let ((level *break-level*))
+          (with-simple-restart
+              (abort "~@<Reduce debugger level (to debug level ~W).~@:>" level)
+            (loop
+             (repl)))))))
 
-;(setq sb-debug::*invoke-debugger-fun* #'debugger)