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

Side by Side Diff: runtime/vm/flow_graph_compiler_x64.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_mips.cc ('k') | runtime/vm/intermediate_language.h » ('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_X64. 5 #include "vm/globals.h" // Needed here to get TARGET_ARCH_X64.
6 #if defined(TARGET_ARCH_X64) 6 #if defined(TARGET_ARCH_X64)
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 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 __ movq(new_pp, Address(new_pc, -object_pool_pc_dist - offset)); 1058 __ movq(new_pp, Address(new_pc, -object_pool_pc_dist - offset));
1059 AddCurrentDescriptor(PcDescriptors::kEntryPatch, 1059 AddCurrentDescriptor(PcDescriptors::kEntryPatch,
1060 Isolate::kNoDeoptId, 1060 Isolate::kNoDeoptId,
1061 0); // No token position. 1061 0); // No token position.
1062 } 1062 }
1063 __ Comment("Enter frame"); 1063 __ Comment("Enter frame");
1064 if (flow_graph().IsCompiledForOsr()) { 1064 if (flow_graph().IsCompiledForOsr()) {
1065 intptr_t extra_slots = StackSize() 1065 intptr_t extra_slots = StackSize()
1066 - flow_graph().num_stack_locals() 1066 - flow_graph().num_stack_locals()
1067 - flow_graph().num_copied_params(); 1067 - flow_graph().num_copied_params();
1068 ASSERT(extra_slots >= 0);
1068 __ EnterOsrFrame(extra_slots * kWordSize, new_pp, new_pc); 1069 __ EnterOsrFrame(extra_slots * kWordSize, new_pp, new_pc);
1069 } else { 1070 } else {
1070 ASSERT(StackSize() >= 0); 1071 ASSERT(StackSize() >= 0);
1071 __ EnterDartFrameWithInfo(StackSize() * kWordSize, new_pp, new_pc); 1072 __ EnterDartFrameWithInfo(StackSize() * kWordSize, new_pp, new_pc);
1072 } 1073 }
1073 } 1074 }
1074 1075
1075 1076
1076 void FlowGraphCompiler::CompileGraph() { 1077 void FlowGraphCompiler::CompileGraph() {
1077 InitCompiler(); 1078 InitCompiler();
(...skipping 768 matching lines...) Expand 10 before | Expand all | Expand 10 after
1846 __ movups(reg, Address(RSP, 0)); 1847 __ movups(reg, Address(RSP, 0));
1847 __ AddImmediate(RSP, Immediate(kFpuRegisterSize), PP); 1848 __ AddImmediate(RSP, Immediate(kFpuRegisterSize), PP);
1848 } 1849 }
1849 1850
1850 1851
1851 #undef __ 1852 #undef __
1852 1853
1853 } // namespace dart 1854 } // namespace dart
1854 1855
1855 #endif // defined TARGET_ARCH_X64 1856 #endif // defined TARGET_ARCH_X64
OLDNEW
« no previous file with comments | « runtime/vm/flow_graph_compiler_mips.cc ('k') | runtime/vm/intermediate_language.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698