Index: src/full-codegen/mips/full-codegen-mips.cc |
diff --git a/src/full-codegen/mips/full-codegen-mips.cc b/src/full-codegen/mips/full-codegen-mips.cc |
index 4c03f3ecfac3eabb2d7b741e08940306fda75158..b2871b9e4682d495de80eed666ce9ef43d72fe9a 100644 |
--- a/src/full-codegen/mips/full-codegen-mips.cc |
+++ b/src/full-codegen/mips/full-codegen-mips.cc |
@@ -1163,12 +1163,9 @@ void FullCodeGenerator::EmitSetHomeObject(Expression* initializer, int offset, |
FeedbackVectorSlot slot) { |
DCHECK(NeedsHomeObject(initializer)); |
__ lw(StoreDescriptor::ReceiverRegister(), MemOperand(sp)); |
- __ li(StoreDescriptor::NameRegister(), |
- Operand(isolate()->factory()->home_object_symbol())); |
__ lw(StoreDescriptor::ValueRegister(), |
MemOperand(sp, offset * kPointerSize)); |
- EmitLoadStoreICSlot(slot); |
- CallStoreIC(); |
+ CallStoreIC(slot, isolate()->factory()->home_object_symbol()); |
} |
@@ -1177,12 +1174,9 @@ void FullCodeGenerator::EmitSetHomeObjectAccumulator(Expression* initializer, |
FeedbackVectorSlot slot) { |
DCHECK(NeedsHomeObject(initializer)); |
__ Move(StoreDescriptor::ReceiverRegister(), v0); |
- __ li(StoreDescriptor::NameRegister(), |
- Operand(isolate()->factory()->home_object_symbol())); |
__ lw(StoreDescriptor::ValueRegister(), |
MemOperand(sp, offset * kPointerSize)); |
- EmitLoadStoreICSlot(slot); |
- CallStoreIC(); |
+ CallStoreIC(slot, isolate()->factory()->home_object_symbol()); |
} |
@@ -1419,10 +1413,8 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
VisitForAccumulatorValue(value); |
__ mov(StoreDescriptor::ValueRegister(), result_register()); |
DCHECK(StoreDescriptor::ValueRegister().is(a0)); |
- __ li(StoreDescriptor::NameRegister(), Operand(key->value())); |
__ lw(StoreDescriptor::ReceiverRegister(), MemOperand(sp)); |
- EmitLoadStoreICSlot(property->GetSlot(0)); |
- CallStoreIC(); |
+ CallStoreIC(property->GetSlot(0), key->value()); |
PrepareForBailoutForId(key->id(), BailoutState::NO_REGISTERS); |
if (NeedsHomeObject(value)) { |
@@ -1620,8 +1612,7 @@ void FullCodeGenerator::VisitArrayLiteral(ArrayLiteral* expr) { |
__ li(StoreDescriptor::NameRegister(), Operand(Smi::FromInt(array_index))); |
__ lw(StoreDescriptor::ReceiverRegister(), MemOperand(sp, 0)); |
__ mov(StoreDescriptor::ValueRegister(), result_register()); |
- EmitLoadStoreICSlot(expr->LiteralFeedbackSlot()); |
- CallKeyedStoreIC(); |
+ CallKeyedStoreIC(expr->LiteralFeedbackSlot()); |
PrepareForBailoutForId(expr->GetIdForElement(array_index), |
BailoutState::NO_REGISTERS); |
@@ -2060,10 +2051,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, |
VisitForAccumulatorValue(prop->obj()); |
__ mov(StoreDescriptor::ReceiverRegister(), result_register()); |
PopOperand(StoreDescriptor::ValueRegister()); // Restore value. |
- __ li(StoreDescriptor::NameRegister(), |
- Operand(prop->key()->AsLiteral()->value())); |
- EmitLoadStoreICSlot(slot); |
- CallStoreIC(); |
+ CallStoreIC(slot, prop->key()->AsLiteral()->value()); |
break; |
} |
case NAMED_SUPER_PROPERTY: { |
@@ -2110,8 +2098,7 @@ void FullCodeGenerator::EmitAssignment(Expression* expr, |
__ mov(StoreDescriptor::NameRegister(), result_register()); |
PopOperands(StoreDescriptor::ValueRegister(), |
StoreDescriptor::ReceiverRegister()); |
- EmitLoadStoreICSlot(slot); |
- CallKeyedStoreIC(); |
+ CallKeyedStoreIC(slot); |
break; |
} |
} |
@@ -2137,10 +2124,8 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, Token::Value op, |
if (var->IsUnallocated()) { |
// Global var, const, or let. |
__ mov(StoreDescriptor::ValueRegister(), result_register()); |
- __ li(StoreDescriptor::NameRegister(), Operand(var->name())); |
__ LoadGlobalObject(StoreDescriptor::ReceiverRegister()); |
- EmitLoadStoreICSlot(slot); |
- CallStoreIC(); |
+ CallStoreIC(slot, var->name()); |
} else if (IsLexicalVariableMode(var->mode()) && op != Token::INIT) { |
DCHECK(!var->IsLookupSlot()); |
@@ -2209,11 +2194,8 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) { |
DCHECK(prop->key()->IsLiteral()); |
__ mov(StoreDescriptor::ValueRegister(), result_register()); |
- __ li(StoreDescriptor::NameRegister(), |
- Operand(prop->key()->AsLiteral()->value())); |
PopOperand(StoreDescriptor::ReceiverRegister()); |
- EmitLoadStoreICSlot(expr->AssignmentSlot()); |
- CallStoreIC(); |
+ CallStoreIC(expr->AssignmentSlot(), prop->key()->AsLiteral()->value()); |
PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
context()->Plug(v0); |
@@ -2261,8 +2243,7 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
StoreDescriptor::NameRegister()); |
DCHECK(StoreDescriptor::ValueRegister().is(a0)); |
- EmitLoadStoreICSlot(expr->AssignmentSlot()); |
- CallKeyedStoreIC(); |
+ CallKeyedStoreIC(expr->AssignmentSlot()); |
PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
context()->Plug(v0); |
@@ -3310,11 +3291,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
break; |
case NAMED_PROPERTY: { |
__ mov(StoreDescriptor::ValueRegister(), result_register()); |
- __ li(StoreDescriptor::NameRegister(), |
- Operand(prop->key()->AsLiteral()->value())); |
PopOperand(StoreDescriptor::ReceiverRegister()); |
- EmitLoadStoreICSlot(expr->CountSlot()); |
- CallStoreIC(); |
+ CallStoreIC(expr->CountSlot(), prop->key()->AsLiteral()->value()); |
PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
if (expr->is_postfix()) { |
if (!context()->IsEffect()) { |
@@ -3353,8 +3331,7 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
__ mov(StoreDescriptor::ValueRegister(), result_register()); |
PopOperands(StoreDescriptor::ReceiverRegister(), |
StoreDescriptor::NameRegister()); |
- EmitLoadStoreICSlot(expr->CountSlot()); |
- CallKeyedStoreIC(); |
+ CallKeyedStoreIC(expr->CountSlot()); |
PrepareForBailoutForId(expr->AssignmentId(), BailoutState::TOS_REGISTER); |
if (expr->is_postfix()) { |
if (!context()->IsEffect()) { |