* 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, 64 insertions, 61 deletions

diff --git a/winsup/cygwin/uname.cc b/winsup/cygwin/uname.cc
index c571850b4..b586e6374 100644
--- a/winsup/cygwin/uname.cc
+++ b/winsup/cygwin/uname.cc
@@ -1,7 +1,7 @@
 /* uname.cc
 
    Copyright 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-   2006, 2007, 2008, 2013 Red Hat, Inc.
+   2006, 2007, 2008, 2013, 2014 Red Hat, Inc.
    Written by Steve Chamberlain of Cygnus Support, sac@cygnus.com
    Rewritten by Geoffrey Noer of Cygnus Solutions, noer@cygnus.com
 
@@ -22,74 +22,77 @@ uname (struct utsname *name)
 {
   SYSTEM_INFO sysinfo;
 
-  myfault efault;
-  if (efault.faulted (EFAULT))
-    return -1;
-
-  char *snp = strstr  (cygwin_version.dll_build_date, "SNP");
+  __try
+    {
+      char *snp = strstr  (cygwin_version.dll_build_date, "SNP");
 
-  memset (name, 0, sizeof (*name));
-  __small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ());
+      memset (name, 0, sizeof (*name));
+      __small_sprintf (name->sysname, "CYGWIN_%s", wincap.osname ());
 
-  /* Add a hint to the sysname, that we're running under WOW64.  This might
-     give an early clue if somebody encounters problems. */
-  if (wincap.is_wow64 ())
-    strncat (name->sysname, "-WOW64",
-	     sizeof name->sysname - strlen (name->sysname) - 1);
+      /* Add a hint to the sysname, that we're running under WOW64.  This might
+	 give an early clue if somebody encounters problems. */
+      if (wincap.is_wow64 ())
+	strncat (name->sysname, "-WOW64",
+		 sizeof name->sysname - strlen (name->sysname) - 1);
 
-  GetSystemInfo (&sysinfo);
+      GetSystemInfo (&sysinfo);
 
-  /* Computer name */
-  cygwin_gethostname (name->nodename, sizeof (name->nodename) - 1);
+      /* Computer name */
+      cygwin_gethostname (name->nodename, sizeof (name->nodename) - 1);
 
-  /* Cygwin dll release */
-  __small_sprintf (name->release, "%d.%d.%d%s(%d.%d/%d/%d)",
-		   cygwin_version.dll_major / 1000,
-		   cygwin_version.dll_major % 1000,
-		   cygwin_version.dll_minor,
-		   snp ? "s" : "",
-		   cygwin_version.api_major,
-		   cygwin_version.api_minor,
-		   cygwin_version.shared_data,
-		   cygwin_version.mount_registry);
+      /* Cygwin dll release */
+      __small_sprintf (name->release, "%d.%d.%d%s(%d.%d/%d/%d)",
+		       cygwin_version.dll_major / 1000,
+		       cygwin_version.dll_major % 1000,
+		       cygwin_version.dll_minor,
+		       snp ? "s" : "",
+		       cygwin_version.api_major,
+		       cygwin_version.api_minor,
+		       cygwin_version.shared_data,
+		       cygwin_version.mount_registry);
 
-  /* Cygwin "version" aka build date */
-  strcpy (name->version, cygwin_version.dll_build_date);
-  if (snp)
-    name->version[snp - cygwin_version.dll_build_date] = '\0';
+      /* Cygwin "version" aka build date */
+      strcpy (name->version, cygwin_version.dll_build_date);
+      if (snp)
+	name->version[snp - cygwin_version.dll_build_date] = '\0';
 
-  /* CPU type */
-  switch (sysinfo.wProcessorArchitecture)
+      /* CPU type */
+      switch (sysinfo.wProcessorArchitecture)
+	{
+	  case PROCESSOR_ARCHITECTURE_INTEL:
+	    unsigned int ptype;
+	    if (sysinfo.wProcessorLevel < 3) /* Shouldn't happen. */
+	      ptype = 3;
+	    else if (sysinfo.wProcessorLevel > 9) /* P4 */
+	      ptype = 6;
+	    else
+	      ptype = sysinfo.wProcessorLevel;
+	    __small_sprintf (name->machine, "i%d86", ptype);
+	    break;
+	  case PROCESSOR_ARCHITECTURE_IA64:
+	    strcpy (name->machine, "ia64");
+	    break;
+	  case PROCESSOR_ARCHITECTURE_AMD64:
+	    strcpy (name->machine, "x86_64");
+	    break;
+	  case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64:
+	    strcpy (name->machine, "ia32-win64");
+	    break;
+	  case PROCESSOR_ARCHITECTURE_ALPHA:
+	    strcpy (name->machine, "alpha");
+	    break;
+	  case PROCESSOR_ARCHITECTURE_MIPS:
+	    strcpy (name->machine, "mips");
+	    break;
+	  default:
+	    strcpy (name->machine, "unknown");
+	    break;
+	}
+    }
+  __except (EFAULT)
     {
-      case PROCESSOR_ARCHITECTURE_INTEL:
-	unsigned int ptype;
-	if (sysinfo.wProcessorLevel < 3) /* Shouldn't happen. */
-	  ptype = 3;
-	else if (sysinfo.wProcessorLevel > 9) /* P4 */
-	  ptype = 6;
-	else
-	  ptype = sysinfo.wProcessorLevel;
-	__small_sprintf (name->machine, "i%d86", ptype);
-	break;
-      case PROCESSOR_ARCHITECTURE_IA64:
-	strcpy (name->machine, "ia64");
-	break;
-      case PROCESSOR_ARCHITECTURE_AMD64:
-	strcpy (name->machine, "x86_64");
-	break;
-      case PROCESSOR_ARCHITECTURE_IA32_ON_WIN64:
-	strcpy (name->machine, "ia32-win64");
-	break;
-      case PROCESSOR_ARCHITECTURE_ALPHA:
-	strcpy (name->machine, "alpha");
-	break;
-      case PROCESSOR_ARCHITECTURE_MIPS:
-	strcpy (name->machine, "mips");
-	break;
-      default:
-	strcpy (name->machine, "unknown");
-	break;
+      return -1;
     }
-
+  __endtry
   return 0;
 }