Reimplement stack manipulations for LiveEdit

src/debug.cc

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 21 matching lines @@
 #include "bootstrapper.h"
 #include "code-stubs.h"
 #include "codegen.h"
 #include "compilation-cache.h"
 #include "compiler.h"
 #include "debug.h"
 #include "execution.h"
 #include "global-handles.h"
 #include "ic.h"
 #include "ic-inl.h"
+#include "liveedit.h"
 #include "messages.h"
 #include "natives.h"
 #include "stub-cache.h"
 #include "log.h"
 
 #include "../include/v8-debug.h"
 
 namespace v8 {
 namespace internal {
 
@@ skipping 888 matching lines @@
   }
 
   if (thread_local_.frame_drop_mode_ == FRAMES_UNTOUCHED) {
     SetAfterBreakTarget(frame);
   } else if (thread_local_.frame_drop_mode_ == FRAME_DROPPED_IN_IC_CALL) {
     // We must have been calling IC stub. Do not go there anymore.
     Code* plain_return = Builtins::builtin(Builtins::PlainReturn_LiveEdit);
     thread_local_.after_break_target_ = plain_return->entry();
   } else if (thread_local_.frame_drop_mode_ ==
       FRAME_DROPPED_IN_DEBUG_SLOT_CALL) {
+    // Update top frame.
+    JavaScriptFrameIterator updated_frame_it;
+    frame = updated_frame_it.frame();
+
     // Debug break slot stub does not return normally, instead it manually
     // cleans the stack and jumps. We should patch the jump address.
-    Code* plain_return = Builtins::builtin(Builtins::FrameDropper_LiveEdit);
-    thread_local_.after_break_target_ = plain_return->entry();
+    thread_local_.after_break_target_ =
+        LiveEdit::GetRestarterPatchEntryPoint(frame->code());
   } else if (thread_local_.frame_drop_mode_ == FRAME_DROPPED_IN_DIRECT_CALL) {
     // Nothing to do, after_break_target is not used here.
   } else {
     UNREACHABLE();
   }
 
   return Heap::undefined_value();
 }
 
 
@@ skipping 795 matching lines @@
     if (RelocInfo::IsJSReturn(it.rinfo()->rmode())) {
       return (it.rinfo()->pc() ==
           addr - Assembler::kPatchReturnSequenceAddressOffset);
     }
     it.next();
   }
   return false;
 }
 
 
-void Debug::FramesHaveBeenDropped(StackFrame::Id new_break_frame_id,
+void Debug::FramesHaveBeenDropped(JavaScriptFrame* new_top_js_frame,
                                   FrameDropMode mode) {
   thread_local_.frame_drop_mode_ = mode;
-  thread_local_.break_frame_id_ = new_break_frame_id;
+  thread_local_.break_frame_id_ = new_top_js_frame->id();
+  thread_local_.restarted_frame_fp_ = new_top_js_frame->fp();
 }
 
 
+Address Debug::GetRestartedFrameFp() {
+  return thread_local_.restarted_frame_fp_;
+}
+
+
 bool Debug::IsDebugGlobal(GlobalObject* global) {
   return IsLoaded() && global == Debug::debug_context()->global();
 }
 
 
 void Debug::ClearMirrorCache() {
   HandleScope scope;
   ASSERT(Top::context() == *Debug::debug_context());
 
   // Clear the mirror cache.
@@ skipping 1154 matching lines @@
     {
       Locker locker;
       Debugger::CallMessageDispatchHandler();
     }
   }
 }
 
 #endif  // ENABLE_DEBUGGER_SUPPORT
 
 } }  // namespace v8::internal