Debug stub: associate NaClAppThread with IThread

src/trusted/debug_stub/nacl_debug.cc

 /*
  * Copyright (c) 2011 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>
 
@@ skipping 162 matching lines @@
       for (a = 0; a < envc; a++) g_nacl_debug_state->env_[a] = envv[a];
     } DBG_CATCH_ALL
   }
 }
 
 void NaClDebugThreadPrepDebugging(struct NaClAppThread *natp) throw() {
   UNREFERENCED_PARAMETER(natp);
 
   if (NaClDebugIsEnabled()) {
     uint32_t id = IPlatform::GetCurrentThread();
-    IThread* thread = IThread::Acquire(id, true);
+    IThread* thread = IThread::Create(id, natp);
     g_nacl_debug_state->target_->SetMemoryBase(natp->nap->mem_start);
     g_nacl_debug_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.
-     */
   }
 }
 
 void NaClDebugThreadStopDebugging(struct NaClAppThread *natp) throw() {
   UNREFERENCED_PARAMETER(natp);
 
   if (NaClDebugIsEnabled()) {
     uint32_t id = IPlatform::GetCurrentThread();
-    IThread* thread = IThread::Acquire(id, false);
+    IThread* thread = IThread::Acquire(id);
     g_nacl_debug_state->target_->IgnoreThread(thread);
     IThread::Release(thread);
-
-    /*
-     * TODO(noelallen) We need to associate the natp with this thread
-     * so we can get to the thread once we support freeing a thread
-     * from a different thread than the executing one.
-     */
   }
 }
 
 int NaClDebugStart(void) throw() {
   if (NaClDebugIsEnabled()) {
     NaClThread *thread = new NaClThread;
 
     if (NULL == thread) return false;
 
     /* Add a temp breakpoint. */
@@ skipping 42 matching lines @@
   initialised = 1;
   nap->debug_stub_callbacks = &debug_callbacks;
   NaClDebugStubInit();
   g_nacl_debug_state = new NaClDebugState();
   CHECK(g_nacl_debug_state->Init());
   NaClDebugSetAppInfo(nap);
   NaClDebugSetAppEnvironment(argc, argv, envc, envv);
   NaClDebugStart();
   return 1;
 }