[stubs] Further optimize Load/StoreGlobalViaContext stubs.

src/x64/code-stubs-x64.cc

 // Copyright 2013 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/v8.h"
 
 #if V8_TARGET_ARCH_X64
 
 #include "src/bootstrapper.h"
 #include "src/code-stubs.h"
@@ skipping 5018 matching lines @@
   GenerateCase(masm, FAST_HOLEY_ELEMENTS);
 
   __ bind(&fast_elements_case);
   GenerateCase(masm, FAST_ELEMENTS);
 }
 
 
 void LoadGlobalViaContextStub::Generate(MacroAssembler* masm) {
   Register context_reg = rsi;
   Register slot_reg = rbx;
-  Register name_reg = rcx;
   Register result_reg = rax;
   Label slow_case;
 
   // Go up context chain to the script context.
   for (int i = 0; i < depth(); ++i) {
     __ movp(rdi, ContextOperand(context_reg, Context::PREVIOUS_INDEX));
     context_reg = rdi;
   }
 
   // Load the PropertyCell value at the specified slot.
   __ movp(result_reg, ContextOperand(context_reg, slot_reg));
   __ movp(result_reg, FieldOperand(result_reg, PropertyCell::kValueOffset));
 
   // Check that value is not the_hole.
   __ CompareRoot(result_reg, Heap::kTheHoleValueRootIndex);
   __ j(equal, &slow_case, Label::kNear);
   __ Ret();
 
   // Fallback to the runtime.
   __ bind(&slow_case);
   __ Integer32ToSmi(slot_reg, slot_reg);
   __ PopReturnAddressTo(kScratchRegister);
   __ Push(slot_reg);
-  __ Push(name_reg);
   __ Push(kScratchRegister);
-  __ TailCallRuntime(Runtime::kLoadGlobalViaContext, 2, 1);
+  __ TailCallRuntime(Runtime::kLoadGlobalViaContext, 1, 1);
 }
 
 
 void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
   Register context_reg = rsi;
   Register slot_reg = rbx;
-  Register name_reg = rcx;
   Register value_reg = rax;
   Register cell_reg = r8;
   Register cell_details_reg = rdx;
   Register cell_value_reg = r9;
   Label fast_heapobject_case, fast_smi_case, slow_case;
 
   if (FLAG_debug_code) {
     __ CompareRoot(value_reg, Heap::kTheHoleValueRootIndex);
     __ Check(not_equal, kUnexpectedValue);
-    __ AssertName(name_reg);
   }
 
   // Go up context chain to the script context.
   for (int i = 0; i < depth(); ++i) {
     __ movp(rdi, ContextOperand(context_reg, Context::PREVIOUS_INDEX));
     context_reg = rdi;
   }
 
   // Load the PropertyCell at the specified slot.
   __ movp(cell_reg, ContextOperand(context_reg, slot_reg));
 
   // Load PropertyDetails for the cell (actually only the cell_type and kind).
   __ SmiToInteger32(cell_details_reg,
                     FieldOperand(cell_reg, PropertyCell::kDetailsOffset));
   __ andl(cell_details_reg,
           Immediate(PropertyDetails::PropertyCellTypeField::kMask |
                     PropertyDetails::KindField::kMask));
 
-
   // Check if PropertyCell holds mutable data.
   Label not_mutable_data;
   __ cmpl(cell_details_reg,
           Immediate(PropertyDetails::PropertyCellTypeField::encode(
                         PropertyCellType::kMutable) |
                     PropertyDetails::KindField::encode(kData)));
   __ j(not_equal, &not_mutable_data);
   __ JumpIfSmi(value_reg, &fast_smi_case);
   __ bind(&fast_heapobject_case);
   __ movp(FieldOperand(cell_reg, PropertyCell::kValueOffset), value_reg);
@@ skipping 58 matching lines @@
   __ movp(cell_value_map_reg,
           FieldOperand(cell_value_reg, HeapObject::kMapOffset));
   __ cmpp(cell_value_map_reg, FieldOperand(value_reg, HeapObject::kMapOffset));
   __ j(equal, &fast_heapobject_case);
 
   // Fallback to the runtime.
   __ bind(&slow_case);
   __ Integer32ToSmi(slot_reg, slot_reg);
   __ PopReturnAddressTo(kScratchRegister);
   __ Push(slot_reg);
-  __ Push(name_reg);
   __ Push(value_reg);
   __ Push(kScratchRegister);
   __ TailCallRuntime(is_strict(language_mode())
                          ? Runtime::kStoreGlobalViaContext_Strict
                          : Runtime::kStoreGlobalViaContext_Sloppy,
-                     3, 1);
+                     2, 1);
 }
 
 
 static int Offset(ExternalReference ref0, ExternalReference ref1) {
   int64_t offset = (ref0.address() - ref1.address());
   // Check that fits into int.
   DCHECK(static_cast<int>(offset) == offset);
   return static_cast<int>(offset);
 }
 
@@ skipping 385 matching lines @@
                            kStackSpace, nullptr, return_value_operand, NULL);
 }
 
 
 #undef __
 
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_TARGET_ARCH_X64