A64: Synchronize with r15204.

src/a64/code-stubs-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 4456 matching lines @@
   //  x1 : the function to call
   //  x2 : cache cell for the call target
   Label done;
 
   ASSERT_EQ(*TypeFeedbackCells::MegamorphicSentinel(masm->isolate()),
             masm->isolate()->heap()->undefined_value());
   ASSERT_EQ(*TypeFeedbackCells::UninitializedSentinel(masm->isolate()),
             masm->isolate()->heap()->the_hole_value());
 
   // Load the cache state.
-  __ Ldr(x3, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Ldr(x3, FieldMemOperand(x2, Cell::kValueOffset));
 
   // A monomorphic cache hit or an already megamorphic state: invoke the
   // function without changing the state.
   __ Cmp(x3, x1);
   __ B(eq, &done);
   __ JumpIfRoot(x3, Heap::kUndefinedValueRootIndex, &done);
 
   // A monomorphic miss (i.e, here the cache is not uninitialized) goes
   // megamorphic. MegamorphicSentinal is an immortal immovable object
   // (undefined) so no write-barrier is needed.
   Label skip_undef_store;
   __ JumpIfRoot(x3, Heap::kTheHoleValueRootIndex, &skip_undef_store);
   __ LoadRoot(ip0, Heap::kUndefinedValueRootIndex);
-  __ Str(ip0, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Str(ip0, FieldMemOperand(x2, Cell::kValueOffset));
   __ B(&done);
   __ Bind(&skip_undef_store);
 
   // An uninitialized cache is patched with the function.
-  __ Str(x1, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Str(x1, FieldMemOperand(x2, Cell::kValueOffset));
   // No need for a write barrier here - cells are rescanned.
 
   __ Bind(&done);
 }
 
 
 // TODO(jbramley): Don't use static registers here, but take them as arguments.
 static void GenerateRecordCallTarget(MacroAssembler* masm) {
   // Cache the called function in a global property cell. Cache states are
   // uninitialized, monomorphic (indicated by a JSFunction), and megamorphic.
   //  x1 : the function to call
   //  x2 : cache cell for the call target
   ASSERT(FLAG_optimize_constructed_arrays);
   Label initialize, done, miss, megamorphic, not_array_function;
 
   ASSERT_EQ(*TypeFeedbackCells::MegamorphicSentinel(masm->isolate()),
             masm->isolate()->heap()->undefined_value());
   ASSERT_EQ(*TypeFeedbackCells::UninitializedSentinel(masm->isolate()),
             masm->isolate()->heap()->the_hole_value());
 
   // Load the cache state.
-  __ Ldr(x3, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Ldr(x3, FieldMemOperand(x2, Cell::kValueOffset));
 
   // A monomorphic cache hit or an already megamorphic state: invoke the
   // function without changing the state.
   __ Cmp(x3, x1);
   __ B(eq, &done);
   __ JumpIfRoot(x3, Heap::kUndefinedValueRootIndex, &done);
 
   // Special handling of the Array() function, which caches not only the
   // monomorphic Array function but the initial ElementsKind with special
   // sentinels
@@ skipping 11 matching lines @@
 
   __ Bind(&miss);
 
   // A monomorphic miss (i.e, here the cache is not uninitialized) goes
   // megamorphic.
   __ JumpIfRoot(x3, Heap::kTheHoleValueRootIndex, &initialize);
   // MegamorphicSentinel is an immortal immovable object (undefined) so no
   // write-barrier is needed.
   __ Bind(&megamorphic);
   __ LoadRoot(x3, Heap::kUndefinedValueRootIndex);
-  __ Str(x3, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Str(x3, FieldMemOperand(x2, Cell::kValueOffset));
   __ B(&done);
 
   // An uninitialized cache is patched with the function or sentinel to
   // indicate the ElementsKind if function is the Array constructor.
   __ Bind(&initialize);
   // Make sure the function is the Array() function
   __ LoadArrayFunction(x3);
   __ Cmp(x1, x3);
   __ B(ne, &not_array_function);
 
   // The target function is the Array constructor, install a sentinel value in
   // the constructor's type info cell that will track the initial ElementsKind
   // that should be used for the array when its constructed.
   Handle<Object> initial_kind_sentinel =
       TypeFeedbackCells::MonomorphicArraySentinel(masm->isolate(),
           GetInitialFastElementsKind());
   __ Mov(x3, Operand(initial_kind_sentinel));
-  __ Str(x3, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Str(x3, FieldMemOperand(x2, Cell::kValueOffset));
   __ B(&done);
 
   __ Bind(&not_array_function);
   // An uninitialized cache is patched with the function.
-  __ Str(x1, FieldMemOperand(x2, JSGlobalPropertyCell::kValueOffset));
+  __ Str(x1, FieldMemOperand(x2, Cell::kValueOffset));
   // No need for a write barrier here - cells are rescanned.
 
   __ Bind(&done);
 }
 
 
 void CallFunctionStub::Generate(MacroAssembler* masm) {
   ASM_LOCATION("CallFunctionStub::Generate");
   // x1  function    the function to call
   // x2  cache_cell  cache cell for call target
@@ skipping 56 matching lines @@
 
   // Slow-case: Non-function called.
   __ Bind(&slow);
   if (RecordCallTarget()) {
     // If there is a call target cache, mark it megamorphic in the
     // non-function case. MegamorphicSentinel is an immortal immovable object
     // (undefined) so no write barrier is needed.
     ASSERT_EQ(*TypeFeedbackCells::MegamorphicSentinel(masm->isolate()),
               masm->isolate()->heap()->undefined_value());
     __ LoadRoot(x11, Heap::kUndefinedValueRootIndex);
-    __ Str(x11, FieldMemOperand(cache_cell,
-                                JSGlobalPropertyCell::kValueOffset));
+    __ Str(x11, FieldMemOperand(cache_cell, Cell::kValueOffset));
   }
   // Check for function proxy.
   // x10 : function type.
   __ Cmp(x10, JS_FUNCTION_PROXY_TYPE);
   __ B(ne, &non_function);
   __ Push(function);  // put proxy as additional argument
   __ Mov(x0, argc_ + 1);
   __ Mov(x2, 0);
   __ GetBuiltinEntry(x3, Builtins::CALL_FUNCTION_PROXY);
   __ SetCallKind(x5, CALL_AS_METHOD);
@@ skipping 1932 matching lines @@
 }
 
 
 void StoreArrayLiteralElementStub::Generate(MacroAssembler* masm) {
   // TODO(all): Possible optimisations in this function:
   // 1. Merge CheckFastElements and CheckFastSmiElements, so that the map
   //    bitfield is loaded only once.
   // 2. Refactor the Ldr/Add sequence at the start of fast_elements and
   //    smi_element.
 
-  // x0   value            element value to store
-  // x1   array            array literal
-  // x2   array_map        map of array literal
-  // x3   index_smi        element index as smi
-  // x4   array_index_smi  array literal index in function as smi
+  // x0     value            element value to store
+  // x3     index_smi        element index as smi
+  // sp[0]  array_index_smi  array literal index in function as smi
+  // sp[1]  array            array literal
 
   Register value = x0;
+  Register index_smi = x3;
+
   Register array = x1;
   Register array_map = x2;
-  Register index_smi = x3;
   Register array_index_smi = x4;
+  // TODO(jbramley): Implement PeekPair and use it here.
+  __ Peek(array, 1 * kPointerSize);
+  __ Peek(array_index_smi, 0 * kPointerSize);
+  __ Ldr(array_map, FieldMemOperand(array, JSObject::kMapOffset));
 
   Label double_elements, smi_element, fast_elements, slow_elements;
   __ CheckFastElements(array_map, x10, &double_elements);
   __ JumpIfSmi(value, &smi_element);
   __ CheckFastSmiElements(array_map, x10, &fast_elements);
 
   // Store into the array literal requires an elements transition. Call into
   // the runtime.
   __ Bind(&slow_elements);
   __ Push(array, index_smi, value);
@@ skipping 531 matching lines @@
     // Initial map for the builtin Array function should be a map.
     __ Ldr(x10, FieldMemOperand(constructor,
                                 JSFunction::kPrototypeOrInitialMapOffset));
     // Will both indicate a NULL and a Smi.
     __ JumpIfSmi(x10, &unexpected_map);
     __ JumpIfObjectType(x10, x10, x11, MAP_TYPE, &map_ok);
     __ Bind(&unexpected_map);
     __ Abort("Unexpected initial map for Array function");
     __ Bind(&map_ok);
 
-    // In type_info_cell, we expect either undefined or a valid
-    // JSGlobalPropertyCell.
+    // In type_info_cell, we expect either undefined or a valid Cell.
     Label okay_here;
-    Handle<Map> global_property_cell_map(
-        masm->isolate()->heap()->global_property_cell_map());
+    Handle<Map> cell_map(masm->isolate()->heap()->global_property_cell_map());
     __ CompareAndBranch(type_info_cell, Operand(undefined_sentinel),
                         eq, &okay_here);
-    __ Ldr(x10, FieldMemOperand(type_info_cell,
-                                JSGlobalPropertyCell::kMapOffset));
-    __ Cmp(x10, Operand(global_property_cell_map));
+    __ Ldr(x10, FieldMemOperand(type_info_cell, Cell::kMapOffset));
+    __ Cmp(x10, Operand(cell_map));
     __ Assert(eq, "Expected property cell in type_info_cell");
     __ Bind(&okay_here);
   }
 
   if (FLAG_optimize_constructed_arrays) {
     Register kind = x3;
     Label no_info, switch_ready;
     // Get the elements kind and case on that.
     __ CompareAndBranch(type_info_cell, Operand(undefined_sentinel),
                         eq, &no_info);
-    __ Ldr(kind, FieldMemOperand(type_info_cell,
-                                 JSGlobalPropertyCell::kValueOffset));
+    __ Ldr(kind, FieldMemOperand(type_info_cell, PropertyCell::kValueOffset));
     __ JumpIfNotSmi(kind, &no_info);
     __ SmiUntag(kind);
     __ B(&switch_ready);
 
     __ Bind(&no_info);
     __ Mov(kind, GetInitialFastElementsKind());
     __ Bind(&switch_ready);
 
     if (argument_count_ == ANY) {
       Label zero_case, n_case;
@@ skipping 39 matching lines @@
 void InternalArrayConstructorStub::GenerateCase(
     MacroAssembler* masm, ElementsKind kind) {
   Label zero_case, n_case;
   Register argc = x0;
 
   __ Cbz(argc, &zero_case);
   __ CompareAndBranch(argc, 1, ne, &n_case);
 
   // One argument.
   if (IsFastPackedElementsKind(kind)) {
-    Label normal_sequence;
+    Label packed_case;
 
     // We might need to create a holey array; look at the first argument.
-    // TODO(jbramley): Is x3 significant? x10 is the convention in A64.
-    __ Peek(x3, 0);
-    __ Cbz(x3, &normal_sequence);
+    __ Peek(x10, 0);
+    __ Cbz(x10, &packed_case);
 
     InternalArraySingleArgumentConstructorStub
         stub1_holey(GetHoleyElementsKind(kind));
     __ TailCallStub(&stub1_holey);
 
-    __ Bind(&normal_sequence);
+    __ Bind(&packed_case);
   }
   InternalArraySingleArgumentConstructorStub stub1(kind);
   __ TailCallStub(&stub1);
 
   __ Bind(&zero_case);
   // No arguments.
   InternalArrayNoArgumentConstructorStub stub0(kind);
   __ TailCallStub(&stub0);
 
   __ Bind(&n_case);
@@ skipping 71 matching lines @@
     __ Jump(generic_construct_stub, RelocInfo::CODE_TARGET);
   }
 }
 
 
 #undef __
 
 } }  // namespace v8::internal
 
 #endif  // V8_TARGET_ARCH_A64