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

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

Issue 9481018: Fix merge error, Debug_StepInto test (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | runtime/vm/code_patcher_x64.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) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, 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/assembler.h" 8 #include "vm/assembler.h"
9 #include "vm/code_patcher.h" 9 #include "vm/code_patcher.h"
10 #include "vm/cpu.h" 10 #include "vm/cpu.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 int* num_named_arguments, 240 int* num_named_arguments,
241 uword* target) { 241 uword* target) {
242 ASSERT(num_arguments != NULL); 242 ASSERT(num_arguments != NULL);
243 ASSERT(num_named_arguments != NULL); 243 ASSERT(num_named_arguments != NULL);
244 ASSERT(target != NULL); 244 ASSERT(target != NULL);
245 InstanceCall call(return_address); 245 InstanceCall call(return_address);
246 *num_arguments = call.argument_count(); 246 *num_arguments = call.argument_count();
247 *num_named_arguments = call.named_argument_count(); 247 *num_named_arguments = call.named_argument_count();
248 *target = call.target(); 248 *target = call.target();
249 const ICData& ic_data = ICData::Handle(call.ic_data()); 249 const ICData& ic_data = ICData::Handle(call.ic_data());
250 *function_name = ic_data.target_name(); 250 if (function_name != NULL) {
251 *function_name = ic_data.target_name();
252 }
251 } 253 }
252 254
253 255
254 RawICData* CodePatcher::GetInstanceCallIcDataAt(uword return_address) { 256 RawICData* CodePatcher::GetInstanceCallIcDataAt(uword return_address) {
255 InstanceCall call(return_address); 257 InstanceCall call(return_address);
256 return call.ic_data(); 258 return call.ic_data();
257 } 259 }
258 260
259 261
260 intptr_t CodePatcher::InstanceCallSizeInBytes() { 262 intptr_t CodePatcher::InstanceCallSizeInBytes() {
261 return DartCallPattern::kNumInstructions * DartCallPattern::kInstructionSize; 263 return DartCallPattern::kNumInstructions * DartCallPattern::kInstructionSize;
262 } 264 }
263 265
264 } // namespace dart 266 } // namespace dart
265 267
266 #endif // defined TARGET_ARCH_IA32 268 #endif // defined TARGET_ARCH_IA32
OLDNEW
« no previous file with comments | « no previous file | runtime/vm/code_patcher_x64.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698