Changeset 6295 for branches

Timestamp:

Apr 18, 2007, 2:18:30 AM (18 years ago)

Author:

Gary Byers

Message:

Do the right/obvious thing for memory addresses of the form (@ (: ^{label) (% rip)).}

Location:

branches/x8664-call/ccl/compiler/X86

Files:

• x86-asm.lisp (modified) (1 diff)
• x86-lap.lisp (modified) (2 diffs)

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

@@ -656 +656 @@
            (setq memtype
                  (logior (encode-operand-type :disp32s)
+                         (encode-operand-type :label)
                          (logandc2 memtype (encode-operand-type :disp)))))
           (t

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

@@ -916 +916 @@
          (when disp
            (let* ((optype (x86::x86-instruction-extra insn))
-                  (val (early-x86-lap-expression-value disp)))
+                  (pcrel (and (logtest (x86::encode-operand-type :label) optype)
+                              (typep disp 'label-x86-lap-expression)))
+                  (val (unless pcrel (early-x86-lap-expression-value disp))))
              (if (null val)
                ;; We can do better job here, but (for now)
@@ -922 +924 @@
                (let* ((frag (frag-list-current frag-list))
                       (pos (frag-list-position frag-list)))
-                 (push (make-reloc :type :expr32
-                                   :arg disp
+                 (push (make-reloc :type (if pcrel :branch32 :expr32)
+                                   :arg (if pcrel (label-x86-lap-expression-label disp) disp)
                                    :frag frag
                                    :pos pos)