StepOver, StepInto, StepOut

runtime/vm/debugger_ia32.cc

Index: runtime/vm/debugger_ia32.cc
===================================================================
--- runtime/vm/debugger_ia32.cc	(revision 4191)
+++ runtime/vm/debugger_ia32.cc	(working copy)
@@ -8,6 +8,8 @@
 #include "vm/debugger.h"
 
 #include "vm/code_patcher.h"
+#include "vm/cpu.h"
+#include "vm/disassembler.h"
 #include "vm/object.h"
 #include "vm/os.h"
 #include "vm/stack_frame.h"
@@ -22,6 +24,45 @@
              *reinterpret_cast<uword*>(var_address));

[regis, 2012/02/24 23:32:37]

strange indentation

[hausner, 2012/02/27 22:03:57]

Done.

 }
 
+
+RawInstance* ActivationFrame::GetInstanceCallReceiver(
+                 intptr_t num_actual_args) {

[regis, 2012/02/24 23:32:37]

strange indentation

[hausner, 2012/02/27 22:03:57]

4 character indent from the function name is strange? Moved it a bit more to the
right.

+  ASSERT(num_actual_args > 0);  // At minimum we have a receiver on the stack.
+  // Stack pointer points to last argument that was pushed on the stack.
+  uword receiver_addr = sp() + ((num_actual_args - 1) * kWordSize);
+  return reinterpret_cast<RawInstance*>(
+             *reinterpret_cast<uword*>(receiver_addr));

[regis, 2012/02/24 23:32:37]

ditto

[hausner, 2012/02/27 22:03:57]

Done.

+}
+
+
+void Breakpoint::PatchFunctionReturn() {
+  uint8_t* code = reinterpret_cast<uint8_t*>(pc_ - 5);
+  ASSERT((code[0] == 0x89) && (code[1] == 0xEC));  // mov esp,ebp
+  ASSERT(code[2] == 0x5D);  // pop ebp
+  ASSERT(code[3] == 0xC3);  // ret
+  ASSERT(code[4] == 0x90);  // nop
+
+  // Smash code with call instruction and relative target address.
+  uword stub_addr = StubCode::BreakpointReturnEntryPoint();
+  code[0] = 0xE8;
+  *reinterpret_cast<uword*>(&code[1]) = stub_addr - pc_;
+  CPU::FlushICache(pc_, 5);
+}
+
+
+void Breakpoint::RestoreFunctionReturn() {
+  uint8_t* code = reinterpret_cast<uint8_t*>(pc_ - 5);
+  ASSERT(code[0] == 0xE8);
+  code[0] = 0x89;
+  code[1] = 0xEC;  // mov esp,ebp
+  code[2] = 0x5D;  // pop ebp
+  code[3] = 0xC3;  // ret
+  code[4] = 0x90;  // nop
+  CPU::FlushICache(pc_, 5);
+}
+
+
+
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32