| Index: src/mips/code-stubs-mips.cc
|
| diff --git a/src/mips/code-stubs-mips.cc b/src/mips/code-stubs-mips.cc
|
| index cb6d67f3b551fe4c58250c2158e89c934fec1a41..5ebb70ed8bc6b41a73196ceb006bf8174733e854 100644
|
| --- a/src/mips/code-stubs-mips.cc
|
| +++ b/src/mips/code-stubs-mips.cc
|
| @@ -5273,7 +5273,6 @@ void InternalArrayConstructorStub::Generate(MacroAssembler* masm) {
|
| void LoadGlobalViaContextStub::Generate(MacroAssembler* masm) {
|
| Register context_reg = cp;
|
| Register slot_reg = a2;
|
| - Register name_reg = a3;
|
| Register result_reg = v0;
|
| Label slow_case;
|
|
|
| @@ -5286,8 +5285,7 @@ void LoadGlobalViaContextStub::Generate(MacroAssembler* masm) {
|
| // Load the PropertyCell value at the specified slot.
|
| __ sll(at, slot_reg, kPointerSizeLog2);
|
| __ Addu(at, at, Operand(context_reg));
|
| - __ Addu(at, at, Context::SlotOffset(0));
|
| - __ lw(result_reg, MemOperand(at));
|
| + __ lw(result_reg, ContextOperand(at, 0));
|
| __ lw(result_reg, FieldMemOperand(result_reg, PropertyCell::kValueOffset));
|
|
|
| // Check that value is not the_hole.
|
| @@ -5298,15 +5296,14 @@ void LoadGlobalViaContextStub::Generate(MacroAssembler* masm) {
|
| // Fallback to the runtime.
|
| __ bind(&slow_case);
|
| __ SmiTag(slot_reg);
|
| - __ Push(slot_reg, name_reg);
|
| - __ TailCallRuntime(Runtime::kLoadGlobalViaContext, 2, 1);
|
| + __ Push(slot_reg);
|
| + __ TailCallRuntime(Runtime::kLoadGlobalViaContext, 1, 1);
|
| }
|
|
|
|
|
| void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
|
| Register context_reg = cp;
|
| Register slot_reg = a2;
|
| - Register name_reg = a3;
|
| Register value_reg = a0;
|
| Register cell_reg = t0;
|
| Register cell_value_reg = t1;
|
| @@ -5316,7 +5313,6 @@ void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
|
| if (FLAG_debug_code) {
|
| __ LoadRoot(at, Heap::kTheHoleValueRootIndex);
|
| __ Check(ne, kUnexpectedValue, value_reg, Operand(at));
|
| - __ AssertName(name_reg);
|
| }
|
|
|
| // Go up context chain to the script context.
|
| @@ -5328,8 +5324,7 @@ void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
|
| // Load the PropertyCell at the specified slot.
|
| __ sll(at, slot_reg, kPointerSizeLog2);
|
| __ Addu(at, at, Operand(context_reg));
|
| - __ Addu(at, at, Context::SlotOffset(0));
|
| - __ lw(cell_reg, MemOperand(at));
|
| + __ lw(cell_reg, ContextOperand(at, 0));
|
|
|
| // Load PropertyDetails for the cell (actually only the cell_type and kind).
|
| __ lw(cell_details_reg,
|
| @@ -5413,11 +5408,11 @@ void StoreGlobalViaContextStub::Generate(MacroAssembler* masm) {
|
| // Fallback to the runtime.
|
| __ bind(&slow_case);
|
| __ SmiTag(slot_reg);
|
| - __ Push(slot_reg, name_reg, value_reg);
|
| + __ Push(slot_reg, value_reg);
|
| __ TailCallRuntime(is_strict(language_mode())
|
| ? Runtime::kStoreGlobalViaContext_Strict
|
| : Runtime::kStoreGlobalViaContext_Sloppy,
|
| - 3, 1);
|
| + 2, 1);
|
| }
|
|
|
|
|
|
|