X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcompiler%2Ftarget-disassem.lisp;h=51b4bcbc66774f6e4b400af70647aed26a6dd65a;hb=4aa82530da00c41e2751671ac75eda2d19a173a0;hp=c634cda8642e6180517ec6ccb789151289f5ea12;hpb=5eb97830eca716fef626c6e12429c99c9b97e3c8;p=sbcl.git

diff --git a/src/compiler/target-disassem.lisp b/src/compiler/target-disassem.lisp
index c634cda..51b4bcb 100644
--- a/src/compiler/target-disassem.lisp
+++ b/src/compiler/target-disassem.lisp
@@ -726,15 +726,15 @@
 
     (when (null plen)
       (setf plen location-column-width)
-      (set-location-printing-range dstate
-				  (seg-virtual-location (dstate-segment dstate))
-				  (seg-length (dstate-segment dstate))))
+      (let ((seg (dstate-segment dstate)))
+	(set-location-printing-range dstate
+				     (seg-virtual-location seg)
+				     (seg-length seg))))
     (when (eq (dstate-output-state dstate) :beginning)
       (setf plen location-column-width))
 
     (fresh-line stream)
 
-    ;; MNA: compiler message patch
     (setf location-column-width (+ 2 location-column-width))
     (princ "; " stream)
 
@@ -784,7 +784,6 @@
   (with-print-restrictions
     (dolist (note (dstate-notes dstate))
       (format stream "~Vt; " *disassem-note-column*)
-      ;; MNA: compiler message patch
       (pprint-logical-block (stream nil :per-line-prefix "; ")
       (etypecase note
 	(string
@@ -1788,7 +1787,7 @@
 
 ;;; routines to find things in the Lisp environment
 
-(defconstant groked-symbol-slots
+(defparameter *grokked-symbol-slots*
   (sort `((,sb!vm:symbol-value-slot . symbol-value)
 	  (,sb!vm:symbol-plist-slot . symbol-plist)
 	  (,sb!vm:symbol-name-slot . symbol-name)
@@ -1808,7 +1807,7 @@ symbol object that we know about.")
   (declare (type address address))
   (if (not (aligned-p address sb!vm:word-bytes))
       (values nil nil)
-      (do ((slots-tail groked-symbol-slots (cdr slots-tail)))
+      (do ((slots-tail *grokked-symbol-slots* (cdr slots-tail)))
 	  ((null slots-tail)
 	   (values nil nil))
 	(let* ((field (car slots-tail))