X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcode%2Ferror.lisp;h=0e663cf57225df24c877367a294c17dae8d79ab7;hb=9b1fade83db8453b75b8c7380eb12ce41b5b889c;hp=1cf2c8ee57aaefb32357d17562e1889d3c4638f1;hpb=d564ccae6f79c4423b3d8f8dd1af59844fea6ac2;p=sbcl.git

diff --git a/src/code/error.lisp b/src/code/error.lisp
index 1cf2c8e..0e663cf 100644
--- a/src/code/error.lisp
+++ b/src/code/error.lisp
@@ -165,8 +165,24 @@
                  *heap-exhausted-error-requested-bytes*)
          (print-unreadable-object (condition stream))))))
 
-(define-condition memory-fault-error (error)
-  ((address :initarg :address :reader memory-fault-error-address))
+(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)
-     (format stream "Memory fault in address #x~X" (memory-fault-error-address condition)))))
+     (format stream "Interactive interrupt at #x~X."
+             (system-condition-address condition)))))