* 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.

1 files changed, 66 insertions, 60 deletions

diff --git a/winsup/cygwin/signal.cc b/winsup/cygwin/signal.cc
index 3ea8af502..d2ca81e00 100644
--- a/winsup/cygwin/signal.cc
+++ b/winsup/cygwin/signal.cc
@@ -1,7 +1,7 @@
 /* signal.cc
 
    Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-   2007, 2008, 2009, 2010, 2011, 2012, 2013 Red Hat, Inc.
+   2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Red Hat, Inc.
 
    Written by Steve Chamberlain of Cygnus Support, sac@cygnus.com
    Significant changes by Sergey Okhapkin <sos@prospect.com.ru>
@@ -197,33 +197,37 @@ handle_sigprocmask (int how, const sigset_t *set, sigset_t *oldset, sigset_t& op
       return EINVAL;
     }
 
-  myfault efault;
-  if (efault.faulted (EFAULT))
-    return EFAULT;
-
-  if (oldset)
-    *oldset = opmask;
+  __try
+	{
+      if (oldset)
+	*oldset = opmask;
 
-  if (set)
-    {
-      sigset_t newmask = opmask;
-      switch (how)
+      if (set)
 	{
-	case SIG_BLOCK:
-	  /* add set to current mask */
-	  newmask |= *set;
-	  break;
-	case SIG_UNBLOCK:
-	  /* remove set from current mask */
-	  newmask &= ~*set;
-	  break;
-	case SIG_SETMASK:
-	  /* just set it */
-	  newmask = *set;
-	  break;
+	  sigset_t newmask = opmask;
+	  switch (how)
+	    {
+	    case SIG_BLOCK:
+	      /* add set to current mask */
+	      newmask |= *set;
+	      break;
+	    case SIG_UNBLOCK:
+	      /* remove set from current mask */
+	      newmask &= ~*set;
+	      break;
+	    case SIG_SETMASK:
+	      /* just set it */
+	      newmask = *set;
+	      break;
+	    }
+	  set_signal_mask (opmask, newmask);
 	}
-      set_signal_mask (opmask, newmask);
     }
+  __except (EFAULT)
+    {
+      return EFAULT;
+    }
+  __endtry
   return 0;
 }
 
@@ -382,8 +386,7 @@ sigaction_worker (int sig, const struct sigaction *newact,
 		  struct sigaction *oldact, bool isinternal)
 {
   int res = -1;
-  myfault efault;
-  if (!efault.faulted (EFAULT))
+  __try
     {
       sig_dispatch_pending ();
       /* check that sig is in right range */
@@ -394,14 +397,17 @@ sigaction_worker (int sig, const struct sigaction *newact,
 	  struct sigaction oa = global_sigs[sig];
 
 	  if (!newact)
-	    sigproc_printf ("signal %d, newact %p, oa %p", sig, newact, oa, oa.sa_handler);
+	    sigproc_printf ("signal %d, newact %p, oa %p",
+			    sig, newact, oa, oa.sa_handler);
 	  else
 	    {
-	      sigproc_printf ("signal %d, newact %p (handler %p), oa %p", sig, newact, newact->sa_handler, oa, oa.sa_handler);
+	      sigproc_printf ("signal %d, newact %p (handler %p), oa %p",
+			      sig, newact, newact->sa_handler, oa,
+			      oa.sa_handler);
 	      if (sig == SIGKILL || sig == SIGSTOP)
 		{
 		  set_errno (EINVAL);
-		  goto out;
+		  __leave;
 		}
 	      struct sigaction na = *newact;
 	      struct sigaction& gs = global_sigs[sig];
@@ -430,8 +436,8 @@ sigaction_worker (int sig, const struct sigaction *newact,
 	    res = 0;
 	}
     }
-
-out:
+  __except (EFAULT) {}
+  __endtry
   return res;
 }
 
@@ -560,41 +566,41 @@ sigwait (const sigset_t *set, int *sig_ptr)
 extern "C" int
 sigwaitinfo (const sigset_t *set, siginfo_t *info)
 {
-  pthread_testcancel ();
-
-  myfault efault;
-  if (efault.faulted (EFAULT))
-    return -1;
+  int res = -1;
 
-  set_signal_mask (_my_tls.sigwait_mask, *set);
-  sig_dispatch_pending (true);
+  pthread_testcancel ();
 
-  int res;
-  switch (cygwait (NULL, cw_infinite, cw_sig_eintr | cw_cancel | cw_cancel_self))
+  __try
     {
-    case WAIT_SIGNALED:
-      if (!sigismember (set, _my_tls.infodata.si_signo))
-	{
-	  set_errno (EINTR);
-	  res = -1;
-	}
-      else
+      set_signal_mask (_my_tls.sigwait_mask, *set);
+      sig_dispatch_pending (true);
+
+      switch (cygwait (NULL, cw_infinite, cw_sig_eintr | cw_cancel | cw_cancel_self))
 	{
-	  _my_tls.lock ();
-	  if (info)
-	    *info = _my_tls.infodata;
-	  res = _my_tls.infodata.si_signo;
-	  _my_tls.sig = 0;
-	  if (_my_tls.retaddr () == (__stack_t) sigdelayed)
-	    _my_tls.pop ();
-	  _my_tls.unlock ();
+	case WAIT_SIGNALED:
+	  if (!sigismember (set, _my_tls.infodata.si_signo))
+	    set_errno (EINTR);
+	  else
+	    {
+	      _my_tls.lock ();
+	      if (info)
+		*info = _my_tls.infodata;
+	      res = _my_tls.infodata.si_signo;
+	      _my_tls.sig = 0;
+	      if (_my_tls.retaddr () == (__stack_t) sigdelayed)
+		_my_tls.pop ();
+	      _my_tls.unlock ();
+	    }
+	  break;
+	default:
+	  __seterrno ();
+	  break;
 	}
-      break;
-    default:
-      __seterrno ();
-      res = -1;
     }
-
+  __except (EFAULT) {
+    res = -1;
+  }
+  __endtry
   sigproc_printf ("returning signal %d", res);
   return res;
 }