Index: src/ia32/full-codegen-ia32.cc |
diff --git a/src/ia32/full-codegen-ia32.cc b/src/ia32/full-codegen-ia32.cc |
index e9f13c199eabfe3417987aecdfb87777d2fd71cd..e3669cf04d8a65ce7d8150de856d40fd04a8e5a7 100644 |
--- a/src/ia32/full-codegen-ia32.cc |
+++ b/src/ia32/full-codegen-ia32.cc |
@@ -1633,8 +1633,9 @@ void FullCodeGenerator::VisitObjectLiteral(ObjectLiteral* expr) { |
if (key->value()->IsInternalizedString()) { |
if (property->emit_store()) { |
VisitForAccumulatorValue(value); |
- __ mov(ecx, Immediate(key->value())); |
- __ mov(edx, Operand(esp, 0)); |
+ ASSERT(StoreIC::ValueRegister().is(eax)); |
+ __ mov(StoreIC::NameRegister(), Immediate(key->value())); |
+ __ mov(StoreIC::ReceiverRegister(), Operand(esp, 0)); |
CallStoreIC(key->LiteralFeedbackId()); |
PrepareForBailoutForId(key->id(), NO_REGISTERS); |
} else { |
@@ -2349,9 +2350,9 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) { |
case NAMED_PROPERTY: { |
__ push(eax); // Preserve value. |
VisitForAccumulatorValue(prop->obj()); |
- __ mov(edx, eax); |
- __ pop(eax); // Restore value. |
- __ mov(ecx, prop->key()->AsLiteral()->value()); |
+ __ Move(StoreIC::ReceiverRegister(), eax); |
+ __ pop(StoreIC::ValueRegister()); // Restore value. |
+ __ mov(StoreIC::NameRegister(), prop->key()->AsLiteral()->value()); |
CallStoreIC(); |
break; |
} |
@@ -2359,9 +2360,9 @@ void FullCodeGenerator::EmitAssignment(Expression* expr) { |
__ push(eax); // Preserve value. |
VisitForStackValue(prop->obj()); |
VisitForAccumulatorValue(prop->key()); |
- __ mov(ecx, eax); |
- __ pop(edx); // Receiver. |
- __ pop(eax); // Restore value. |
+ __ Move(KeyedStoreIC::NameRegister(), eax); |
+ __ pop(KeyedStoreIC::ReceiverRegister()); // Receiver. |
+ __ pop(KeyedStoreIC::ValueRegister()); // Restore value. |
Handle<Code> ic = strict_mode() == SLOPPY |
? isolate()->builtins()->KeyedStoreIC_Initialize() |
: isolate()->builtins()->KeyedStoreIC_Initialize_Strict(); |
@@ -2398,8 +2399,8 @@ void FullCodeGenerator::EmitVariableAssignment(Variable* var, |
Token::Value op) { |
if (var->IsUnallocated()) { |
// Global var, const, or let. |
- __ mov(ecx, var->name()); |
- __ mov(edx, GlobalObjectOperand()); |
+ __ mov(StoreIC::NameRegister(), var->name()); |
+ __ mov(StoreIC::ReceiverRegister(), GlobalObjectOperand()); |
CallStoreIC(); |
} else if (op == Token::INIT_CONST_LEGACY) { |
@@ -2470,8 +2471,8 @@ void FullCodeGenerator::EmitNamedPropertyAssignment(Assignment* expr) { |
// Record source code position before IC call. |
SetSourcePosition(expr->position()); |
- __ mov(ecx, prop->key()->AsLiteral()->value()); |
- __ pop(edx); |
+ __ mov(StoreIC::NameRegister(), prop->key()->AsLiteral()->value()); |
+ __ pop(StoreIC::ReceiverRegister()); |
CallStoreIC(expr->AssignmentFeedbackId()); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
context()->Plug(eax); |
@@ -2484,8 +2485,9 @@ void FullCodeGenerator::EmitKeyedPropertyAssignment(Assignment* expr) { |
// esp[0] : key |
// esp[kPointerSize] : receiver |
- __ pop(ecx); // Key. |
- __ pop(edx); |
+ __ pop(KeyedStoreIC::NameRegister()); // Key. |
+ __ pop(KeyedStoreIC::ReceiverRegister()); |
+ ASSERT(KeyedStoreIC::ValueRegister().is(eax)); |
// Record source code position before IC call. |
SetSourcePosition(expr->position()); |
Handle<Code> ic = strict_mode() == SLOPPY |
@@ -4332,8 +4334,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
} |
break; |
case NAMED_PROPERTY: { |
- __ mov(ecx, prop->key()->AsLiteral()->value()); |
- __ pop(edx); |
+ __ mov(StoreIC::NameRegister(), prop->key()->AsLiteral()->value()); |
+ __ pop(StoreIC::ReceiverRegister()); |
CallStoreIC(expr->CountStoreFeedbackId()); |
PrepareForBailoutForId(expr->AssignmentId(), TOS_REG); |
if (expr->is_postfix()) { |
@@ -4346,8 +4348,8 @@ void FullCodeGenerator::VisitCountOperation(CountOperation* expr) { |
break; |
} |
case KEYED_PROPERTY: { |
- __ pop(ecx); |
- __ pop(edx); |
+ __ pop(KeyedStoreIC::NameRegister()); |
+ __ pop(KeyedStoreIC::ReceiverRegister()); |
Handle<Code> ic = strict_mode() == SLOPPY |
? isolate()->builtins()->KeyedStoreIC_Initialize() |
: isolate()->builtins()->KeyedStoreIC_Initialize_Strict(); |