Changeset 15016

Timestamp:

Oct 11, 2011, 5:17:38 PM (13 years ago)

Author:

Gary Byers

Message:

In ARM2-AREF3 and ARM2-ASET3, be more careful about finding a node
register that doesn't conflict with the unscaled indice variables
when the index is constant. (Those variables are null in that case.)

I'm not sure that we ever verify that the array's dimensions are what
they're declared to be on ARM or elsewhere. We should probably do
this check under normal safety.

File:

• trunk/source/compiler/ARM/arm2.lisp (modified) (2 diffs)

trunk/source/compiler/ARM/arm2.lisp

@@ -1842 +1842 @@
           (when safe      
             (when (typep safe 'fixnum)
-              (with-node-target (src unscaled-i unscaled-j unscaled-k val-reg) expected
+              (let* ((expected (if constidx
+                                 (with-node-target (src val-reg) expected
+                                   expected)
+                                 (with-node-target (src unscaled-i unscaled-j unscaled-k val-reg) expected
+                                   expected))))
                 (! lri expected (ash (dpb safe target::arrayH.flags-cell-subtag-byte
                                           (ash 1 $arh_simple_bit))
@@ -1949 +1953 @@
       (when safe        
         (when (typep safe 'fixnum)
-          (with-node-target (src unscaled-i unscaled-j unscaled-k) expected
+          (let* ((expected (if constidx
+                             (with-node-target (src) expected
+                               expected)
+                             (with-node-target (src unscaled-i unscaled-j unscaled-k) expected
+                               expected))))
             (! lri expected (ash (dpb safe target::arrayH.flags-cell-subtag-byte
                                       (ash 1 $arh_simple_bit))