* 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/resource.cc

@@ -1,7 +1,7 @@
 /* resource.cc: getrusage () and friends.
 
    Copyright 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2005, 2008, 2009, 2010,
-   2011, 2012, 2013 Red Hat, Inc.
+   2011, 2012, 2013, 2014 Red Hat, Inc.
 
    Written by Steve Chamberlain (sac@cygnus.com), Doug Evans (dje@cygnus.com),
    Geoffrey Noer (noer@cygnus.com) of Cygnus Support.
@@ -116,53 +116,51 @@ getrlimit (int resource, struct rlimit *rlp)
 {
   MEMORY_BASIC_INFORMATION m;
 
-  myfault efault;
-  if (efault.faulted (EFAULT))
-    return -1;
-
-  rlp->rlim_cur = RLIM_INFINITY;
-  rlp->rlim_max = RLIM_INFINITY;
-
-  switch (resource)
+  __try
     {
-    case RLIMIT_CPU:
-    case RLIMIT_FSIZE:
-    case RLIMIT_DATA:
-    case RLIMIT_AS:
-      break;
-    case RLIMIT_STACK:
-      if (!VirtualQuery ((LPCVOID) &m, &m, sizeof m))
-	debug_printf ("couldn't get stack info, returning def.values. %E");
-      else
+      rlp->rlim_cur = RLIM_INFINITY;
+      rlp->rlim_max = RLIM_INFINITY;
+
+      switch (resource)
 	{
-	  rlp->rlim_cur = (rlim_t) &m - (rlim_t) m.AllocationBase;
-	  rlp->rlim_max = (rlim_t) m.BaseAddress + m.RegionSize
-			  - (rlim_t) m.AllocationBase;
+	case RLIMIT_CPU:
+	case RLIMIT_FSIZE:
+	case RLIMIT_DATA:
+	case RLIMIT_AS:
+	  break;
+	case RLIMIT_STACK:
+	  if (!VirtualQuery ((LPCVOID) &m, &m, sizeof m))
+	    debug_printf ("couldn't get stack info, returning def.values. %E");
+	  else
+	    {
+	      rlp->rlim_cur = (rlim_t) &m - (rlim_t) m.AllocationBase;
+	      rlp->rlim_max = (rlim_t) m.BaseAddress + m.RegionSize
+			      - (rlim_t) m.AllocationBase;
+	    }
+	  break;
+	case RLIMIT_NOFILE:
+	  rlp->rlim_cur = getdtablesize ();
+	  if (rlp->rlim_cur < OPEN_MAX)
+	    rlp->rlim_cur = OPEN_MAX;
+	  rlp->rlim_max = OPEN_MAX_MAX;
+	  break;
+	case RLIMIT_CORE:
+	  rlp->rlim_cur = cygheap->rlim_core;
+	  break;
+	default:
+	  set_errno (EINVAL);
+	  __leave;
 	}
-      break;
-    case RLIMIT_NOFILE:
-      rlp->rlim_cur = getdtablesize ();
-      if (rlp->rlim_cur < OPEN_MAX)
-	rlp->rlim_cur = OPEN_MAX;
-      rlp->rlim_max = OPEN_MAX_MAX;
-      break;
-    case RLIMIT_CORE:
-      rlp->rlim_cur = cygheap->rlim_core;
-      break;
-    default:
-      set_errno (EINVAL);
-      return -1;
+      return 0;
     }
-  return 0;
+  __except (EFAULT) {}
+  __endtry
+  return -1;
 }
 
 extern "C" int
 setrlimit (int resource, const struct rlimit *rlp)
 {
-  myfault efault;
-  if (efault.faulted (EFAULT))
-    return -1;
-
   struct rlimit oldlimits;
 
   /* Check if the request is to actually change the resource settings.
@@ -170,29 +168,35 @@ setrlimit (int resource, const struct rlimit *rlp)
   if (getrlimit (resource, &oldlimits) < 0)
     return -1;
 
-  if (oldlimits.rlim_cur == rlp->rlim_cur &&
-      oldlimits.rlim_max == rlp->rlim_max)
-    /* No change in resource requirements, succeed immediately */
-    return 0;
-
-  if (rlp->rlim_cur > rlp->rlim_max)
+  __try
     {
-      set_errno (EINVAL);
-      return -1;
-    }
+      if (oldlimits.rlim_cur == rlp->rlim_cur &&
+	  oldlimits.rlim_max == rlp->rlim_max)
+	/* No change in resource requirements, succeed immediately */
+	return 0;
 
-  switch (resource)
-    {
-    case RLIMIT_CORE:
-      cygheap->rlim_core = rlp->rlim_cur;
-      break;
-    case RLIMIT_NOFILE:
-      if (rlp->rlim_cur != RLIM_INFINITY)
-	return setdtablesize (rlp->rlim_cur);
-      break;
-    default:
-      set_errno (EINVAL);
-      return -1;
+      if (rlp->rlim_cur > rlp->rlim_max)
+	{
+	  set_errno (EINVAL);
+	  __leave;
+	}
+
+      switch (resource)
+	{
+	case RLIMIT_CORE:
+	  cygheap->rlim_core = rlp->rlim_cur;
+	  break;
+	case RLIMIT_NOFILE:
+	  if (rlp->rlim_cur != RLIM_INFINITY)
+	    return setdtablesize (rlp->rlim_cur);
+	  break;
+	default:
+	  set_errno (EINVAL);
+	  __leave;
+	}
+      return 0;
     }
-  return 0;
+  __except (EFAULT)
+  __endtry
+  return -1;
 }