Changeset 6336

Timestamp:

Apr 22, 2007, 5:21:38 AM (18 years ago)

Author:

Gary Byers

Message:

Add delta to label gensyms, commented instruction addresses.
Use delta of x8664::fulltag-function on x8664.

File:

• branches/x8664-call/ccl/compiler/X86/x86-disassemble.lisp (modified) (6 diffs)

branches/x8664-call/ccl/compiler/X86/x86-disassemble.lisp

@@ -58 +58 @@
                              :adjustable t))
   (symbolic-names ())
+  (delta 0)
 )
 
@@ -2605 +2606 @@
   (let* ((label (label-x86-lap-expression-label exp))
          (name (x86-lap-label-name label))
-         (entry (x86-ds-entry-point ds)))
+         (entry (x86-ds-entry-point ds))
+         (delta (x86-ds-delta ds)))
     `(":^" , (if (typep name 'fixnum)
-            (format nil "L~d" (- name entry))
+            (format nil "L~d" (+ delta (- name entry)))
             name))))
 
@@ -2646 +2648 @@
                                     ds)
   (let* ((addr (x86::x86-label-operand-label op))
-         (entrypoint (x86-ds-entry-point ds)))
-    (format nil "L~d" (- addr entrypoint))))
+         (entrypoint (x86-ds-entry-point ds))
+         (delta (x86-ds-delta ds)))
+    (format nil "L~d" (+ delta (- addr entrypoint)))))
 
 
@@ -2704 +2707 @@
 (defun x86-print-disassembled-instruction (ds instruction seq)
   (let* ((addr (x86-di-address instruction))
-         (entry (x86-ds-entry-point ds)))
+         (entry (x86-ds-entry-point ds))
+         (delta (x86-ds-delta ds)))
     (when (x86-di-labeled instruction)
-      (format t "~&L~d~&" (- addr entry))
+      (format t "~&L~d~&" (+ delta (- addr entry)))
       (setq seq 0))
     (dolist (p (x86-di-prefixes instruction))
@@ -2722 +2726 @@
     (format t ")")
     (unless (zerop seq) ;(when (oddp seq)
-      (format t "~50t;[~d]" (- addr entry)))
+      (format t "~50t;[~d]" (+ delta (- addr entry))))
     (format t "~%")
     (1+ seq)))
@@ -2737 +2741 @@
               :code-pointer 0           ; for next-u32 below
               :symbolic-names symbolic-names
-              :pending-labels (list 7)))
+              :pending-labels (list 7)
+              :delta x8664::fulltag-function))
          (blocks (x86-ds-blocks ds)))
     (setf (x86-ds-code-limit ds)