* 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, 31 insertions, 27 deletions

diff --git a/winsup/cygwin/shm.cc b/winsup/cygwin/shm.cc
index 03213781a..868545e3b 100644
--- a/winsup/cygwin/shm.cc
+++ b/winsup/cygwin/shm.cc
@@ -260,41 +260,45 @@ shmctl (int shmid, int cmd, struct shmid_ds *buf)
 {
   syscall_printf ("shmctl (shmid = %d, cmd = %d, buf = %p)",
 		  shmid, cmd, buf);
-  myfault efault;
-  if (efault.faulted (EFAULT))
-    return -1;
-  client_request_shm request (shmid, cmd, buf);
-  if (request.make_request () == -1 || request.retval () == -1)
-    {
-      syscall_printf ("-1 [%d] = shmctl ()", request.error_code ());
-      set_errno (request.error_code ());
-      if (request.error_code () == ENOSYS)
-	raise (SIGSYS);
-      return -1;
-    }
-  if (cmd == IPC_RMID)
+  __try
     {
-      /* Cleanup */
-      shm_shmid_list *ssh_entry, *ssh_next_entry;
-      SLIST_LOCK ();
-      SLIST_FOREACH_SAFE (ssh_entry, &ssh_list, ssh_next, ssh_next_entry)
+      client_request_shm request (shmid, cmd, buf);
+      if (request.make_request () == -1 || request.retval () == -1)
+	{
+	  syscall_printf ("-1 [%d] = shmctl ()", request.error_code ());
+	  set_errno (request.error_code ());
+	  if (request.error_code () == ENOSYS)
+	    raise (SIGSYS);
+	  __leave;
+	}
+      if (cmd == IPC_RMID)
 	{
-	  if (ssh_entry->shmid == shmid)
+	  /* Cleanup */
+	  shm_shmid_list *ssh_entry, *ssh_next_entry;
+	  SLIST_LOCK ();
+	  SLIST_FOREACH_SAFE (ssh_entry, &ssh_list, ssh_next, ssh_next_entry)
 	    {
-	      /* Remove this entry from the list and close the handle
-		 only if it's not in use anymore. */
-	      if (ssh_entry->ref_count <= 0)
+	      if (ssh_entry->shmid == shmid)
 		{
-		  SLIST_REMOVE (&ssh_list, ssh_entry, shm_shmid_list, ssh_next);
-		  CloseHandle (ssh_entry->hdl);
-		  delete ssh_entry;
+		  /* Remove this entry from the list and close the handle
+		     only if it's not in use anymore. */
+		  if (ssh_entry->ref_count <= 0)
+		    {
+		      SLIST_REMOVE (&ssh_list, ssh_entry, shm_shmid_list,
+				    ssh_next);
+		      CloseHandle (ssh_entry->hdl);
+		      delete ssh_entry;
+		    }
+		  break;
 		}
-	      break;
 	    }
+	  SLIST_UNLOCK ();
 	}
-      SLIST_UNLOCK ();
+      return request.retval ();
     }
-  return request.retval ();
+  __except (EFAULT) {}
+  __endtry
+  return -1;
 }
 
 extern "C" int