Changeset 14036

Timestamp:

Jul 24, 2010, 11:35:09 PM (9 years ago)

Author:

gb

Message:

Better ISTRUCT-TYPEP; other small changes.

File:

• branches/arm/compiler/ARM/arm2.lisp (modified) (8 diffs)

branches/arm/compiler/ARM/arm2.lisp

@@ -120 +120 @@
 (defvar *arm2-woi* nil)
 (defvar *arm2-open-code-inline* nil)
+(defvar *arm2-optimize-for-space* nil)
 (defvar *arm2-register-restore-count* 0)
 (defvar *arm2-register-restore-ea* nil)
@@ -360 +361 @@
            (*next-lcell-id* -1)
            (*arm2-open-code-inline* nil)
+           (*arm2-optimize-for-space* nil)
            (*arm2-register-restore-count* nil)
            (*arm2-compiler-register-save-label* nil)
@@ -1154 +1156 @@
 
 
-
+(defun arm2-register-for-frame-offset (offset &optional suggested)
+  (let* ((mask *arm2-gpr-locations-valid-mask*)
+         (info *arm2-gpr-locations*))
+    (if (and suggested
+             (logbitp suggested mask)
+             (memq offset (svref info suggested)))
+      suggested
+      (dotimes (reg 16)
+        (when (and (logbitp reg mask)
+                   (memq offset (svref info reg)))
+          (return reg))))))
+
+  
 
 
@@ -1163 +1177 @@
            (mask *arm2-gpr-locations-valid-mask*)
            (info *arm2-gpr-locations*)
-           (regno (%hard-regspec-value reg)))
-      (unless (and (logbitp regno mask)
-                   (memq offset (svref info regno)))
-        (let* ((other (dotimes (i 16)
-                        (when (and (logbitp i mask)
-                                   (memq offset (svref info i)))
-                          (return i)))))
-          (cond (other
+           (regno (%hard-regspec-value reg))
+           (other (arm2-register-for-frame-offset offset regno)))
+      (unless (eql regno other)
+        (cond (other
                  (let* ((vinsn (! copy-node-gpr reg other)))
                    (setq *arm2-gpr-locations-valid-mask*
@@ -1182 +1192 @@
                          (logior mask (ash 1 regno)))
                    (setf (svref info regno) (list offset))
-                   vinsn))))))))
+                   vinsn)))))))
 
 (defun arm2-lcell-to-register (seg lcell reg)
@@ -2326 +2336 @@
   ; tradeoff.
   (with-arm-local-vinsn-macros (seg)
+    (if *arm2-optimize-for-space*
+      (if jump-p
+        (! jump-known-symbol-ool)
+        (! call-known-symbol-ool))
       (if jump-p
         (! jump-known-symbol)
-        (! call-known-symbol arm::arg_z))))
+        (! call-known-symbol arm::arg_z)))))
 
 ;;; Nargs = nil -> multiple-value case.
@@ -4825 +4839 @@
        (setf (vinsn-label-info lab) (arm::emit-lap-label header lab))))))
 
+
 (defun arm2-expand-vinsns (header current sections)
   (do-dll-nodes (v header)
@@ -5472 +5487 @@
   (multiple-value-bind (cr-bit true-p) (acode-condition-to-arm-cr-bit cc)
     (multiple-value-bind (r1 r2) (arm2-two-untargeted-reg-forms seg form arm::arg_y type arm::arg_z)
-      (with-imm-target  () (target :signed-natural)
-        (! istruct-typep target r1 r2)
-        (arm2-test-reg-%izerop seg vreg xfer target cr-bit true-p 0)))))
+      (! istruct-type r1 r1)
+      (arm2-compare-registers seg vreg xfer r1 r2 cr-bit true-p))))
 
 (pushnew (%nx1-operator lisptag) *arm2-operator-supports-u8-target*)