Replace valid memory checks with new myfault class "exception handling", almost

everywhere.  Leave some thread.cc stuff alone for now.
* cygtls.h: Kludge some definitions to avoid including a problematic windows
header.
(_cygtls::_myfault): New entry.
(_cygtls::_myfault_errno): Ditto.
(_cygtls::fault_guarded): New function.
(_cygtls::setup_fault): Ditto.
(_cygtls::return_from_fault): Ditto.
(_cygtls::clear_fault): Ditto.
(myfault): New class.
* exceptions.cc (handle_exceptions): Handle case of guarded fault in system
routine.
* gendef: Add another entry point for setjmp that the compiler doesn't know
about and won't complain about.
* gentls_offsets: Just include windows.h rather than kludging a HANDLE def.
* miscfuncs.cc (check_null_str): Delete.
(check_null_empty_str): Ditto.
(check_null_empty_str_errno): Ditto.
(check_null_str_errno): Ditto.
(__check_null_invalid_struct): Ditto.
(__check_null_invalid_struct_errno): Ditto.
(__check_invalid_read_ptr): Ditto.
(__check_invalid_read_ptr_errno): Ditto.
(dummytest): New function.
(check_iovec_for_read): Delete.
(chec_iovec): Rename from check_iovec_for_write.  Take a read/write parameter.
* tlsoffsets.h: Regenerate.
* winsup.h: Remove check_* declarations.
(check_iovec_for_read): Delete declaration.  Turn into a define instead.
(check_iovec_for_write): Ditto.
(check_iovec): New declaration.
* thread.h: Use ifdef guard name consistent with other header files.

1 files changed, 12 insertions, 7 deletions

diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc
index 0e7a09fdf..d375c0a07 100644
--- a/winsup/cygwin/exceptions.cc
+++ b/winsup/cygwin/exceptions.cc
@@ -403,6 +403,7 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *)
 {
   static bool NO_COPY debugging;
   static int NO_COPY recursed;
+  _cygtls& me = _my_tls;
 
   if (debugging && ++debugging < 500000)
     {
@@ -520,11 +521,12 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *)
 	break;
       }
 
-  if (!cygwin_finished_initializing
-      || GetCurrentThreadId () == sigtid
-      || (void *) global_sigs[si.si_signo].sa_handler == (void *) SIG_DFL
-      || (void *) global_sigs[si.si_signo].sa_handler == (void *) SIG_IGN
-      || (void *) global_sigs[si.si_signo].sa_handler == (void *) SIG_ERR)
+  if (!me.fault_guarded ()
+      && (!cygwin_finished_initializing
+	  || GetCurrentThreadId () == sigtid
+	  || (void *) global_sigs[si.si_signo].sa_handler == (void *) SIG_DFL
+	  || (void *) global_sigs[si.si_signo].sa_handler == (void *) SIG_IGN
+	  || (void *) global_sigs[si.si_signo].sa_handler == (void *) SIG_ERR))
     {
       /* Print the exception to the console */
       if (!myself->cygstarted)
@@ -559,11 +561,14 @@ handle_exceptions (EXCEPTION_RECORD *e0, void *frame, CONTEXT *in0, void *)
   RtlUnwind (frame, ret_here, e0, 0);
   __asm__ volatile (".equ _ret_here,.");
 
+  if (me.fault_guarded ())
+    me.return_from_fault ();
+
   si.si_addr = ebp;
   si.si_code = SI_KERNEL;
   si.si_errno = si.si_pid = si.si_uid = 0;
-  _my_tls.push ((__stack_t) ebp, true);
-  sig_send (NULL, si, &_my_tls);	// Signal myself
+  me.push ((__stack_t) ebp, true);
+  sig_send (NULL, si, &me);	// Signal myself
   return 1;
 }