Fixes for ARM/ARM64/MIPS parallel move resolver.

runtime/vm/locations.h

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #ifndef VM_LOCATIONS_H_
 #define VM_LOCATIONS_H_
 
 #include "vm/allocation.h"
 #include "vm/assembler.h"
 #include "vm/bitfield.h"
@@ skipping 265 matching lines @@
     return static_cast<intptr_t>(payload());
   }
 
   static uword EncodeStackIndex(intptr_t stack_index) {
     ASSERT((-kStackIndexBias <= stack_index) &&
            (stack_index < kStackIndexBias));
     return static_cast<uword>(kStackIndexBias + stack_index);
   }
 
   // Spill slots.
-  static Location StackSlot(intptr_t stack_index) {
-    uword payload = EncodeStackIndex(stack_index);
+  static Location StackSlot(intptr_t stack_index,
+                            Register base = FPREG) {
+    uword payload = StackSlotBaseField::encode(base)
+        | StackIndexField::encode(EncodeStackIndex(stack_index));
     Location loc(kStackSlot, payload);
     // Ensure that sign is preserved.
     ASSERT(loc.stack_index() == stack_index);
     return loc;
   }
 
   bool IsStackSlot() const {
     return kind() == kStackSlot;
   }
 
   static Location DoubleStackSlot(intptr_t stack_index) {
-    uword payload = EncodeStackIndex(stack_index);
+    uword payload = StackSlotBaseField::encode(FPREG)
+        | StackIndexField::encode(EncodeStackIndex(stack_index));
     Location loc(kDoubleStackSlot, payload);
     // Ensure that sign is preserved.
     ASSERT(loc.stack_index() == stack_index);
     return loc;
   }
 
   bool IsDoubleStackSlot() const {
     return kind() == kDoubleStackSlot;
   }
 
   static Location QuadStackSlot(intptr_t stack_index) {
-    uword payload = EncodeStackIndex(stack_index);
+    uword payload = StackSlotBaseField::encode(FPREG)
+        | StackIndexField::encode(EncodeStackIndex(stack_index));
     Location loc(kQuadStackSlot, payload);
     // Ensure that sign is preserved.
     ASSERT(loc.stack_index() == stack_index);
     return loc;
   }
 
   bool IsQuadStackSlot() const {
     return kind() == kQuadStackSlot;
   }
 
+  Register base_reg() const {
+    ASSERT(HasStackIndex());
+    return StackSlotBaseField::decode(payload());
+  }
+
   intptr_t stack_index() const {
     ASSERT(HasStackIndex());
     // Decode stack index manually to preserve sign.
-    return payload() - kStackIndexBias;
+    return StackIndexField::decode(payload()) - kStackIndexBias;
   }
 
   bool HasStackIndex() const {
     return IsStackSlot() || IsDoubleStackSlot() || IsQuadStackSlot();
   }
 
   // Return a memory operand for stack slot locations.
   Address ToStackSlotAddress() const;
 
   // Returns the offset from the frame pointer for stack slot locations.
@@ skipping 35 matching lines @@
     return PayloadField::decode(value_);
   }
 
   typedef BitField<Kind, 0, kBitsForKind> KindField;
   typedef BitField<uword, kBitsForKind, kBitsForPayload> PayloadField;
 
   // Layout for kUnallocated locations payload.
   typedef BitField<Policy, 0, 3> PolicyField;
 
   // Layout for stack slots.
+  static const intptr_t kBitsForBaseReg = 5;

[zra, 2014/09/04 16:05:39]

It looks like the base reg can only ever be FPREG or SPREG. Not sure if it makes
sense to encode this differently. Thoughts?

[Florian Schneider, 2014/09/04 16:17:24]

It seems the most straight-forward to encode the register directly, and 5 bits
(32 registers) is the maximum needed for all platforms, but it leaves only 23
bits for the index on ia32.

But yes, for this 1 bit would be enough. Not sure if it is worth to change it
for now.

+  static const intptr_t kBitsForStackIndex = kBitsForPayload - kBitsForBaseReg;
+  typedef BitField<Register, 0, kBitsForBaseReg> StackSlotBaseField;
+  typedef BitField<intptr_t,
+                   kBitsForBaseReg,
+                   kBitsForStackIndex> StackIndexField;
+  COMPILE_ASSERT(1 << kBitsForBaseReg >= kNumberOfCpuRegisters);
+
   static const intptr_t kStackIndexBias =
-      static_cast<intptr_t>(1) << (kBitsForPayload - 1);
+      static_cast<intptr_t>(1) << (kBitsForStackIndex - 1);
 
   // Location either contains kind and payload fields or a tagged handle for
   // a constant locations. Values of enumeration Kind are selected in such a
   // way that none of them can be interpreted as a kConstant tag.
   uword value_;
 };
 
 
 class PairLocation : public ZoneAllocated {
  public:
@@ skipping 259 matching lines @@
 
 #if defined(DEBUG)
   intptr_t writable_inputs_;
 #endif
 };
 
 
 }  // namespace dart
 
 #endif  // VM_LOCATIONS_H_