Changeset 16634


Ignore:
Timestamp:
Nov 3, 2015, 4:11:43 AM (5 years ago)
Author:
gb
Message:

print pc/aligned address of instruction in X86-PRINT-DI-LAP and X86-PRINT-DI-RAW.
make the aligned address account for the fulltag

bind *DISASSEMBLE-VERBOSE* to NIL in DISASSEMBLE-TO-FILE.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/compiler/X86/x86-disassemble.lisp

    r16633 r16634  
    28792879
    28802880(defun x86-print-di-lap (ds instruction tab-stop pc)
    2881   (let ((comment-start-offset 40))
     2881  (let ((comment-start-offset 40)
     2882        (apc (+ pc  (if (x86-ds-mode-64 ds) x8664::fulltag-function x8632::fulltag-misc))))
    28822883
    28832884    (unless (and (eq :nop (x86-di-flags instruction)) (not *x86-disassemble-print-nop*))
     
    28912892      (let* ((op0 (x86-di-op0 instruction))
    28922893             (op1 (x86-di-op1 instruction))
    2893              (op2 (x86-di-op2 instruction)))
     2894             (op2 (x86-di-op2 instruction))
     2895             )
    28942896        (when op0
    28952897          (write-x86-lap-operand t op0 ds)
     
    28982900            (when op2
    28992901              (write-x86-lap-operand t op2 ds)))))
    2900       (format t ")~vt;~8<[~D]~>" (+ comment-start-offset tab-stop) pc))
     2902      (format t ")~vt;~8<[~D/~D]~>" (+ comment-start-offset tab-stop) pc apc))
    29012903    (format t "~&")))
    29022904
     
    29102912         (nbytes (- iend istart))
    29112913         (code-vector (x86-ds-code-vector ds))
    2912          (byteidx istart))
    2913     (format t "~5@d: " pc)
     2914         (byteidx istart)
     2915         (apc (+ pc  (if (x86-ds-mode-64 ds) x8664::fulltag-function x8632::fulltag-misc))))
     2916    (format t "~5@d/~d: " pc apc)
    29142917    (dotimes (i (min nbytes 4))
    29152918      (format t "~(~2,'0x~) " (aref code-vector byteidx))
Note: See TracChangeset for help on using the changeset viewer.