* 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.

4 files changed, 239 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index 9f69357..5c93bc3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2004-06-21  Mo DeJong  <mdejong@users.sourceforge.net>
+
+	* 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.
+
 2004-06-21  Donal K. Fellows  <donal.k.fellows@man.ac.uk>
 
 	* generic/tclThreadAlloc.c (Ptr2Block): Rewrote so as to maximize
diff --git a/win/tclWin32Dll.c b/win/tclWin32Dll.c
index def7996..42a9ace 100644
--- a/win/tclWin32Dll.c
+++ b/win/tclWin32Dll.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: tclWin32Dll.c,v 1.36 2004/06/05 17:31:08 kennykb Exp $
+ * RCS: @(#) $Id: tclWin32Dll.c,v 1.37 2004/06/21 22:05:55 mdejong Exp $
  */
 
 #include "tclWinInt.h"
@@ -46,6 +46,38 @@ static void *INITIAL_ESP,
             *RESTORED_HANDLER;
 #endif /* HAVE_NO_SEH && TCL_MEM_DEBUG */
 
+#ifdef HAVE_NO_SEH
+
+static
+__attribute__ ((cdecl))
+EXCEPTION_DISPOSITION
+_except_dllmain_detach_handler(
+    struct _EXCEPTION_RECORD *ExceptionRecord,
+    void *EstablisherFrame,
+    struct _CONTEXT *ContextRecord,
+    void *DispatcherContext);
+
+static
+__attribute__ ((cdecl))
+EXCEPTION_DISPOSITION
+_except_checkstackspace_handler(
+    struct _EXCEPTION_RECORD *ExceptionRecord,
+    void *EstablisherFrame,
+    struct _CONTEXT *ContextRecord,
+    void *DispatcherContext);
+
+static
+__attribute__((cdecl))
+EXCEPTION_DISPOSITION
+_except_TclWinCPUID_detach_handler(
+    struct _EXCEPTION_RECORD *ExceptionRecord,
+    void *EstablisherFrame,
+    struct _CONTEXT *ContextRecord,
+    void *DispatcherContext);
+
+#endif /* HAVE_NO_SEH */
+
+
 /*
  * The following function tables are used to dispatch to either the
  * wide-character or multi-byte versions of the operating system calls,
@@ -157,12 +189,28 @@ static TclWinProcs unicodeProcs = {
 TclWinProcs *tclWinProcs;
 static Tcl_Encoding tclWinTCharEncoding;
 
+
+#ifdef HAVE_NO_SEH
+
+/* Need to add noinline flag to DllMain declaration so that gcc -O3
+ * does not inline asm code into DllEntryPoint and cause a
+ * compile time error because of redefined local labels.
+ */
+
+BOOL APIENTRY		DllMain(HINSTANCE hInst, DWORD reason, 
+				LPVOID reserved)
+                        __attribute__ ((noinline));
+
+#else
+
 /*
  * The following declaration is for the VC++ DLL entry point.
  */
 
 BOOL APIENTRY		DllMain(HINSTANCE hInst, DWORD reason, 
 				LPVOID reserved);
+#endif /* HAVE_NO_SEH */
+
 
 /*
  * The following structure and linked list is to allow us to map between
@@ -268,10 +316,12 @@ DllMain(hInst, reason, reserved)
 # endif /* TCL_MEM_DEBUG */
 
     __asm__ __volatile__ (
-            "pushl %ebp" "\n\t"
-            "pushl $__except_dllmain_detach_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_dllmain_detach_handler) );
 #else
 	__try {
 #endif /* HAVE_NO_SEH */
@@ -317,7 +367,22 @@ DllMain(hInst, reason, reserved)
 
     return TRUE; 
 }
-
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * _except_dllmain_detach_handler --
+ *
+ *	SEH exception handler for DllMain.
+ *
+ * Results:
+ *	See DllMain.
+ *
+ * Side effects:
+ *	See DllMain.
+ *
+ *----------------------------------------------------------------------
+ */
 #ifdef HAVE_NO_SEH
 static
 __attribute__ ((cdecl))
@@ -330,12 +395,11 @@ _except_dllmain_detach_handler(
 {
     __asm__ __volatile__ (
             "jmp dllmain_detach_reentry");
-    /* Nuke compiler warning about unused static function */
-    _except_dllmain_detach_handler(NULL, NULL, NULL, NULL);
     return 0; /* Function does not return */
 }
 #endif /* HAVE_NO_SEH */
 
+
 #endif /* !STATIC_BUILD */
 #endif /* __WIN32__ */
 
@@ -498,10 +562,12 @@ TclpCheckStackSpace()
 # endif /* TCL_MEM_DEBUG */
 
     __asm__ __volatile__ (
-            "pushl %ebp" "\n\t"
-            "pushl $__except_checkstackspace_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_checkstackspace_handler) );
 #else
     __try {
 #endif /* HAVE_NO_SEH */
@@ -557,6 +623,22 @@ TclpCheckStackSpace()
      */
     return retval;
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * _except_checkstackspace_handler --
+ *
+ *	SEH exception handler for TclpCheckStackSpace.
+ *
+ * Results:
+ *	See TclpCheckStackSpace.
+ *
+ * Side effects:
+ *	See TclpCheckStackSpace.
+ *
+ *----------------------------------------------------------------------
+ */
 #ifdef HAVE_NO_SEH
 static
 __attribute__ ((cdecl))
@@ -569,8 +651,6 @@ _except_checkstackspace_handler(
 {
     __asm__ __volatile__ (
             "jmp checkstackspace_reentry");
-    /* Nuke compiler warning about unused static function */
-    _except_checkstackspace_handler(NULL, NULL, NULL, NULL);
     return 0; /* Function does not return */
 }
 #endif /* HAVE_NO_SEH */
@@ -1027,10 +1107,12 @@ TclWinCPUID( unsigned int index, /* Which CPUID value to retrieve */
 
 # ifdef HAVE_NO_SEH
     __asm__ __volatile__ (
-	"pushl %ebp" "\n\t"
-	"pushl $__except_TclWinCPUID_detach_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_TclWinCPUID_detach_handler) );
 #  else
     __try {
 #  endif
@@ -1126,9 +1208,27 @@ TclWinCPUID( unsigned int index, /* Which CPUID value to retrieve */
 #endif
     return status;
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * _except_TclWinCPUID_detach_handler --
+ *
+ *	SEH exception handler for TclWinCPUID.
+ *
+ * Results:
+ *	See TclWinCPUID.
+ *
+ * Side effects:
+ *	See TclWinCPUID.
+ *
+ *----------------------------------------------------------------------
+ */
 
-#if defined( __GNUC__ ) && defined( HAVE_NO_SEH )
-static __attribute__((cdecl)) EXCEPTION_DISPOSITION
+#if defined( HAVE_NO_SEH )
+static
+__attribute__((cdecl))
+EXCEPTION_DISPOSITION
 _except_TclWinCPUID_detach_handler(
     struct _EXCEPTION_RECORD *ExceptionRecord,
     void *EstablisherFrame,
@@ -1137,10 +1237,7 @@ _except_TclWinCPUID_detach_handler(
 {
     __asm__ __volatile__ (
 	"jmp TclWinCPUID_detach_reentry" );
-    /* Nuke compiler warning about unused static function */
-    _except_TclWinCPUID_detach_handler(NULL, NULL, NULL, NULL);
     return 0; /* Function does not return */
 }
 #endif
 
-
diff --git a/win/tclWinChan.c b/win/tclWinChan.c
index 077d1d9..c6609aa 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.34 2004/04/23 08:57:20 davygrvy Exp $
+ * RCS: @(#) $Id: tclWinChan.c,v 1.35 2004/06/21 22:05:55 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
+
 
 /*
  *----------------------------------------------------------------------
@@ -1057,10 +1068,13 @@ Tcl_MakeFileChannel(rawHandle, mode)
 # endif /* TCL_MEM_DEBUG */
 
         __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 */
@@ -1132,6 +1146,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))
@@ -1144,8 +1174,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
diff --git a/win/tclWinFCmd.c b/win/tclWinFCmd.c
index f78f053..b1d3609 100644
--- a/win/tclWinFCmd.c
+++ b/win/tclWinFCmd.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: tclWinFCmd.c,v 1.40 2004/01/21 19:59:34 vincentdarley Exp $
+ * RCS: @(#) $Id: tclWinFCmd.c,v 1.41 2004/06/21 22:05:55 mdejong Exp $
  */
 
 #include "tclWinInt.h"
@@ -83,6 +83,27 @@ static void *INITIAL_ESP,
             *RESTORED_HANDLER;
 #endif /* HAVE_NO_SEH && TCL_MEM_DEBUG */
 
+#ifdef HAVE_NO_SEH
+static
+__attribute__ ((cdecl))
+EXCEPTION_DISPOSITION
+_except_dorenamefile_handler(
+    struct _EXCEPTION_RECORD *ExceptionRecord,
+    void *EstablisherFrame,
+    struct _CONTEXT *ContextRecord,
+    void *DispatcherContext);
+
+static
+__attribute__ ((cdecl))
+EXCEPTION_DISPOSITION
+_except_docopyfile_handler(
+    struct _EXCEPTION_RECORD *ExceptionRecord,
+    void *EstablisherFrame,
+    struct _CONTEXT *ContextRecord,
+    void *DispatcherContext);
+
+#endif /* HAVE_NO_SEH */
+
 /*
  * Prototype for the TraverseWinTree callback function.
  */
@@ -203,10 +224,13 @@ DoRenameFile(
 # endif /* TCL_MEM_DEBUG */
 
     __asm__ __volatile__ (
-            "pushl %ebp" "\n\t"
-            "pushl $__except_dorenamefile_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_dorenamefile_handler)
+            );
 #else
     __try {
 #endif /* HAVE_NO_SEH */
@@ -476,6 +500,22 @@ DoRenameFile(
     }
     return TCL_ERROR;
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * _except_dorenamefile_handler --
+ *
+ *	SEH exception handler for DoRenameFile.
+ *
+ * Results:
+ *	See DoRenameFile.
+ *
+ * Side effects:
+ *	See DoRenameFile.
+ *
+ *----------------------------------------------------------------------
+ */
 #ifdef HAVE_NO_SEH
 static
 __attribute__ ((cdecl))
@@ -488,8 +528,6 @@ _except_dorenamefile_handler(
 {
     __asm__ __volatile__ (
             "jmp dorenamefile_reentry");
-    /* Nuke compiler warning about unused static function */
-    _except_dorenamefile_handler(NULL, NULL, NULL, NULL);
     return 0; /* Function does not return */
 }
 #endif /* HAVE_NO_SEH */
@@ -565,10 +603,13 @@ DoCopyFile(
 # endif /* TCL_MEM_DEBUG */
 
     __asm__ __volatile__ (
-            "pushl %ebp" "\n\t"
-            "pushl $__except_docopyfile_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_docopyfile_handler)
+            );
 #else
     __try {
 #endif /* HAVE_NO_SEH */
@@ -658,6 +699,22 @@ DoCopyFile(
     }
     return TCL_ERROR;
 }
+
+/*
+ *----------------------------------------------------------------------
+ *
+ * _except_docopyfile_handler --
+ *
+ *	SEH exception handler for DoCopyFile.
+ *
+ * Results:
+ *	See DoCopyFile.
+ *
+ * Side effects:
+ *	See DoCopyFile.
+ *
+ *----------------------------------------------------------------------
+ */
 #ifdef HAVE_NO_SEH
 static
 __attribute__ ((cdecl))
@@ -670,7 +727,6 @@ _except_docopyfile_handler(
 {
     __asm__ __volatile__ (
             "jmp docopyfile_reentry");
-    _except_docopyfile_handler(NULL,NULL,NULL,NULL);
     return 0; /* Function does not return */
 }
 #endif /* HAVE_NO_SEH */