A64: Synchronize with r17807.

src/a64/macro-assembler-a64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 3631 matching lines @@
 
   ldr(scratch, FieldMemOperand(scratch, token_offset));
   ldr(Tmp0(), FieldMemOperand(Tmp0(), token_offset));
   cmp(scratch, Tmp0());
   b(miss, ne);
 
   bind(&same_contexts);
 }
 
 
+// Compute the hash code from the untagged key. This must be kept in sync with
+// ComputeIntegerHash in utils.h and KeyedLoadGenericElementStub in
+// code-stub-hydrogen.cc
 void MacroAssembler::GetNumberHash(Register key, Register scratch) {
   ASSERT(!AreAliased(key, scratch));
 
   // Xor original key with a seed.
   LoadRoot(scratch, Heap::kHashSeedRootIndex);
   Eor(key, key, Operand::UntagSmi(scratch));
 
   // The algorithm uses 32-bit integer values.
   key = key.W();
   scratch = scratch.W();
@@ skipping 34 matching lines @@
   SmiUntag(scratch0, key);
   GetNumberHash(scratch0, scratch1);
 
   // Compute the capacity mask.
   Ldrsw(scratch1,
         UntagSmiFieldMemOperand(elements,
                                 SeededNumberDictionary::kCapacityOffset));
   Sub(scratch1, scratch1, 1);
 
   // Generate an unrolled loop that performs a few probes before giving up.
-  static const int kProbes = 4;
-  for (int i = 0; i < kProbes; i++) {
+  for (int i = 0; i < kNumberDictionaryProbes; i++) {
     // Compute the masked index: (hash + i + i * i) & mask.
     if (i > 0) {
       Add(scratch2, scratch0, SeededNumberDictionary::GetProbeOffset(i));
     } else {
       Mov(scratch2, scratch0);
     }
     And(scratch2, scratch2, scratch1);
 
     // Scale the index by multiplying by the element size.
     ASSERT(SeededNumberDictionary::kEntrySize == 3);
     Add(scratch2, scratch2, Operand(scratch2, LSL, 1));
 
     // Check if the key is identical to the name.
     Add(scratch2, elements, Operand(scratch2, LSL, kPointerSizeLog2));
     Ldr(scratch3,
         FieldMemOperand(scratch2,
                         SeededNumberDictionary::kElementsStartOffset));
     Cmp(key, scratch3);
-    if (i != kProbes - 1) {
+    if (i != (kNumberDictionaryProbes - 1)) {
       B(eq, &done);
     } else {
       B(ne, miss);
     }
   }
 
   Bind(&done);
   // Check that the value is a normal property.
   const int kDetailsOffset =
       SeededNumberDictionary::kElementsStartOffset + 2 * kPointerSize;
@@ skipping 1021 matching lines @@
   }
 }
 
 
 #undef __
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64