Mac x86_64: Mach exception support

src/trusted/service_runtime/nacl_app_thread.c

 /*
  * Copyright (c) 2012 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.
  */
 
 /*
  * NaCl Server Runtime user thread state.
  */
 
 #include <string.h>
 
 #include "native_client/src/shared/platform/aligned_malloc.h"
 #include "native_client/src/shared/platform/nacl_check.h"
 #include "native_client/src/shared/platform/nacl_exit.h"
 #include "native_client/src/shared/platform/nacl_sync_checked.h"
 
 #include "native_client/src/trusted/service_runtime/arch/sel_ldr_arch.h"
 #include "native_client/src/trusted/service_runtime/nacl_desc_effector_ldr.h"
 #include "native_client/src/trusted/service_runtime/nacl_globals.h"
 #include "native_client/src/trusted/service_runtime/nacl_tls.h"
 #include "native_client/src/trusted/service_runtime/nacl_switch_to_app.h"
 #include "native_client/src/trusted/service_runtime/nacl_stack_safety.h"
 #include "native_client/src/trusted/service_runtime/nacl_syscall_common.h"
+#include "native_client/src/trusted/service_runtime/osx/mach_thread_map.h"
 
 
 void WINAPI NaClAppThreadLauncher(void *state) {
   struct NaClAppThread *natp = (struct NaClAppThread *) state;
   uint32_t thread_idx;
   NaClLog(4, "NaClAppThreadLauncher: entered\n");
 
   NaClSignalStackRegister(natp->signal_stack);
 
   NaClLog(4, "      natp = 0x%016"NACL_PRIxPTR"\n", (uintptr_t) natp);
   NaClLog(4, " prog_ctr  = 0x%016"NACL_PRIxNACL_REG"\n", natp->user.prog_ctr);
   NaClLog(4, "stack_ptr  = 0x%016"NACL_PRIxPTR"\n",
           NaClGetThreadCtxSp(&natp->user));
 
   thread_idx = NaClGetThreadIdx(natp);
   CHECK(0 < thread_idx);
   CHECK(thread_idx < NACL_THREAD_MAX);
   NaClTlsSetIdx(thread_idx);
   nacl_user[thread_idx] = &natp->user;
 #if NACL_WINDOWS
   nacl_thread_ids[thread_idx] = GetCurrentThreadId();
+#elif NACL_OSX

[Mark Mentovai, 2013/02/15 22:30:30]

It occurs to me that I could get rid of the #ifdef around this by letting the
no-op stubs inlined into the header function for non-Mac in addition to
Mac-non-x86_64. I haven’t done that because the code might look a little
unseemly calling into Mach functions without obvious platform guards, but if you
like that idea, it’ll save a couple of lines.

+  NaClSetCurrentMachThreadForThreadIndex(thread_idx);
 #endif
 
   /*
    * We have to hold the threads_mu lock until after thread_num field
    * in this thread has been initialized.  All other threads can only
    * find and examine this natp through the threads table, so the fact
    * that natp is not consistent (no thread_num) will not be visible.
    */
   NaClXMutexLock(&natp->nap->threads_mu);
   natp->thread_num = NaClAddThreadMu(natp->nap, natp);
@@ skipping 59 matching lines @@
    */
   thread_idx = NaClGetThreadIdx(natp);
   /*
    * On x86-64 and ARM, clearing nacl_user entry ensures that we will
    * fault if another syscall is made with this thread_idx.  In
    * particular, thread_idx 0 is never used.
    */
   nacl_user[thread_idx] = NULL;
 #if NACL_WINDOWS
   nacl_thread_ids[thread_idx] = 0;
+#elif NACL_OSX
+  NaClClearMachThreadForThreadIndex(thread_idx);
 #endif
 
   NaClLog(3, " removing thread from thread table\n");
   /* Deallocate the ID natp->thread_num. */
   NaClRemoveThreadMu(nap, natp->thread_num);
   NaClLog(3, " unlocking thread\n");
   NaClXMutexUnlock(&natp->mu);
   NaClLog(3, " unlocking thread table\n");
   NaClXMutexUnlock(&nap->threads_mu);
   NaClLog(3, " unregistering signal stack\n");
@@ skipping 125 matching lines @@
     NaClThreadDtor(&natp->host_thread);
   }
   free(natp->suspended_registers);
   NaClMutexDtor(&natp->suspend_mu);
   NaClSignalStackFree(natp->signal_stack);
   natp->signal_stack = NULL;
   NaClTlsFree(natp);
   NaClMutexDtor(&natp->mu);
   NaClAlignedFree(natp);
 }