Changeset 13001

Timestamp:

Oct 12, 2009, 3:36:15 PM (15 years ago)

Author:

R. Matthew Emerson

Message:

New function X86-PRINT-BARE-DISASSEMBLED-INSTRUCTION, which factors
out from X86-PRINT-DISASSEMBLED-INSTRUCTION the printing of the
prefixes, mnemonic, and operands of a disassembled instruction.

File:

• trunk/source/compiler/X86/x86-disassemble.lisp (modified) (2 diffs)

trunk/source/compiler/X86/x86-disassemble.lisp

@@ -2758 +2758 @@
       (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*)
 
@@ -2777 +2792 @@
       (setq seq 0))
     (format t "~&  [~D]~8T" pc)
-    (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 ")")
+    (x86-print-bare-disassembled-instruction ds instruction)
     (format t "~%")
     (1+ seq)))