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

Side by Side Diff: runtime/vm/flow_graph_compiler_ia32.cc

Issue 141163009: Revert r31601 (Use constants from the frame at OSR entry...). (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 6 years, 11 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 | « runtime/vm/flow_graph_compiler_arm.cc ('k') | runtime/vm/flow_graph_compiler_mips.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 (c) 2013, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2013, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32. 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_IA32.
6 #if defined(TARGET_ARCH_IA32) 6 #if defined(TARGET_ARCH_IA32)
7 7
8 #include "vm/flow_graph_compiler.h" 8 #include "vm/flow_graph_compiler.h"
9 9
10 #include "vm/ast_printer.h" 10 #include "vm/ast_printer.h"
(...skipping 1015 matching lines...) Expand 10 before | Expand all | Expand 10 after
1026 } else if (!flow_graph().IsCompiledForOsr()) { 1026 } else if (!flow_graph().IsCompiledForOsr()) {
1027 AddCurrentDescriptor(PcDescriptors::kEntryPatch, 1027 AddCurrentDescriptor(PcDescriptors::kEntryPatch,
1028 Isolate::kNoDeoptId, 1028 Isolate::kNoDeoptId,
1029 0); // No token position. 1029 0); // No token position.
1030 } 1030 }
1031 __ Comment("Enter frame"); 1031 __ Comment("Enter frame");
1032 if (flow_graph().IsCompiledForOsr()) { 1032 if (flow_graph().IsCompiledForOsr()) {
1033 intptr_t extra_slots = StackSize() 1033 intptr_t extra_slots = StackSize()
1034 - flow_graph().num_stack_locals() 1034 - flow_graph().num_stack_locals()
1035 - flow_graph().num_copied_params(); 1035 - flow_graph().num_copied_params();
1036 ASSERT(extra_slots >= 0);
1036 __ EnterOsrFrame(extra_slots * kWordSize); 1037 __ EnterOsrFrame(extra_slots * kWordSize);
1037 } else { 1038 } else {
1038 ASSERT(StackSize() >= 0); 1039 ASSERT(StackSize() >= 0);
1039 __ EnterDartFrame(StackSize() * kWordSize); 1040 __ EnterDartFrame(StackSize() * kWordSize);
1040 } 1041 }
1041 } 1042 }
1042 1043
1043 1044
1044 void FlowGraphCompiler::CompileGraph() { 1045 void FlowGraphCompiler::CompileGraph() {
1045 InitCompiler(); 1046 InitCompiler();
(...skipping 781 matching lines...) Expand 10 before | Expand all | Expand 10 after
1827 __ movups(reg, Address(ESP, 0)); 1828 __ movups(reg, Address(ESP, 0));
1828 __ addl(ESP, Immediate(kFpuRegisterSize)); 1829 __ addl(ESP, Immediate(kFpuRegisterSize));
1829 } 1830 }
1830 1831
1831 1832
1832 #undef __ 1833 #undef __
1833 1834
1834 } // namespace dart 1835 } // namespace dart
1835 1836
1836 #endif // defined TARGET_ARCH_IA32 1837 #endif // defined TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « runtime/vm/flow_graph_compiler_arm.cc ('k') | runtime/vm/flow_graph_compiler_mips.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698