Changeset 13022

Timestamp:

Oct 15, 2009, 2:50:30 AM (11 years ago)

Author:

rme

Message:

Super-fancy print-object method for an x86-disassembled-instruction.

File:

• trunk/source/compiler/X86/x86-disassemble.lisp (modified) (1 diff)

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

@@ -36 +36 @@
 (defmethod print-object ((xdi x86-disassembled-instruction) stream)
   (print-unreadable-object (xdi stream :type t :identity t)
-    (format stream "~a" (x86-di-mnemonic xdi))))
+    (dolist (p (x86-di-prefixes xdi))
+      (format stream "(~a) " p))
+    (format stream "(~a" (x86-di-mnemonic xdi))
+    (let* ((op0 (x86-di-op0 xdi))
+           (op1 (x86-di-op1 xdi))
+           (op2 (x86-di-op2 xdi))
+           (ds (make-x86-disassembly-state :mode-64 #+x8664-target t
+                                                    #+x8632-target nil
+                                           :code-vector nil
+                                           :code-pointer 0)))
+      (when op0
+        (write-x86-lap-operand stream op0 ds)
+        (when op1
+          (write-x86-lap-operand stream op1 ds)
+          (when op2
+            (write-x86-lap-operand stream op2 ds)))))
+    (format stream ")")))
 
 (defstruct (x86-disassembly-state (:conc-name x86-ds-))