Revision: 24570
Author: [email protected]
Date: Mon Oct 13 19:28:25 2014 UTC
Log: MIPS: Support for super assignments in for..in.
Port r24560 (ef1070b)
BUG=v8:3330
LOG=N
[email protected]
Review URL: https://codereview.chromium.org/641803003
https://code.google.com/p/v8/source/detail?r=24570
Modified:
/branches/bleeding_edge/src/mips/full-codegen-mips.cc
/branches/bleeding_edge/src/mips64/full-codegen-mips64.cc
=======================================
--- /branches/bleeding_edge/src/mips/full-codegen-mips.cc Fri Oct 10
13:22:10 2014 UTC
+++ /branches/bleeding_edge/src/mips/full-codegen-mips.cc Mon Oct 13
19:28:25 2014 UTC
@@ -2492,16 +2492,8 @@
void FullCodeGenerator::EmitAssignment(Expression* expr) {
DCHECK(expr->IsValidReferenceExpression());
- // Left-hand side can only be a property, a global or a (parameter or
local)
- // slot.
- enum LhsKind { VARIABLE, NAMED_PROPERTY, KEYED_PROPERTY };
- LhsKind assign_type = VARIABLE;
Property* prop = expr->AsProperty();
- if (prop != NULL) {
- assign_type = (prop->key()->IsPropertyName())
- ? NAMED_PROPERTY
- : KEYED_PROPERTY;
- }
+ LhsKind assign_type = GetAssignType(prop);
switch (assign_type) {
case VARIABLE: {
@@ -2520,6 +2512,42 @@
CallStoreIC();
break;
}
+ case NAMED_SUPER_PROPERTY: {
+ __ Push(v0);
+ VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
+ EmitLoadHomeObject(prop->obj()->AsSuperReference());
+ // stack: value, this; v0: home_object
+ Register scratch = a2;
+ Register scratch2 = a3;
+ __ mov(scratch, result_register()); // home_object
+ __ lw(v0, MemOperand(sp, kPointerSize)); // value
+ __ lw(scratch2, MemOperand(sp, 0)); // this
+ __ sw(scratch2, MemOperand(sp, kPointerSize)); // this
+ __ sw(scratch, MemOperand(sp, 0)); // home_object
+ // stack: this, home_object; v0: value
+ EmitNamedSuperPropertyStore(prop);
+ break;
+ }
+ case KEYED_SUPER_PROPERTY: {
+ __ Push(v0);
+ VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
+ EmitLoadHomeObject(prop->obj()->AsSuperReference());
+ __ Push(result_register());
+ VisitForAccumulatorValue(prop->key());
+ Register scratch = a2;
+ Register scratch2 = a3;
+ __ lw(scratch2, MemOperand(sp, 2 * kPointerSize)); // value
+ // stack: value, this, home_object; v0: key, a3: value
+ __ lw(scratch, MemOperand(sp, kPointerSize)); // this
+ __ sw(scratch, MemOperand(sp, 2 * kPointerSize));
+ __ lw(scratch, MemOperand(sp, 0)); // home_object
+ __ sw(scratch, MemOperand(sp, kPointerSize));
+ __ sw(v0, MemOperand(sp, 0));
+ __ Move(v0, scratch2);
+ // stack: this, home_object, key; v0: value.
+ EmitKeyedSuperPropertyStore(prop);
+ break;
+ }
case KEYED_PROPERTY: {
__ push(result_register()); // Preserve value.
VisitForStackValue(prop->obj());
=======================================
--- /branches/bleeding_edge/src/mips64/full-codegen-mips64.cc Fri Oct 10
16:17:10 2014 UTC
+++ /branches/bleeding_edge/src/mips64/full-codegen-mips64.cc Mon Oct 13
19:28:25 2014 UTC
@@ -2489,16 +2489,8 @@
void FullCodeGenerator::EmitAssignment(Expression* expr) {
DCHECK(expr->IsValidReferenceExpression());
- // Left-hand side can only be a property, a global or a (parameter or
local)
- // slot.
- enum LhsKind { VARIABLE, NAMED_PROPERTY, KEYED_PROPERTY };
- LhsKind assign_type = VARIABLE;
Property* prop = expr->AsProperty();
- if (prop != NULL) {
- assign_type = (prop->key()->IsPropertyName())
- ? NAMED_PROPERTY
- : KEYED_PROPERTY;
- }
+ LhsKind assign_type = GetAssignType(prop);
switch (assign_type) {
case VARIABLE: {
@@ -2517,6 +2509,42 @@
CallStoreIC();
break;
}
+ case NAMED_SUPER_PROPERTY: {
+ __ Push(v0);
+ VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
+ EmitLoadHomeObject(prop->obj()->AsSuperReference());
+ // stack: value, this; v0: home_object
+ Register scratch = a2;
+ Register scratch2 = a3;
+ __ mov(scratch, result_register()); // home_object
+ __ lw(v0, MemOperand(sp, kPointerSize)); // value
+ __ lw(scratch2, MemOperand(sp, 0)); // this
+ __ sw(scratch2, MemOperand(sp, kPointerSize)); // this
+ __ sw(scratch, MemOperand(sp, 0)); // home_object
+ // stack: this, home_object; v0: value
+ EmitNamedSuperPropertyStore(prop);
+ break;
+ }
+ case KEYED_SUPER_PROPERTY: {
+ __ Push(v0);
+ VisitForStackValue(prop->obj()->AsSuperReference()->this_var());
+ EmitLoadHomeObject(prop->obj()->AsSuperReference());
+ __ Push(result_register());
+ VisitForAccumulatorValue(prop->key());
+ Register scratch = a2;
+ Register scratch2 = a3;
+ __ lw(scratch2, MemOperand(sp, 2 * kPointerSize)); // value
+ // stack: value, this, home_object; v0: key, a3: value
+ __ lw(scratch, MemOperand(sp, kPointerSize)); // this
+ __ sw(scratch, MemOperand(sp, 2 * kPointerSize));
+ __ lw(scratch, MemOperand(sp, 0)); // home_object
+ __ sw(scratch, MemOperand(sp, kPointerSize));
+ __ sw(v0, MemOperand(sp, 0));
+ __ Move(v0, scratch2);
+ // stack: this, home_object, key; v0: value.
+ EmitKeyedSuperPropertyStore(prop);
+ break;
+ }
case KEYED_PROPERTY: {
__ push(result_register()); // Preserve value.
VisitForStackValue(prop->obj());
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
