From 893ac8e03c21d246bbfc8d575a227d8c65cfae76 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Sun, 3 Jul 2005 02:40:30 +0000 Subject: 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. --- winsup/cygwin/winsup.h | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) (limited to 'winsup/cygwin/winsup.h') diff --git a/winsup/cygwin/winsup.h b/winsup/cygwin/winsup.h index fc9e9ec22..374e5052f 100644 --- a/winsup/cygwin/winsup.h +++ b/winsup/cygwin/winsup.h @@ -266,26 +266,11 @@ void __stdcall set_console_title (char *); void init_console_handler (BOOL); void init_global_security (); -int __stdcall check_null_str (const char *name) __attribute__ ((regparm(1))); -int __stdcall check_null_empty_str (const char *name) __attribute__ ((regparm(1))); -int __stdcall check_null_empty_str_errno (const char *name) __attribute__ ((regparm(1))); -int __stdcall check_null_str_errno (const char *name) __attribute__ ((regparm(1))); -int __stdcall __check_null_invalid_struct (void *s, unsigned sz) __attribute__ ((regparm(2))); -int __stdcall __check_null_invalid_struct_errno (void *s, unsigned sz) __attribute__ ((regparm(2))); -int __stdcall __check_invalid_read_ptr (const void *s, unsigned sz) __attribute__ ((regparm(2))); -int __stdcall __check_invalid_read_ptr_errno (const void *s, unsigned sz) __attribute__ ((regparm(2))); int __stdcall check_invalid_virtual_addr (const void *s, unsigned sz) __attribute__ ((regparm(2))); -#define check_null_invalid_struct(s) \ - __check_null_invalid_struct ((s), sizeof (*(s))) -#define check_null_invalid_struct_errno(s) \ - __check_null_invalid_struct_errno ((s), sizeof (*(s))) -#define check_invalid_read_struct_errno(s) \ - __check_invalid_read_ptr_errno ((s), sizeof (*(s))) - -struct iovec; -ssize_t check_iovec_for_read (const struct iovec *, int) __attribute__ ((regparm(2))); -ssize_t check_iovec_for_write (const struct iovec *, int) __attribute__ ((regparm(2))); +ssize_t check_iovec (const struct iovec *, int, bool) __attribute__ ((regparm(3))); +#define check_iovec_for_read(a, b) check_iovec ((a), (b), false) +#define check_iovec_for_write(a, b) check_iovec ((a), (b), true) #define set_winsock_errno() __set_winsock_errno (__FUNCTION__, __LINE__) void __set_winsock_errno (const char *fn, int ln) __attribute__ ((regparm(2))); -- cgit v1.2.3