Reverting: Several changes to fix debug_stub:... (issue6489005)...

src/trusted/service_runtime/nacl_debug.cc

 /*
  * Copyright 2010 The Native Client 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 <vector>
 #include <map>
 
 /*
  * NaCl Functions for intereacting with debuggers
  */
 
 #include "native_client/src/trusted/gdb_rsp/session.h"
 #include "native_client/src/trusted/gdb_rsp/target.h"
 #include "native_client/src/trusted/port/platform.h"
 #include "native_client/src/trusted/port/thread.h"
 
 #include "native_client/src/include/nacl_string.h"
 #include "native_client/src/shared/platform/nacl_log.h"
 #include "native_client/src/shared/platform/nacl_threads.h"
 #include "native_client/src/trusted/debug_stub/debug_stub.h"
 #include "native_client/src/trusted/service_runtime/nacl_app_thread.h"
 #include "native_client/src/trusted/service_runtime/nacl_debug.h"
 #include "native_client/src/trusted/service_runtime/sel_ldr.h"
 
 /* To enable debuggging */
-// #define NACL_DEBUG_STUB 1
+/* #define NACL_DEBUG_STUB 1 */
 
 using port::IPlatform;
 using port::IThread;
 using port::ITransport;
 
 using gdb_rsp::Session;
 using gdb_rsp::Target;
 
 #ifdef WIN32
 /* Disable warning for unwind disabled when exceptions used */
@@ skipping 129 matching lines @@
 #else
   UNREFERENCED_PARAMETER(ptr);
 #endif
 }
 
 void NaClExceptionCatcher(uint32_t id, int8_t sig, void *cookie) {
 #ifdef NACL_DEBUG_STUB
   Target* targ = static_cast<Target*>(cookie);
 
   /* Signal the target that we caught something */
-  IPlatform::LogWarning("<huh-b-4> Caught signal %d on thread %Xh.\n", sig, id);
+  IPlatform::LogWarning("Caught signal %d on thread %Xh.\n", sig, id);
   targ->Signal(id, sig, true);
 #else
   UNREFERENCED_PARAMETER(id);
   UNREFERENCED_PARAMETER(sig);
   UNREFERENCED_PARAMETER(cookie);
 #endif
 }
 
 
 int NaClDebugIsEnabled(void) throw() {
@@ skipping 43 matching lines @@
 }
 
 void NaClDebugThreadPrepDebugging(struct NaClAppThread *natp) throw() {
   UNREFERENCED_PARAMETER(natp);
 
 #ifdef NACL_DEBUG_STUB
   if (NaClDebugIsEnabled()) {
     NaClDebugState *state = NaClDebugGetState();
     uint32_t id = IPlatform::GetCurrentThread();
     IThread* thread = IThread::Acquire(id, true);
-    state->target_->SetMemoryBase(natp->nap->mem_start);
     state->target_->TrackThread(thread);
 
     /*
      * TODO(noelallen) We need to associate the natp with this thread
      * so we can get to the untrusted context preserved on a syscall.
      */
   }
 #endif
 }
 
@@ skipping 19 matching lines @@
 
 
 int NaClDebugStart(void) throw() {
 #ifdef NACL_DEBUG_STUB
   if (NaClDebugIsEnabled()) {
     NaClThread *thread = new NaClThread;
 
     if (NULL == thread) return false;
     NaClDebugState *state = NaClDebugGetState();
 
-    /* Add a temp breakpoint. */
-    struct NaClApp* app = state->app_;
-    state->target_->AddTemporaryBreakpoint(app->entry_pt + app->mem_start);
+    /* If break on start has been requested, add a temp breakpoint. */
+    if (state->break_) {
+      struct NaClApp* app = state->app_;
+      state->target_->AddTemporaryBreakpoint(app->entry_pt + app->mem_start);
+    }
 
     NaClLog(LOG_WARNING, "nacl_debug(%d) : Debugging started.\n", __LINE__);
     IThread::SetExceptionCatch(NaClExceptionCatcher, state->target_);
     return NaClThreadCtor(thread, NaClStubThread, state->target_,
                           NACL_KERN_STACK_SIZE);
   }
 #endif
   return 0;
 }
 
 void NaClDebugStop(int ErrCode) throw() {
 #ifdef NACL_DEBUG_STUB
 
   /*
    * We check if debugging is enabled since this check is the only
    * mechanism for allocating the state object.  We free the
    * resources but not the object itself.  Instead we mark it as
    * STOPPED to prevent it from getting recreated.
    */
   if (NaClDebugIsEnabled()) {
     NaClDebugGetState()->status_ = NDS_STOPPED;
     NaClDebugGetState()->errCode_ = ErrCode;
   }
 #else
   UNREFERENCED_PARAMETER(ErrCode);
 #endif
 }