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

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

Issue 714663002: Fix has_constant_parameter_count() confusion in LReturn (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 6 years, 1 month 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/lithium-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 #include "src/arm/lithium-codegen-arm.h" 7 #include "src/arm/lithium-codegen-arm.h"
8 #include "src/arm/lithium-gap-resolver-arm.h" 8 #include "src/arm/lithium-gap-resolver-arm.h"
9 #include "src/base/bits.h" 9 #include "src/base/bits.h"
10 #include "src/code-factory.h" 10 #include "src/code-factory.h"
(...skipping 2946 matching lines...) Expand 10 before | Expand all | Expand 10 after
2957 no_frame_start = masm_->LeaveFrame(StackFrame::JAVA_SCRIPT); 2957 no_frame_start = masm_->LeaveFrame(StackFrame::JAVA_SCRIPT);
2958 } 2958 }
2959 { ConstantPoolUnavailableScope constant_pool_unavailable(masm()); 2959 { ConstantPoolUnavailableScope constant_pool_unavailable(masm());
2960 if (instr->has_constant_parameter_count()) { 2960 if (instr->has_constant_parameter_count()) {
2961 int parameter_count = ToInteger32(instr->constant_parameter_count()); 2961 int parameter_count = ToInteger32(instr->constant_parameter_count());
2962 int32_t sp_delta = (parameter_count + 1) * kPointerSize; 2962 int32_t sp_delta = (parameter_count + 1) * kPointerSize;
2963 if (sp_delta != 0) { 2963 if (sp_delta != 0) {
2964 __ add(sp, sp, Operand(sp_delta)); 2964 __ add(sp, sp, Operand(sp_delta));
2965 } 2965 }
2966 } else { 2966 } else {
2967 DCHECK(info()->IsStub()); // Functions would need to drop one more value.
2967 Register reg = ToRegister(instr->parameter_count()); 2968 Register reg = ToRegister(instr->parameter_count());
2968 // The argument count parameter is a smi 2969 // The argument count parameter is a smi
2969 __ SmiUntag(reg); 2970 __ SmiUntag(reg);
2970 __ add(sp, sp, Operand(reg, LSL, kPointerSizeLog2)); 2971 __ add(sp, sp, Operand(reg, LSL, kPointerSizeLog2));
2971 } 2972 }
2972 2973
2973 __ Jump(lr); 2974 __ Jump(lr);
2974 2975
2975 if (no_frame_start != -1) { 2976 if (no_frame_start != -1) {
2976 info_->AddNoFrameRange(no_frame_start, masm_->pc_offset()); 2977 info_->AddNoFrameRange(no_frame_start, masm_->pc_offset());
(...skipping 2928 matching lines...) Expand 10 before | Expand all | Expand 10 after
5905 __ Push(scope_info); 5906 __ Push(scope_info);
5906 __ push(ToRegister(instr->function())); 5907 __ push(ToRegister(instr->function()));
5907 CallRuntime(Runtime::kPushBlockContext, 2, instr); 5908 CallRuntime(Runtime::kPushBlockContext, 2, instr);
5908 RecordSafepoint(Safepoint::kNoLazyDeopt); 5909 RecordSafepoint(Safepoint::kNoLazyDeopt);
5909 } 5910 }
5910 5911
5911 5912
5912 #undef __ 5913 #undef __
5913 5914
5914 } } // namespace v8::internal 5915 } } // namespace v8::internal
OLDNEW
« no previous file with comments | « no previous file | src/arm64/lithium-codegen-arm64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698