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

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

Issue 1134003003: Revert "Resolve references to "this" the same way as normal variables" (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: 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 int first_parameter = info->scope()->has_this_declaration() ? -1 : 0; 213 for (int i = 0; i < num_parameters; i++) {
214 for (int i = first_parameter; i < num_parameters; i++) { 214 Variable* var = scope()->parameter(i);
215 Variable* var = (i == -1) ? scope()->receiver() : scope()->parameter(i);
216 if (var->IsContextSlot()) { 215 if (var->IsContextSlot()) {
217 int parameter_offset = StandardFrameConstants::kCallerSPOffset + 216 int parameter_offset = StandardFrameConstants::kCallerSPOffset +
218 (num_parameters - 1 - i) * kPointerSize; 217 (num_parameters - 1 - i) * kPointerSize;
219 // Load parameter from stack. 218 // Load parameter from stack.
220 __ mov(eax, Operand(ebp, parameter_offset)); 219 __ mov(eax, Operand(ebp, parameter_offset));
221 // Store it in the context. 220 // Store it in the context.
222 int context_offset = Context::SlotOffset(var->index()); 221 int context_offset = Context::SlotOffset(var->index());
223 __ mov(Operand(esi, context_offset), eax); 222 __ mov(Operand(esi, context_offset), eax);
224 // Update the write barrier. This clobbers eax and ebx. 223 // Update the write barrier. This clobbers eax and ebx.
225 if (need_write_barrier) { 224 if (need_write_barrier) {
(...skipping 2728 matching lines...) Expand 10 before | Expand all | Expand 10 after
2954 // 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.
2955 if (arg_count > 0) { 2954 if (arg_count > 0) {
2956 __ push(Operand(esp, arg_count * kPointerSize)); 2955 __ push(Operand(esp, arg_count * kPointerSize));
2957 } else { 2956 } else {
2958 __ push(Immediate(isolate()->factory()->undefined_value())); 2957 __ push(Immediate(isolate()->factory()->undefined_value()));
2959 } 2958 }
2960 2959
2961 // Push the enclosing function. 2960 // Push the enclosing function.
2962 __ push(Operand(ebp, JavaScriptFrameConstants::kFunctionOffset)); 2961 __ push(Operand(ebp, JavaScriptFrameConstants::kFunctionOffset));
2963 // Push the receiver of the enclosing function. 2962 // Push the receiver of the enclosing function.
2964 Variable* this_var = scope()->LookupThis(); 2963 __ push(Operand(ebp, (2 + info_->scope()->num_parameters()) * kPointerSize));
2965 DCHECK_NOT_NULL(this_var);
2966 __ push(VarOperand(this_var, ecx));
2967 // Push the language mode. 2964 // Push the language mode.
2968 __ push(Immediate(Smi::FromInt(language_mode()))); 2965 __ push(Immediate(Smi::FromInt(language_mode())));
2969 2966
2970 // Push the start position of the scope the calls resides in. 2967 // Push the start position of the scope the calls resides in.
2971 __ push(Immediate(Smi::FromInt(scope()->start_position()))); 2968 __ push(Immediate(Smi::FromInt(scope()->start_position())));
2972 2969
2973 // Do the runtime call. 2970 // Do the runtime call.
2974 __ CallRuntime(Runtime::kResolvePossiblyDirectEval, 6); 2971 __ CallRuntime(Runtime::kResolvePossiblyDirectEval, 6);
2975 } 2972 }
2976 2973
(...skipping 2400 matching lines...) Expand 10 before | Expand all | Expand 10 after
5377 DCHECK_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(), 5374 DCHECK_EQ(isolate->builtins()->OsrAfterStackCheck()->entry(),
5378 Assembler::target_address_at(call_target_address, 5375 Assembler::target_address_at(call_target_address,
5379 unoptimized_code)); 5376 unoptimized_code));
5380 return OSR_AFTER_STACK_CHECK; 5377 return OSR_AFTER_STACK_CHECK;
5381 } 5378 }
5382 5379
5383 5380
5384 } } // namespace v8::internal 5381 } } // namespace v8::internal
5385 5382
5386 #endif // V8_TARGET_ARCH_IA32 5383 #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