Index: /trunk/source/compiler/X86/x86-disassemble.lisp
===================================================================
--- /trunk/source/compiler/X86/x86-disassemble.lisp	(revision 13027)
+++ /trunk/source/compiler/X86/x86-disassemble.lisp	(revision 13028)
@@ -2774,19 +2774,4 @@
       (out stream expr))))
 
-(defun x86-print-bare-disassembled-instruction (ds instruction)
-  (dolist (p (x86-di-prefixes instruction))
-    (format t "~&  (~a)~%" p))
-  (format t "  (~a" (x86-di-mnemonic instruction))
-  (let* ((op0 (x86-di-op0 instruction))
-         (op1 (x86-di-op1 instruction))
-         (op2 (x86-di-op2 instruction)))
-    (when op0
-      (write-x86-lap-operand t op0 ds)
-      (when op1
-        (write-x86-lap-operand t op1 ds)
-        (when op2
-          (write-x86-lap-operand t op2 ds)))))
-  (format t ")"))
-
 (defvar *previous-source-note*)
 
@@ -2808,5 +2793,17 @@
       (setq seq 0))
     (format t "~&  [~D]~8T" pc)
-    (x86-print-bare-disassembled-instruction ds instruction)
+    (dolist (p (x86-di-prefixes instruction))
+      (format t "~&  (~a)~%" p))
+    (format t "  (~a" (x86-di-mnemonic instruction))
+    (let* ((op0 (x86-di-op0 instruction))
+	   (op1 (x86-di-op1 instruction))
+	   (op2 (x86-di-op2 instruction)))
+      (when op0
+	(write-x86-lap-operand t op0 ds)
+	(when op1
+	  (write-x86-lap-operand t op1 ds)
+	  (when op2
+	    (write-x86-lap-operand t op2 ds)))))
+    (format t ")")
     (format t "~%")
     (1+ seq)))