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

2 files changed, 95 insertions, 93 deletions

diff --git a/winsup/cygwin/libc/bsdlib.cc b/winsup/cygwin/libc/bsdlib.cc
index 696a9f856..89bc9431c 100644
--- a/winsup/cygwin/libc/bsdlib.cc
+++ b/winsup/cygwin/libc/bsdlib.cc
@@ -249,8 +249,7 @@ getprogname (void)
 extern "C" void
 setprogname (const char *newprogname)
 {
-  myfault efault;
-  if (!efault.faulted (EFAULT))
+  __try
     {
       /* Per BSD man page, setprogname keeps a pointer to the last
 	 path component of the argument.  It does *not* copy the
@@ -261,6 +260,8 @@ setprogname (const char *newprogname)
       else
 	__progname = (char *)newprogname;
     }
+  __except (EFAULT) {}
+  __endtry
 }
 
 extern "C" void
diff --git a/winsup/cygwin/libc/rexec.cc b/winsup/cygwin/libc/rexec.cc
index c3074d381..f9be2231a 100644
--- a/winsup/cygwin/libc/rexec.cc
+++ b/winsup/cygwin/libc/rexec.cc
@@ -312,100 +312,101 @@ extern "C" int
 cygwin_rexec (char **ahost, unsigned short rport, char *name, char *pass,
 	      char *cmd, int *fd2p)
 {
-	struct sockaddr_in sin, sin2, from;
-	struct hostent *hp;
-	u_short port = 0;
-	int s, timo = 1, s3;
-	char c;
-	static char ahostbuf[INTERNET_MAX_HOST_NAME_LENGTH + 1];
+  struct sockaddr_in sin, sin2, from;
+  struct hostent *hp;
+  u_short port = 0;
+  int s, timo = 1, s3;
+  char c;
+  static char ahostbuf[INTERNET_MAX_HOST_NAME_LENGTH + 1];
 
-	myfault efault;
-	if (efault.faulted (EFAULT))
-		return -1;
-
-	hp = cygwin_gethostbyname(*ahost);
-	if (hp == 0) {
-		cygwin_herror(*ahost);
-		return (-1);
-	}
-	*ahost = strcpy (ahostbuf, hp->h_name);
-	ruserpass(hp->h_name, &name, &pass, NULL);
-	if (!name)
-		name = getlogin ();
-	if (!pass)
-		pass = almost_null;
+  __try
+    {
+      hp = cygwin_gethostbyname(*ahost);
+      if (hp == 0) {
+	      cygwin_herror(*ahost);
+	      return (-1);
+      }
+      *ahost = strcpy (ahostbuf, hp->h_name);
+      ruserpass(hp->h_name, &name, &pass, NULL);
+      if (!name)
+	      name = getlogin ();
+      if (!pass)
+	      pass = almost_null;
 retry:
-	s = cygwin_socket(AF_INET, SOCK_STREAM, 0);
-	if (s < 0) {
-		perror("rexec: socket");
-		return (-1);
-	}
-	sin.sin_family = hp->h_addrtype;
-	sin.sin_port = rport;
-	bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
-	if (cygwin_connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
-		if (errno == ECONNREFUSED && timo <= 16) {
-			(void) close(s);
-			sleep(timo);
-			timo *= 2;
-			goto retry;
-		}
-		perror(hp->h_name);
-		return (-1);
-	}
-	if (fd2p == 0) {
-		(void) write(s, "", 1);
-	} else {
-		char num[8];
-		int s2, sin2len;
+      s = cygwin_socket(AF_INET, SOCK_STREAM, 0);
+      if (s < 0) {
+	      perror("rexec: socket");
+	      return (-1);
+      }
+      sin.sin_family = hp->h_addrtype;
+      sin.sin_port = rport;
+      bcopy(hp->h_addr, (caddr_t)&sin.sin_addr, hp->h_length);
+      if (cygwin_connect(s, (struct sockaddr *)&sin, sizeof(sin)) < 0) {
+	      if (errno == ECONNREFUSED && timo <= 16) {
+		      (void) close(s);
+		      sleep(timo);
+		      timo *= 2;
+		      goto retry;
+	      }
+	      perror(hp->h_name);
+	      return (-1);
+      }
+      if (fd2p == 0) {
+	      (void) write(s, "", 1);
+      } else {
+	      char num[8];
+	      int s2, sin2len;
 
-		s2 = cygwin_socket(AF_INET, SOCK_STREAM, 0);
-		if (s2 < 0) {
-			(void) close(s);
-			return (-1);
-		}
-		cygwin_listen(s2, 1);
-		sin2len = sizeof (sin2);
-		if (cygwin_getsockname(s2, (struct sockaddr *)&sin2, &sin2len) < 0 ||
-		  sin2len != sizeof (sin2)) {
-			perror("getsockname");
-			(void) close(s2);
-			goto bad;
+	      s2 = cygwin_socket(AF_INET, SOCK_STREAM, 0);
+	      if (s2 < 0) {
+		      (void) close(s);
+		      return (-1);
+	      }
+	      cygwin_listen(s2, 1);
+	      sin2len = sizeof (sin2);
+	      if (cygwin_getsockname(s2, (struct sockaddr *)&sin2, &sin2len) < 0 ||
+		sin2len != sizeof (sin2)) {
+		      perror("getsockname");
+		      (void) close(s2);
+		      goto bad;
+	      }
+	      port = ntohs((u_short)sin2.sin_port);
+	      (void) sprintf(num, "%u", port);
+	      (void) write(s, num, strlen(num)+1);
+	      { int len = sizeof (from);
+		s3 = cygwin_accept(s2, (struct sockaddr *)&from, &len);
+		close(s2);
+		if (s3 < 0) {
+		      perror("accept");
+		      port = 0;
+		      goto bad;
 		}
-		port = ntohs((u_short)sin2.sin_port);
-		(void) sprintf(num, "%u", port);
-		(void) write(s, num, strlen(num)+1);
-		{ int len = sizeof (from);
-		  s3 = cygwin_accept(s2, (struct sockaddr *)&from, &len);
-		  close(s2);
-		  if (s3 < 0) {
-			perror("accept");
-			port = 0;
-			goto bad;
-		  }
-		}
-		*fd2p = s3;
-	}
-	(void) write(s, name, strlen(name) + 1);
-	/* should public key encypt the password here */
-	(void) write(s, pass, strlen(pass) + 1);
-	(void) write(s, cmd, strlen(cmd) + 1);
-	if (read(s, &c, 1) != 1) {
-		perror(*ahost);
-		goto bad;
-	}
-	if (c != 0) {
-		while (read(s, &c, 1) == 1) {
-			(void) write(2, &c, 1);
-			if (c == '\n')
-				break;
-		}
-		goto bad;
-	}
-	return (s);
+	      }
+	      *fd2p = s3;
+      }
+      (void) write(s, name, strlen(name) + 1);
+      /* should public key encypt the password here */
+      (void) write(s, pass, strlen(pass) + 1);
+      (void) write(s, cmd, strlen(cmd) + 1);
+      if (read(s, &c, 1) != 1) {
+	      perror(*ahost);
+	      goto bad;
+      }
+      if (c != 0) {
+	      while (read(s, &c, 1) == 1) {
+		      (void) write(2, &c, 1);
+		      if (c == '\n')
+			      break;
+	      }
+	      goto bad;
+      }
+      return (s);
 bad:
-	if (port)
-		(void) close(*fd2p);
-	(void) close(s);
-	return (-1);
+      if (port)
+	      (void) close(*fd2p);
+      (void) close(s);
+    }
+  __except (EFAULT) {}
+  __endtry
+  return (-1);
 }