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

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

Issue 1130733003: Resolve references to "this" the same way as normal variables (Closed) Base URL: https://chromium.googlesource.com/v8/v8@master
Patch Set: Add mips/mips64. Fix expectation in nosnap deserialization test. Fix scratch regiser use on x64. Created 5 years, 7 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
« no previous file with comments | « src/heap/heap.h ('k') | src/ia32/lithium-codegen-ia32.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_IA32 7 #if V8_TARGET_ARCH_IA32
8 8
9 #include "src/code-factory.h" 9 #include "src/code-factory.h"
10 #include "src/code-stubs.h" 10 #include "src/code-stubs.h"
(...skipping 192 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 __ CallRuntime(Runtime::kNewFunctionContext, 1); 203 __ CallRuntime(Runtime::kNewFunctionContext, 1);
204 } 204 }
205 function_in_register = false; 205 function_in_register = false;
206 // Context is returned in eax. It replaces the context passed to us. 206 // Context is returned in eax. It replaces the context passed to us.
207 // It's saved in the stack and kept live in esi. 207 // It's saved in the stack and kept live in esi.
208 __ mov(esi, eax); 208 __ mov(esi, eax);
209 __ mov(Operand(ebp, StandardFrameConstants::kContextOffset), eax); 209 __ mov(Operand(ebp, StandardFrameConstants::kContextOffset), eax);
210 210
211 // Copy parameters into context if necessary. 211 // Copy parameters into context if necessary.
212 int num_parameters = info->scope()->num_parameters(); 212 int num_parameters = info->scope()->num_parameters();
213 for (int i = 0; i < num_parameters; i++) { 213 int first_parameter = info->scope()->has_this_declaration() ? -1 : 0;
214 Variable* var = scope()->parameter(i); 214 for (int i = first_parameter; i < num_parameters; i++) {
215 Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
215 if (var->IsContextSlot()) { 216 if (var->IsContextSlot()) {
216 int parameter_offset = StandardFrameConstants::kCallerSPOffset + 217 int parameter_offset = StandardFrameConstants::kCallerSPOffset +
217 (num_parameters - 1 - i) * kPointerSize; 218 (num_parameters - 1 - i) * kPointerSize;
218 // Load parameter from stack. 219 // Load parameter from stack.
219 __ mov(eax, Operand(ebp, parameter_offset)); 220 __ mov(eax, Operand(ebp, parameter_offset));
220 // Store it in the context. 221 // Store it in the context.
221 int context_offset = Context::SlotOffset(var->index()); 222 int context_offset = Context::SlotOffset(var->index());
222 __ mov(Operand(esi, context_offset), eax); 223 __ mov(Operand(esi, context_offset), eax);
223 // Update the write barrier. This clobbers eax and ebx. 224 // Update the write barrier. This clobbers eax and ebx.
224 if (need_write_barrier) { 225 if (need_write_barrier) {
(...skipping 2727 matching lines...) Expand 10 before | Expand all | Expand 10 after
2952 // Push copy of the first argument or undefined if it doesn't exist. 2953 // Push copy of the first argument or undefined if it doesn't exist.
2953 if (arg_count > 0) { 2954 if (arg_count > 0) {
2954 __ push(Operand(esp, arg_count * kPointerSize)); 2955 __ push(Operand(esp, arg_count * kPointerSize));
2955 } else { 2956 } else {
2956 __ push(Immediate(isolate()->factory()->undefined_value())); 2957 __ push(Immediate(isolate()->factory()->undefined_value()));
2957 } 2958 }
2958 2959
2959 // Push the enclosing function. 2960 // Push the enclosing function.
2960 __ push(Operand(ebp, JavaScriptFrameConstants::kFunctionOffset)); 2961 __ push(Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
2961 // Push the receiver of the enclosing function. 2962 // Push the receiver of the enclosing function.
2962 __ push(Operand(ebp, (2 + info_->scope()->num_parameters()) * kPointerSize)); 2963 Variable* this_var = scope()->LookupThis();
2964 DCHECK_NOT_NULL(this_var);
2965 __ push(VarOperand(this_var, ecx));
2963 // Push the language mode. 2966 // Push the language mode.
2964 __ push(Immediate(Smi::FromInt(language_mode()))); 2967 __ push(Immediate(Smi::FromInt(language_mode())));
2965 2968
2966 // Push the start position of the scope the calls resides in. 2969 // Push the start position of the scope the calls resides in.
2967 __ push(Immediate(Smi::FromInt(scope()->start_position()))); 2970 __ push(Immediate(Smi::FromInt(scope()->start_position())));
2968 2971
2969 // Do the runtime call. 2972 // Do the runtime call.
2970 __ CallRuntime(Runtime::kResolvePossiblyDirectEval, 6); 2973 __ CallRuntime(Runtime::kResolvePossiblyDirectEval, 6);
2971 } 2974 }
2972 2975
(...skipping 2396 matching lines...) Expand 10 before | Expand all | Expand 10 after
5369 DCHECK_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(), 5372 DCHECK_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(),
5370 Assembler::target_address_at(call_target_address, 5373 Assembler::target_address_at(call_target_address,
5371 unoptimized_code)); 5374 unoptimized_code));
5372 return OSR_AFTER_STACK_CHECK; 5375 return OSR_AFTER_STACK_CHECK;
5373 } 5376 }
5374 5377
5375 5378
5376 } } // namespace v8::internal 5379 } } // namespace v8::internal
5377 5380
5378 #endif // V8_TARGET_ARCH_IA32 5381 #endif // V8_TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « src/heap/heap.h ('k') | src/ia32/lithium-codegen-ia32.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698