diff options
| author | Christopher Faylor <me@cgf.cx> | 2010-02-28 15:54:25 +0000 |
|---|---|---|
| committer | Christopher Faylor <me@cgf.cx> | 2010-02-28 15:54:25 +0000 |
| commit | 98a97ac6cfbbe6901e80e80caadfadacf4b931d3 (patch) | |
| tree | 8409a83fb77183df732f9ff28adc9e9db7e70314 /winsup/cygwin/exceptions.cc | |
| parent | d5d5bf4dd5609dd29e511d688e317b2f0f1987ca (diff) | |
| download | cygnal-98a97ac6cfbbe6901e80e80caadfadacf4b931d3.tar.gz cygnal-98a97ac6cfbbe6901e80e80caadfadacf4b931d3.tar.bz2 cygnal-98a97ac6cfbbe6901e80e80caadfadacf4b931d3.zip | |
Update some copyrights.
* cygtls.cc (_cygtls::call): Invoke new exception protection here.
(_cygtls::init_thread): Remove conditionalized exception handler setup.
(exception_list): Delete declaration.
(_cygtls::init_exception_handler): Delete obsolete function.
* cygtls.h: Remove (now) unneeded include.
(_cygtls): Make this a real C++ class.
(_cygtls::handle_exceptions): Remove.
(_cygtls::init_exception_handler): Remove.
(_cygtls::call2): Make private.
(myfault::faulted): Remove unneeded parentheses.
* dcrt0.cc (dll_crt0_1): Remove exception handler setup.
* dlfcn.cc (dlopen): Ditto.
(dlclose): Ditto.
* dll_init.cc (dll_dllcrt0_1): Ditto.
(dll_list::detach): Use new exception handler protection.
* exceptions.cc (dump_exception): Rename to prevent confusion with new class.
(exception::handle): Rename from _cygtls::handle_exceptions. Accommodate new
exception class. Accommodate rename to dump_exception.
* tlsoffsets.h: Regenerate.
Diffstat (limited to 'winsup/cygwin/exceptions.cc')
| -rw-r--r-- | winsup/cygwin/exceptions.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/winsup/cygwin/exceptions.cc b/winsup/cygwin/exceptions.cc index 978fd7729..c416edc98 100644 --- a/winsup/cygwin/exceptions.cc +++ b/winsup/cygwin/exceptions.cc @@ -1,7 +1,7 @@ /* exceptions.cc Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, - 2005, 2006, 2007, 2008, 2009 Red Hat, Inc. + 2005, 2006, 2007, 2008, 2009, 2010 Red Hat, Inc. This file is part of Cygwin. @@ -30,6 +30,7 @@ details. */ #include "cygheap.h" #include "child_info.h" #include "ntdll.h" +#include "exception.h" #define CALL_HANDLER_RETRY 20 @@ -174,7 +175,7 @@ open_stackdumpfile () /* Utilities for dumping the stack, etc. */ static void -exception (EXCEPTION_RECORD *e, CONTEXT *in) +dump_exception (EXCEPTION_RECORD *e, CONTEXT *in) { const char *exception_name = NULL; @@ -476,7 +477,7 @@ rtl_unwind (exception_list *frame, PEXCEPTION_RECORD e) extern exception_list *_except_list asm ("%fs:0"); int -_cygtls::handle_exceptions (EXCEPTION_RECORD *e, exception_list *frame, CONTEXT *in, void *) +exception::handle (EXCEPTION_RECORD *e, exception_list *frame, CONTEXT *in, void *) { static bool NO_COPY debugging; static int NO_COPY recursed; @@ -630,7 +631,7 @@ _cygtls::handle_exceptions (EXCEPTION_RECORD *e, exception_list *frame, CONTEXT /* Temporarily replace windows top level SEH with our own handler. We don't want any Windows magic kicking in. This top level frame will be removed automatically after our exception handler returns. */ - _except_list->handler = _cygtls::handle_exceptions; + _except_list->handler = handle; if (masked || &me == _sig_tls @@ -662,7 +663,7 @@ _cygtls::handle_exceptions (EXCEPTION_RECORD *e, exception_list *frame, CONTEXT rtl_unwind (frame, e); open_stackdumpfile (); - exception (e, in); + dump_exception (e, in); stackdump ((DWORD) ebp, 0, 1); } |