Changeset 9580

Timestamp:

May 22, 2008, 4:11:31 PM (17 years ago)

Author:

R. Matthew Emerson

Message:

x862-fixnup-fwd-refs: update for x8632

x862-vref1: in the 32-bit value case, call x862-box-s32/x862-box-u32 on
the result value on x8632. (On x8664, 32-bit quantities always fit in
a fixnum.)

x862-set-float: get rid of an unnecessary with-add'l-imm-reg.

File:

• branches/ia32/compiler/X86/x862.lisp (modified) (7 diffs)

branches/ia32/compiler/X86/x862.lisp

@@ -757 +757 @@
   (make-uarray-1 subtype size t 0 nil nil nil nil t nil))
 
-;;; xxx x8632 changes?
 (defun x862-fixup-fwd-refs (afunc)
   (dolist (f (afunc-inner-functions afunc))
@@ -763 +762 @@
   (let ((fwd-refs (afunc-fwd-refs afunc)))
     (when fwd-refs
-      (let* ((native-x8664-functions #-x8664-target nil
-                                     #+x8664-target (eq *target-backend*
-                                                        *host-backend*))
-             (v (if native-x8664-functions
+      (let* ((native-x86-functions #-x86-target nil
+                                   #+x86-target (eq *target-backend*
+                                                    *host-backend*))
+             (v (if native-x86-functions
                   (function-to-function-vector (afunc-lfun afunc))
                   (afunc-lfun afunc)))
@@ -773 +772 @@
         (dolist (ref fwd-refs)
           (let* ((ref-fun (afunc-lfun ref)))
-            (do* ((i (if native-x8664-functions
+            (do* ((i (if native-x86-functions
                        (%function-code-words
                         (function-vector-to-function v))
@@ -1560 +1559 @@
          (:x8632 nil)
          (:x8664 t))
-      (! box-fixnum node-dest s32-src)  ;xxx might overflow on x8632
+      (! box-fixnum node-dest s32-src)
       (let* ((arg_z ($ *x862-arg-z*))
              (imm0 ($ *x862-imm0* :mode :s32)))
@@ -1676 +1675 @@
                           (if (eq type-keyword :simple-string)
                             (! u32->char target temp)
-                            (! box-fixnum target temp)))))))
+                            (target-arch-case
+                             (:x8632
+                              (if is-signed
+                                (x862-box-s32 seg target temp)
+                                (x862-box-u32 seg target temp)))
+                             (:x8664
+                              (! box-fixnum target temp)))))))))
              (with-imm-target () idx-reg
                (if index-known-fixnum
@@ -1699 +1704 @@
                           (if (eq type-keyword :simple-string)
                             (! u32->char target temp)
-                            (! box-fixnum target temp)))))))))
+                            (target-arch-case
+                             (:x8632 (if is-signed
+                                       (x862-box-s32 seg target temp)
+                                       (x862-box-u32 seg target temp)))
+                             (:x8664 (! box-fixnum target temp)))))))))))
           (is-8-bit
            (with-imm-target () temp
@@ -7841 +7850 @@
                         (with-additional-imm-reg ()
                           (with-imm-target (ptr-reg) (offset-reg :s32)
-                            (with-additional-imm-reg ()
-                              (with-imm-temps (ptr-reg) ()
-                                (x862-copy-register seg fp-reg rnew)
-                                (! fixnum->signed-natural offset-reg roffset)))
+                            (with-imm-temps (ptr-reg) ()
+                              (x862-copy-register seg fp-reg rnew)
+                              (! fixnum->signed-natural offset-reg roffset))
                             (if double-p
                               (! mem-set-double-float fp-reg ptr-reg offset-reg)