Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Side by Side Diff: src/arm/full-codegen-arm.cc

Issue 397973002: Rename [Load/Delete]ContextSlot for consistency after r22379. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | src/arm64/full-codegen-arm64.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 the V8 project authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "src/v8.h" 5 #include "src/v8.h"
6 6
7 #if V8_TARGET_ARCH_ARM 7 #if V8_TARGET_ARCH_ARM
8 8
9 #include "src/code-stubs.h" 9 #include "src/code-stubs.h"
10 #include "src/codegen.h" 10 #include "src/codegen.h"
(...skipping 1550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 1561
1562 case Variable::LOOKUP: { 1562 case Variable::LOOKUP: {
1563 Comment cmnt(masm_, "[ Lookup variable"); 1563 Comment cmnt(masm_, "[ Lookup variable");
1564 Label done, slow; 1564 Label done, slow;
1565 // Generate code for loading from variables potentially shadowed 1565 // Generate code for loading from variables potentially shadowed
1566 // by eval-introduced variables. 1566 // by eval-introduced variables.
1567 EmitDynamicLookupFastCase(var, NOT_INSIDE_TYPEOF, &slow, &done); 1567 EmitDynamicLookupFastCase(var, NOT_INSIDE_TYPEOF, &slow, &done);
1568 __ bind(&slow); 1568 __ bind(&slow);
1569 __ mov(r1, Operand(var->name())); 1569 __ mov(r1, Operand(var->name()));
1570 __ Push(cp, r1); // Context and name. 1570 __ Push(cp, r1); // Context and name.
1571 __ CallRuntime(Runtime::kLoadContextSlot, 2); 1571 __ CallRuntime(Runtime::kLoadLookupSlot, 2);
1572 __ bind(&done); 1572 __ bind(&done);
1573 context()->Plug(r0); 1573 context()->Plug(r0);
1574 } 1574 }
1575 } 1575 }
1576 } 1576 }
1577 1577
1578 1578
1579 void FullCodeGenerator::VisitRegExpLiteral(RegExpLiteral* expr) { 1579 void FullCodeGenerator::VisitRegExpLiteral(RegExpLiteral* expr) {
1580 Comment cmnt(masm_, "[ RegExpLiteral"); 1580 Comment cmnt(masm_, "[ RegExpLiteral");
1581 Label materialized; 1581 Label materialized;
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
2763 // by eval-introduced variables. 2763 // by eval-introduced variables.
2764 EmitDynamicLookupFastCase(proxy->var(), NOT_INSIDE_TYPEOF, &slow, &done); 2764 EmitDynamicLookupFastCase(proxy->var(), NOT_INSIDE_TYPEOF, &slow, &done);
2765 } 2765 }
2766 2766
2767 __ bind(&slow); 2767 __ bind(&slow);
2768 // Call the runtime to find the function to call (returned in r0) 2768 // Call the runtime to find the function to call (returned in r0)
2769 // and the object holding it (returned in edx). 2769 // and the object holding it (returned in edx).
2770 ASSERT(!context_register().is(r2)); 2770 ASSERT(!context_register().is(r2));
2771 __ mov(r2, Operand(proxy->name())); 2771 __ mov(r2, Operand(proxy->name()));
2772 __ Push(context_register(), r2); 2772 __ Push(context_register(), r2);
2773 __ CallRuntime(Runtime::kLoadContextSlot, 2); 2773 __ CallRuntime(Runtime::kLoadLookupSlot, 2);
2774 __ Push(r0, r1); // Function, receiver. 2774 __ Push(r0, r1); // Function, receiver.
2775 2775
2776 // If fast case code has been generated, emit code to push the 2776 // If fast case code has been generated, emit code to push the
2777 // function and receiver and have the slow path jump around this 2777 // function and receiver and have the slow path jump around this
2778 // code. 2778 // code.
2779 if (done.is_linked()) { 2779 if (done.is_linked()) {
2780 Label call; 2780 Label call;
2781 __ b(&call); 2781 __ b(&call);
2782 __ bind(&done); 2782 __ bind(&done);
2783 // Push function. 2783 // Push function.
(...skipping 1337 matching lines...) Expand 10 before | Expand all | Expand 10 after
4121 } else if (var->IsStackAllocated() || var->IsContextSlot()) { 4121 } else if (var->IsStackAllocated() || var->IsContextSlot()) {
4122 // Result of deleting non-global, non-dynamic variables is false. 4122 // Result of deleting non-global, non-dynamic variables is false.
4123 // The subexpression does not have side effects. 4123 // The subexpression does not have side effects.
4124 context()->Plug(var->is_this()); 4124 context()->Plug(var->is_this());
4125 } else { 4125 } else {
4126 // Non-global variable. Call the runtime to try to delete from the 4126 // Non-global variable. Call the runtime to try to delete from the
4127 // context where the variable was introduced. 4127 // context where the variable was introduced.
4128 ASSERT(!context_register().is(r2)); 4128 ASSERT(!context_register().is(r2));
4129 __ mov(r2, Operand(var->name())); 4129 __ mov(r2, Operand(var->name()));
4130 __ Push(context_register(), r2); 4130 __ Push(context_register(), r2);
4131 __ CallRuntime(Runtime::kDeleteContextSlot, 2); 4131 __ CallRuntime(Runtime::kDeleteLookupSlot, 2);
4132 context()->Plug(r0); 4132 context()->Plug(r0);
4133 } 4133 }
4134 } else { 4134 } else {
4135 // Result of deleting non-property, non-variable reference is true. 4135 // Result of deleting non-property, non-variable reference is true.
4136 // The subexpression may have side effects. 4136 // The subexpression may have side effects.
4137 VisitForEffect(expr->expression()); 4137 VisitForEffect(expr->expression());
4138 context()->Plug(true); 4138 context()->Plug(true);
4139 } 4139 }
4140 break; 4140 break;
4141 } 4141 }
(...skipping 257 matching lines...) Expand 10 before | Expand all | Expand 10 after
4399 Comment cmnt(masm_, "[ Lookup slot"); 4399 Comment cmnt(masm_, "[ Lookup slot");
4400 Label done, slow; 4400 Label done, slow;
4401 4401
4402 // Generate code for loading from variables potentially shadowed 4402 // Generate code for loading from variables potentially shadowed
4403 // by eval-introduced variables. 4403 // by eval-introduced variables.
4404 EmitDynamicLookupFastCase(proxy->var(), INSIDE_TYPEOF, &slow, &done); 4404 EmitDynamicLookupFastCase(proxy->var(), INSIDE_TYPEOF, &slow, &done);
4405 4405
4406 __ bind(&slow); 4406 __ bind(&slow);
4407 __ mov(r0, Operand(proxy->name())); 4407 __ mov(r0, Operand(proxy->name()));
4408 __ Push(cp, r0); 4408 __ Push(cp, r0);
4409 __ CallRuntime(Runtime::kLoadContextSlotNoReferenceError, 2); 4409 __ CallRuntime(Runtime::kLoadLookupSlotNoReferenceError, 2);
4410 PrepareForBailout(expr, TOS_REG); 4410 PrepareForBailout(expr, TOS_REG);
4411 __ bind(&done); 4411 __ bind(&done);
4412 4412
4413 context()->Plug(r0); 4413 context()->Plug(r0);
4414 } else { 4414 } else {
4415 // This expression cannot throw a reference error at the top level. 4415 // This expression cannot throw a reference error at the top level.
4416 VisitInDuplicateContext(expr); 4416 VisitInDuplicateContext(expr);
4417 } 4417 }
4418 } 4418 }
4419 4419
(...skipping 434 matching lines...) Expand 10 before | Expand all | Expand 10 after
4854 4854
4855 ASSERT(interrupt_address == 4855 ASSERT(interrupt_address ==
4856 isolate->builtins()->OsrAfterStackCheck()->entry()); 4856 isolate->builtins()->OsrAfterStackCheck()->entry());
4857 return OSR_AFTER_STACK_CHECK; 4857 return OSR_AFTER_STACK_CHECK;
4858 } 4858 }
4859 4859
4860 4860
4861 } } // namespace v8::internal 4861 } } // namespace v8::internal
4862 4862
4863 #endif // V8_TARGET_ARCH_ARM 4863 #endif // V8_TARGET_ARCH_ARM
OLDNEW
« no previous file with comments | « no previous file | src/arm64/full-codegen-arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698