0.8.21.28:

[sbcl.git] / src / compiler / target-disassem.lisp

diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp
index 69e24fa..e89b02c 100644 (file)
--- a/src/compiler/target-disassem.lisp
+++ b/src/compiler/target-disassem.lisp
@@ -530,6 +530,7 @@
                 (cond ((null inst)
                        (handle-bogus-instruction stream dstate))
                       (t
+                        (setf (dstate-inst-properties dstate) nil)
                        (setf (dstate-next-offs dstate)
                              (+ (dstate-cur-offs dstate)
                                 (inst-length inst)))
@@ -542,15 +543,16 @@
                            
                            ;; print any instruction bytes recognized by the prefilter which calls read-suffix
                            ;; and updates next-offs
-                           (let ((suffix-len (- (dstate-next-offs dstate) orig-next)))
-                             (when (plusp suffix-len)
-                               (print-inst suffix-len stream dstate :offset (inst-length inst) :trailing-space nil))
+                           (when stream
+                             (let ((suffix-len (- (dstate-next-offs dstate) orig-next)))
+                               (when (plusp suffix-len)
+                                 (print-inst suffix-len stream dstate :offset (inst-length inst) :trailing-space nil))
                              (dotimes (i (- *disassem-inst-column-width* (* 2 (+ (inst-length inst) suffix-len))))
                                (write-char #\space stream)))
-                           (write-char #\space stream)
-                           
+                             (write-char #\space stream))
+                             
                            (funcall function chunk inst)
-                           
+                             
                            (setf prefix-p (null (inst-printer inst)))
                            
                            (when control