Debugger step 2

runtime/vm/stub_code_ia32.cc

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/code_generator.h"
 #include "vm/compiler.h"
 #include "vm/ic_data.h"
@@ skipping 1533 matching lines @@
   __ addl(EAX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
   __ jmp(EAX);
 }
 
 
 //  ECX: Function object.
 //  EDX: Arguments array.
 //  TOS(0): return address (Dart code).
 void StubCode::GenerateBreakpointStaticStub(Assembler* assembler) {
   __ EnterFrame(0);
+  __ pushl(EDX);
   __ pushl(ECX);
-  __ pushl(EDX);
-  __ CallRuntimeFromStub(kBreakpointHandlerRuntimeEntry);
+  __ CallRuntimeFromStub(kBreakpointStaticHandlerRuntimeEntry);
+  __ popl(ECX);
   __ popl(EDX);
-  __ popl(ECX);
   __ LeaveFrame();
-  // Now call the static function.
-  __ jmp(&StubCode::CallStaticFunctionLabel());
+
+  // Now call the static function. The breakpoint handler function
+  // ensures that the call target is compiled.
+  __ movl(EAX, FieldAddress(ECX, Function::code_offset()));
+  __ movl(ECX, FieldAddress(EAX, Code::instructions_offset()));
+  __ addl(ECX, Immediate(Instructions::HeaderSize() - kHeapObjectTag));
+  __ jmp(ECX);
 }
 
 
 //  ECX: Inline cache data array.
 //  EDX: Arguments array.
 //  TOS(0): return address (Dart code).
 void StubCode::GenerateBreakpointDynamicStub(Assembler* assembler) {
   __ EnterFrame(0);
   __ pushl(ECX);
   __ pushl(EDX);
-  __ CallRuntimeFromStub(kBreakpointHandlerRuntimeEntry);
+  __ CallRuntimeFromStub(kBreakpointDynamicHandlerRuntimeEntry);
   __ popl(EDX);
   __ popl(ECX);
   __ LeaveFrame();
   // Now call the dynamic function.
   __ jmp(&StubCode::InlineCacheLabel());
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32