diff options
| author | mdejong <mdejong> | 2004-06-21 22:07:30 (GMT) |
|---|---|---|
| committer | mdejong <mdejong> | 2004-06-21 22:07:30 (GMT) |
| commit | 30fdb3f31f7f5049800152384dc71d3413e88cac (patch) | |
| tree | 0d504bc39e9ca874037cde6be8a9aa0666e194d5 /win/tclWinChan.c | |
| parent | 6657d2d04e1d22197589ec44b31077519474a29f (diff) | |
| download | tcl-30fdb3f31f7f5049800152384dc71d3413e88cac.zip tcl-30fdb3f31f7f5049800152384dc71d3413e88cac.tar.gz tcl-30fdb3f31f7f5049800152384dc71d3413e88cac.tar.bz2 | |
* win/tclWin32Dll.c (DllMain, _except_dllmain_detach_handler,
TclpCheckStackSpace, _except_checkstackspace_handler,
TclWinCPUID, _except_TclWinCPUID_detach_handler):
* win/tclWinChan.c (Tcl_MakeFileChannel,
_except_makefilechannel_handler):
* win/tclWinFCmd.c (DoRenameFile,
_except_dorenamefile_handler, DoCopyFile,
_except_docopyfile_handler):
Rework pushing of exception handler function pointer
so that compiling with gcc -O3 works. Remove empty
function call to avoid compiler warning. Mark the
DllMain function as noinline to avoid compiler
error from duplicated asm labels in generated code.
Diffstat (limited to 'win/tclWinChan.c')
| -rw-r--r-- | win/tclWinChan.c | 42 |
1 files changed, 35 insertions, 7 deletions
diff --git a/win/tclWinChan.c b/win/tclWinChan.c index c6640f1..60f9aef 100644 --- a/win/tclWinChan.c +++ b/win/tclWinChan.c @@ -9,7 +9,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tclWinChan.c,v 1.30 2003/01/26 05:59:38 mdejong Exp $ + * RCS: @(#) $Id: tclWinChan.c,v 1.30.2.1 2004/06/21 22:07:32 mdejong Exp $ */ #include "tclWinInt.h" @@ -131,6 +131,17 @@ static void *INITIAL_ESP, *RESTORED_HANDLER; #endif /* HAVE_NO_SEH && TCL_MEM_DEBUG */ +#ifdef HAVE_NO_SEH +static +__attribute__ ((cdecl)) +EXCEPTION_DISPOSITION +_except_makefilechannel_handler( + struct _EXCEPTION_RECORD *ExceptionRecord, + void *EstablisherFrame, + struct _CONTEXT *ContextRecord, + void *DispatcherContext); +#endif + /* *---------------------------------------------------------------------- @@ -1059,10 +1070,13 @@ Tcl_MakeFileChannel(rawHandle, mode) result = 0; __asm__ __volatile__ ( - "pushl %ebp" "\n\t" - "pushl $__except_makefilechannel_handler" "\n\t" - "pushl %fs:0" "\n\t" - "movl %esp, %fs:0"); + "pushl %%ebp" "\n\t" + "pushl %0" "\n\t" + "pushl %%fs:0" "\n\t" + "movl %%esp, %%fs:0" + : + : "r" (_except_makefilechannel_handler) + ); #else __try { #endif /* HAVE_NO_SEH */ @@ -1126,6 +1140,22 @@ Tcl_MakeFileChannel(rawHandle, mode) return channel; } + +/* + *---------------------------------------------------------------------- + * + * _except_makefilechannel_handler -- + * + * SEH exception handler for Tcl_MakeFileChannel. + * + * Results: + * See Tcl_MakeFileChannel. + * + * Side effects: + * See Tcl_MakeFileChannel. + * + *---------------------------------------------------------------------- + */ #ifdef HAVE_NO_SEH static __attribute__ ((cdecl)) @@ -1138,8 +1168,6 @@ _except_makefilechannel_handler( { __asm__ __volatile__ ( "jmp makefilechannel_reentry"); - /* Nuke compiler warning about unused static function */ - _except_makefilechannel_handler(NULL, NULL, NULL, NULL); return 0; /* Function does not return */ } #endif |