Merge the classes Debug and Debugger.

src/execution.cc

 // Copyright 2014 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "execution.h"
 
 #include "bootstrapper.h"
 #include "codegen.h"
 #include "deoptimizer.h"
 #include "isolate-inl.h"
@@ skipping 86 matching lines @@
 #ifdef VERIFY_HEAP
   value->ObjectVerify();
 #endif
 
   // Update the pending exception flag and return the value.
   bool has_exception = value->IsException();
   ASSERT(has_exception == isolate->has_pending_exception());
   if (has_exception) {
     isolate->ReportPendingMessages();
     // Reset stepping state when script exits with uncaught exception.
-    if (isolate->debugger()->is_active()) {
+    if (isolate->debug()->is_active()) {
       isolate->debug()->ClearStepping();
     }
     return MaybeHandle<Object>();
   } else {
     isolate->clear_pending_message();
   }
 
   return Handle<Object>(value, isolate);
 }
 
@@ skipping 530 matching lines @@
               args);
   Handle<Object> result;
   if (!maybe_result.ToHandle(&result) || !result->IsString()) {
     return isolate->factory()->empty_string();
   }
 
   return Handle<String>::cast(result);
 }
 
 
-void Execution::DebugBreakHelper(Isolate* isolate) {
-  // Just continue if breaks are disabled.
-  if (isolate->debug()->disable_break()) return;
-
-  // Ignore debug break during bootstrapping.
-  if (isolate->bootstrapper()->IsActive()) return;
-
-  // Ignore debug break if debugger is not active.
-  if (!isolate->debugger()->is_active()) return;
-
-  StackLimitCheck check(isolate);
-  if (check.HasOverflowed()) return;
-
-  { JavaScriptFrameIterator it(isolate);
-    ASSERT(!it.done());
-    Object* fun = it.frame()->function();
-    if (fun && fun->IsJSFunction()) {
-      // Don't stop in builtin functions.
-      if (JSFunction::cast(fun)->IsBuiltin()) return;
-      GlobalObject* global = JSFunction::cast(fun)->context()->global_object();
-      // Don't stop in debugger functions.
-      if (isolate->debug()->IsDebugGlobal(global)) return;
-    }
-  }
-
-  // Collect the break state before clearing the flags.
-  bool debug_command_only = isolate->stack_guard()->CheckDebugCommand() &&
-                            !isolate->stack_guard()->CheckDebugBreak();
-
-  isolate->stack_guard()->ClearDebugBreak();
-
-  Execution::ProcessDebugMessages(isolate, debug_command_only);
-}
-
-
-void Execution::ProcessDebugMessages(Isolate* isolate,
-                                     bool debug_command_only) {
-  isolate->stack_guard()->ClearDebugCommand();
-
-  StackLimitCheck check(isolate);
-  if (check.HasOverflowed()) return;
-
-  HandleScope scope(isolate);
-  // Enter the debugger. Just continue if we fail to enter the debugger.
-  EnterDebugger debugger(isolate);
-  if (debugger.FailedToEnter()) return;
-
-  // Notify the debug event listeners. Indicate auto continue if the break was
-  // a debug command break.
-  isolate->debugger()->OnDebugBreak(isolate->factory()->undefined_value(),
-                                    debug_command_only);
-}
-
-
 Object* StackGuard::HandleInterrupts() {
   bool has_api_interrupt = false;
   {
     ExecutionAccess access(isolate_);
     if (should_postpone_interrupts(access)) {
       return isolate_->heap()->undefined_value();
     }
 
     if (CheckAndClearInterrupt(GC_REQUEST, access)) {
       isolate_->heap()->CollectAllGarbage(Heap::kNoGCFlags, "GC interrupt");
     }
 
     if (CheckDebugBreak() || CheckDebugCommand()) {
-      Execution::DebugBreakHelper(isolate_);
+      isolate_->debug()->HandleDebugBreak();
     }
 
     if (CheckAndClearInterrupt(TERMINATE_EXECUTION, access)) {
       return isolate_->TerminateExecution();
     }
 
     if (CheckAndClearInterrupt(FULL_DEOPT, access)) {
       Deoptimizer::DeoptimizeAll(isolate_);
     }
 
@@ skipping 15 matching lines @@
 
   if (has_api_interrupt) {
     // Callback must be invoked outside of ExecusionAccess lock.
     isolate_->InvokeApiInterruptCallback();
   }
 
   return isolate_->heap()->undefined_value();
 }
 
 } }  // namespace v8::internal