X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ferror.lisp;h=0e663cf57225df24c877367a294c17dae8d79ab7;hb=9b1fade83db8453b75b8c7380eb12ce41b5b889c;hp=6827435c5a252f20be10bb43a11e37c46b317bd7;hpb=54b330585ed41edeb93a289f0e59aec67fa9ded9;p=sbcl.git

diff --git a/src/code/error.lisp b/src/code/error.lisp
index 6827435..0e663cf 100644
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -165,9 +165,24 @@
                  *heap-exhausted-error-requested-bytes*)
          (print-unreadable-object (condition stream))))))
 
-(define-condition memory-fault-error (error)
-  ()
+(define-condition system-condition (condition)
+  ((address :initarg :address :reader system-condition-address :initform nil)
+   (context :initarg :context :reader system-condition-context :initform nil)))
+
+(define-condition memory-fault-error (system-condition error) ()
+  (:report
+   (lambda (condition stream)
+     (format stream "Unhandled memory fault at #x~X."
+             (system-condition-address condition)))))
+
+(define-condition breakpoint-error (system-condition error) ()
+  (:report
+   (lambda (condition stream)
+     (format stream "Unhandled breakpoint/trap at #x~X."
+             (system-condition-address condition)))))
+
+(define-condition interactive-interrupt (system-condition serious-condition) ()
   (:report
    (lambda (condition stream)
-     (declare (ignore condition))
-     (format stream "memory fault"))))
+     (format stream "Interactive interrupt at #x~X."
+             (system-condition-address condition)))))