Changeset 6344 for branches/x8664-call


Ignore:
Timestamp:
Apr 23, 2007, 11:14:31 AM (13 years ago)
Author:
gb
Message:

Back out of the "delta" stuff: probably more confusing that way.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/x8664-call/ccl/compiler/X86/x86-disassemble.lisp

    r6336 r6344  
    5858                             :adjustable t))
    5959  (symbolic-names ())
    60   (delta 0)
    6160)
    6261
     
    26062605  (let* ((label (label-x86-lap-expression-label exp))
    26072606         (name (x86-lap-label-name label))
    2608          (entry (x86-ds-entry-point ds))
    2609          (delta (x86-ds-delta ds)))
     2607         (entry (x86-ds-entry-point ds)))
    26102608    `(":^" , (if (typep name 'fixnum)
    2611             (format nil "L~d" (+ delta (- name entry)))
     2609            (format nil "L~d" (- name entry))
    26122610            name))))
    26132611
     
    26482646                                    ds)
    26492647  (let* ((addr (x86::x86-label-operand-label op))
    2650          (entrypoint (x86-ds-entry-point ds))
    2651          (delta (x86-ds-delta ds)))
    2652     (format nil "L~d" (+ delta (- addr entrypoint)))))
     2648         (entrypoint (x86-ds-entry-point ds)))
     2649    (format nil "L~d" (- addr entrypoint))))
    26532650
    26542651
     
    27072704(defun x86-print-disassembled-instruction (ds instruction seq)
    27082705  (let* ((addr (x86-di-address instruction))
    2709          (entry (x86-ds-entry-point ds))
    2710          (delta (x86-ds-delta ds)))
     2706         (entry (x86-ds-entry-point ds)))
    27112707    (when (x86-di-labeled instruction)
    2712       (format t "~&L~d~&" (+ delta (- addr entry)))
     2708      (format t "~&L~d~&" (- addr entry))
    27132709      (setq seq 0))
    27142710    (dolist (p (x86-di-prefixes instruction))
     
    27262722    (format t ")")
    27272723    (unless (zerop seq) ;(when (oddp seq)
    2728       (format t "~50t;[~d]" (+ delta (- addr entry))))
     2724      (format t "~50t;[~d]" (- addr entry)))
    27292725    (format t "~%")
    27302726    (1+ seq)))
     
    27412737              :code-pointer 0           ; for next-u32 below
    27422738              :symbolic-names symbolic-names
    2743               :pending-labels (list 7)
    2744               :delta x8664::fulltag-function))
     2739              :pending-labels (list 7)))
    27452740         (blocks (x86-ds-blocks ds)))
    27462741    (setf (x86-ds-code-limit ds)
Note: See TracChangeset for help on using the changeset viewer.