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

Side by Side Diff: src/compiler/mips/code-generator-mips.cc

Issue 1026023004: [turbofan] Fix loading of JSFunction from activation in case of adapter frame. (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: Created 5 years, 9 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/compiler/linkage-impl.h ('k') | src/compiler/mips64/code-generator-mips64.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 2014 the V8 project authors. All rights reserved. 1 // Copyright 2014 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/compiler/code-generator.h" 5 #include "src/compiler/code-generator.h"
6 #include "src/compiler/code-generator-impl.h" 6 #include "src/compiler/code-generator-impl.h"
7 #include "src/compiler/gap-resolver.h" 7 #include "src/compiler/gap-resolver.h"
8 #include "src/compiler/node-matchers.h" 8 #include "src/compiler/node-matchers.h"
9 #include "src/mips/macro-assembler-mips.h" 9 #include "src/mips/macro-assembler-mips.h"
10 #include "src/scopes.h" 10 #include "src/scopes.h"
(...skipping 966 matching lines...) Expand 10 before | Expand all | Expand 10 after
977 if (info()->is_osr()) { 977 if (info()->is_osr()) {
978 // TurboFan OSR-compiled functions cannot be entered directly. 978 // TurboFan OSR-compiled functions cannot be entered directly.
979 __ Abort(kShouldNotDirectlyEnterOsrFunction); 979 __ Abort(kShouldNotDirectlyEnterOsrFunction);
980 980
981 // Unoptimized code jumps directly to this entrypoint while the unoptimized 981 // Unoptimized code jumps directly to this entrypoint while the unoptimized
982 // frame is still on the stack. Optimized code uses OSR values directly from 982 // frame is still on the stack. Optimized code uses OSR values directly from
983 // the unoptimized frame. Thus, all that needs to be done is to allocate the 983 // the unoptimized frame. Thus, all that needs to be done is to allocate the
984 // remaining stack slots. 984 // remaining stack slots.
985 if (FLAG_code_comments) __ RecordComment("-- OSR entrypoint --"); 985 if (FLAG_code_comments) __ RecordComment("-- OSR entrypoint --");
986 osr_pc_offset_ = __ pc_offset(); 986 osr_pc_offset_ = __ pc_offset();
987 // TODO(titzer): cannot address target function == local #-1
988 __ lw(a1, MemOperand(fp, JavaScriptFrameConstants::kFunctionOffset));
987 DCHECK(stack_slots >= frame()->GetOsrStackSlotCount()); 989 DCHECK(stack_slots >= frame()->GetOsrStackSlotCount());
988 stack_slots -= frame()->GetOsrStackSlotCount(); 990 stack_slots -= frame()->GetOsrStackSlotCount();
989 } 991 }
990 992
991 if (stack_slots > 0) { 993 if (stack_slots > 0) {
992 __ Subu(sp, sp, Operand(stack_slots * kPointerSize)); 994 __ Subu(sp, sp, Operand(stack_slots * kPointerSize));
993 } 995 }
994 } 996 }
995 997
996 998
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
1220 } 1222 }
1221 } 1223 }
1222 MarkLazyDeoptSite(); 1224 MarkLazyDeoptSite();
1223 } 1225 }
1224 1226
1225 #undef __ 1227 #undef __
1226 1228
1227 } // namespace compiler 1229 } // namespace compiler
1228 } // namespace internal 1230 } // namespace internal
1229 } // namespace v8 1231 } // namespace v8
OLDNEW
« no previous file with comments | « src/compiler/linkage-impl.h ('k') | src/compiler/mips64/code-generator-mips64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698