* Throughout, use __try/__except/__endtry blocks, rather than myfault

	handler.
	* cygtls.cc (_cygtls::remove): Accommodate the fact that pathbufs
	has been moved from _local_storage to _cygtls.
	* cygtls.h (class tls_pathbuf): Add comment to hint to gendef usage
	of counters.  Change type of counters to uint32_t for clarity.
	Remove _cygtls as friend class.
	(struct _local_storage): Move pathbufs from here...
	(struct _cygtls): ...to here, allowing to access it from _sigbe.
	(class san): Only define on 32 bit.  Remove errno, _c_cnt and _w_cnt
	members.
	(san::setup): Drop parameter.  Don't initialize removed members.
	(san::leave): Don't set removed members.
	(class myfault): Only define on 32 bit.
	(myfault::faulted): Only keep implementation not taking any parameter.
	Drop argument in call to sebastian.setup.
	(__try/__leave/__except/__endtry): Implement to support real SEH.  For
	now stick to SJLJ on 32 bit.
	* dcrt0.cc (dll_crt0_0): Drop 64 bit call to
	exception::install_myfault_handler.
	* exception.h (exception_handler): Define with EXCEPTION_DISPOSITION
	as return type.
	(PDISPATCHER_CONTEXT): Define as void * on 32 bit.  Define as pointer
	to _DISPATCHER_CONTEXT on 64 bit.
	(class exception): Define separately for 32 and 64 bit.
	(exception::myfault): Add handler for myfault SEH handling on 64 bit.
	(exception::exception): Fix mangled method name to account for change
	in type of last parameter.
	(exception::install_myfault_handler): Remove.
	* exceptions.cc (exception::myfault_handle): Remove.
	(exception::myfault): New SEH handler for 64 bit.
	* gendef (_sigbe): Set tls_pathbuf counters to 0 explicitely when
	returning to the caller.
	* ntdll.h: Move a comment to a better place.
	(struct _SCOPE_TABLE): Define on 64 bit.
	* thread.cc (verifyable_object_isvalid): Remove gcc 4.7 workaround.
	* tls_pbuf.cc (tls_pbuf): Fix to accommodate new place of pathbufs.
	(tls_pathbuf::destroy): Change type of loop variables to uint32_t.
	* tls_pbuf.h (class tmp_pathbuf): Change type of buffer counters to
	uint32_t.  Accommodate new place of pathbufs.
	* tlsoffsets.h: Regenerate.
	* tlsoffsets64.h: Regenerate.

winsup/cygwin/ChangeLog

@@ -1,3 +1,48 @@
+2014-08-21  Corinna Vinschen  <corinna@vinschen.de>
+
+	* Throughout, use __try/__except/__endtry blocks, rather than myfault
+	handler.
+	* cygtls.cc (_cygtls::remove): Accommodate the fact that pathbufs
+	has been moved from _local_storage to _cygtls.
+	* cygtls.h (class tls_pathbuf): Add comment to hint to gendef usage
+	of counters.  Change type of counters to uint32_t for clarity.
+	Remove _cygtls as friend class.
+	(struct _local_storage): Move pathbufs from here...
+	(struct _cygtls): ...to here, allowing to access it from _sigbe.
+	(class san): Only define on 32 bit.  Remove errno, _c_cnt and _w_cnt
+	members.
+	(san::setup): Drop parameter.  Don't initialize removed members.
+	(san::leave): Don't set removed members.
+	(class myfault): Only define on 32 bit.
+	(myfault::faulted): Only keep implementation not taking any parameter.
+	Drop argument in call to sebastian.setup.
+	(__try/__leave/__except/__endtry): Implement to support real SEH.  For
+	now stick to SJLJ on 32 bit.
+	* dcrt0.cc (dll_crt0_0): Drop 64 bit call to
+	exception::install_myfault_handler.
+	* exception.h (exception_handler): Define with EXCEPTION_DISPOSITION
+	as return type.
+	(PDISPATCHER_CONTEXT): Define as void * on 32 bit.  Define as pointer
+	to _DISPATCHER_CONTEXT on 64 bit.
+	(class exception): Define separately for 32 and 64 bit.
+	(exception::myfault): Add handler for myfault SEH handling on 64 bit.
+	(exception::exception): Fix mangled method name to account for change
+	in type of last parameter.
+	(exception::install_myfault_handler): Remove.
+	* exceptions.cc (exception::myfault_handle): Remove.
+	(exception::myfault): New SEH handler for 64 bit.
+	* gendef (_sigbe): Set tls_pathbuf counters to 0 explicitely when
+	returning to the caller.
+	* ntdll.h: Move a comment to a better place.
+	(struct _SCOPE_TABLE): Define on 64 bit.
+	* thread.cc (verifyable_object_isvalid): Remove gcc 4.7 workaround.
+	* tls_pbuf.cc (tls_pbuf): Fix to accommodate new place of pathbufs.
+	(tls_pathbuf::destroy): Change type of loop variables to uint32_t.
+	* tls_pbuf.h (class tmp_pathbuf): Change type of buffer counters to
+	uint32_t.  Accommodate new place of pathbufs.
+	* tlsoffsets.h: Regenerate.
+	* tlsoffsets64.h: Regenerate.
+
 2014-08-21  Corinna Vinschen  <corinna@vinschen.de>
 
 	* miscfuncs.cc (__import_address): Cover the first dereference to imp

winsup/cygwin/cygheap.cc

@@ -638,10 +638,7 @@ init_cygheap::find_tls (int sig, bool& issig_wait)
   _cygtls *t = NULL;
   issig_wait = false;
 
-  myfault efault;
-  if (efault.faulted ())
-    threadlist[ix]->remove (INFINITE);
-  else
+  __try
     {
       ix = -1;
       /* Scan thread list looking for valid signal-delivery candidates */
@@ -652,11 +649,15 @@ init_cygheap::find_tls (int sig, bool& issig_wait)
 	  {
 	    t = cygheap->threadlist[ix];
 	    issig_wait = true;
-	    goto out;
+	    __leave;
 	  }
 	else if (!t && !sigismember (&(threadlist[ix]->sigmask), sig))
 	  t = cygheap->threadlist[ix];
     }
-out:
+  __except (NO_ERROR)
+    {
+      threadlist[ix]->remove (INFINITE);
+    }
+  __endtry
   return t;
 }

winsup/cygwin/cygtls.cc

@@ -193,7 +193,7 @@ _cygtls::remove (DWORD wait)
   free_local (servent_buf);
   free_local (hostent_buf);
   /* Free temporary TLS path buffers. */
-  locals.pathbufs.destroy ();
+  pathbufs.destroy ();
   /* Close timer handle. */
   if (locals.cw_timer)
     NtClose (locals.cw_timer);

winsup/cygwin/cygtls.h

@@ -44,18 +44,21 @@ details. */
 #else
 #pragma pack(push,4)
 #endif
+
 /* Defined here to support auto rebuild of tlsoffsets.h. */
 class tls_pathbuf
 {
-  int c_cnt;
-  int w_cnt;
+  /* Make sure that c_cnt and w_cnt are always the first two members of this
+     class, and never change the size (32 bit), unless you also change the
+     mov statements in sigbe! */
+  uint32_t c_cnt;
+  uint32_t w_cnt;
   char  *c_buf[TP_NUM_C_BUFS];
   WCHAR *w_buf[TP_NUM_W_BUFS];
 
 public:
   void destroy ();
   friend class tmp_pathbuf;
-  friend class _cygtls;
   friend class san;
 };
 
@@ -129,8 +132,6 @@ struct _local_storage
   /* thread.cc */
   HANDLE cw_timer;
 
-  /* All functions requiring temporary path buffers. */
-  tls_pathbuf pathbufs;
   char ttybuf[32];
 };
 
@@ -188,6 +189,7 @@ class _cygtls
   struct pthread *tid;
   class cygthread *_ctinfo;
   class san *andreas;
+  tls_pathbuf pathbufs;
   waitq wq;
   int sig;
   unsigned incyg;
@@ -281,34 +283,25 @@ const int CYGTLS_PADSIZE = 12700;
 extern PVOID _tlsbase __asm__ ("%fs:4");
 extern PVOID _tlstop __asm__ ("%fs:8");
 #endif
+
 #define _my_tls (*((_cygtls *) ((char *)_tlsbase - CYGTLS_PADSIZE)))
 extern _cygtls *_main_tls;
 extern _cygtls *_sig_tls;
 
+#ifndef __x86_64__
 class san
 {
   san *_clemente;
   jmp_buf _context;
-  int _errno;
-  unsigned _c_cnt;
-  unsigned _w_cnt;
 public:
-  int setup (int myerrno = 0) __attribute__ ((always_inline))
+  int setup () __attribute__ ((always_inline))
   {
     _clemente = _my_tls.andreas;
     _my_tls.andreas = this;
-    _errno = myerrno;
-    _c_cnt = _my_tls.locals.pathbufs.c_cnt;
-    _w_cnt = _my_tls.locals.pathbufs.w_cnt;
     return __sjfault (_context);
   }
   void leave () __attribute__ ((always_inline))
   {
-    if (_errno)
-      set_errno (_errno);
-    /* Restore tls_pathbuf counters in case of error. */
-    _my_tls.locals.pathbufs.c_cnt = _c_cnt;
-    _my_tls.locals.pathbufs.w_cnt = _w_cnt;
     __ljfault (_context, 1);
   }
   void reset () __attribute__ ((always_inline))
@@ -324,17 +317,73 @@ class myfault
   ~myfault () __attribute__ ((always_inline)) { sebastian.reset (); }
   inline int faulted () __attribute__ ((always_inline))
   {
-    return sebastian.setup (0);
+    return sebastian.setup ();
   }
-  inline int faulted (void const *obj, int myerrno = 0) __attribute__ ((always_inline))
-  {
-    return !obj || !(*(const char **) obj) || sebastian.setup (myerrno);
+};
+#endif
+
+/* Exception handling macros.  These are required because SEH differs a lot
+   between 32 and 64 bit.  Essentially, on 64 bit, we have to create compile
+   time SEH tables which define the handler and try/except labels, while on
+   32 bit we can simply set up an SJLJ handler within the myfault class. */
+#define __mem_barrier	__asm__ __volatile__ ("" ::: "memory")
+#ifdef __x86_64__
+#define __try \
+  { \
+    __label__ __l_try, __l_except, __l_endtry; \
+    __mem_barrier; \
+    __asm__ goto ("\n" \
+      "  .seh_handler _ZN9exception7myfaultEP17_EXCEPTION_RECORDPvP8_CONTEXTP19_DISPATCHER_CONTEXT, @except						\n" \
+      "  .seh_handlerdata						\n" \
+      "  .long 1							\n" \
+      "  .rva %l[__l_try],%l[__l_endtry],%l[__l_except],%l[__l_except]	\n" \
+      "  .seh_code							\n" \
+      : : : : __l_try, __l_endtry, __l_except); \
+    { \
+      __l_try: \
+	__mem_barrier;
+
+#define __leave	\
+      goto __l_endtry
+
+#define __except(__errno) \
+      goto __l_endtry; \
+    } \
+    { \
+      __l_except: \
+	__mem_barrier; \
+	if (__errno) \
+	  set_errno (__errno);
+
+#define __endtry \
+    } \
+    __l_endtry: \
+      __mem_barrier; \
   }
-  inline int faulted (int myerrno) __attribute__ ((always_inline))
-  {
-    return sebastian.setup (myerrno);
+
+#else /* !__x86_64__ */
+#define __try \
+  { \
+    myfault efault; \
+    if (!efault.faulted ()) \
+      {
+
+#define __leave	\
+	goto __l_endtry
+
+#define __except(__errno) \
+	  goto __l_endtry; \
+      } \
+      { \
+	if (__errno) \
+	  set_errno (__errno);
+
+#define __endtry \
+      } \
+    __l_endtry: \
+      __mem_barrier; \
   }
-};
+#endif /* __x86_64__ */
 
 class set_signal_arrived
 {

winsup/cygwin/dcrt0.cc

@@ -796,10 +796,6 @@ dll_crt0_0 ()
 
   _main_tls = &_my_tls;
 
-#ifdef __x86_64__
-  exception::install_myfault_handler ();
-#endif
-
   /* Initialize signal processing here, early, in the hopes that the creation
      of a thread early in the process will cause more predictability in memory
      layout for the main thread. */