Changeset 21381 for trunk/src/kernel32

Timestamp:

Jul 5, 2010, 2:30:14 AM (15 years ago)

Author:

dmik

Message:

Implemented compiler-level SEH (try/catch) support for GCC.

Location:

trunk/src/kernel32

Files:

• KERNEL32.DEF (modified) (1 diff)
• exceptions.cpp (modified) (2 diffs)
• kernel32.mak (modified) (1 diff)
• kernel32dbg.def (modified) (1 diff)
• makefile (modified) (1 diff)
• seh (added)
• seh/makefile (added)
• seh/sehutil.s (added)
• wprocess.cpp (modified) (3 diffs)

trunk/src/kernel32/KERNEL32.DEF

@@ -1345 +1345 @@
     EncodePointer              = _EncodePointer@4                 @3530 NONAME
     RtlUniform                 = _RtlUniform@4                    @3531 NONAME
+    
+    ___seh_handler                                                @3600 NONAME
+    _EnableSEH@0                                                  @3601 NONAME
+    

trunk/src/kernel32/exceptions.cpp

@@ -1207 +1207 @@
         dprintfException(pERepRec, pERegRec, pCtxRec, p);
         dprintf(("KERNEL32: OS2ExceptionHandler: FPU exception\n"));
-        if(!fIsOS2Image && !fExitProcess)  //Only for real win32 apps
+        if((!fIsOS2Image || fSEHEnabled) && !fExitProcess)  //Only for real win32 apps or if SEH enabled
         {
                 if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == FALSE)
@@ -1467 +1467 @@
 #endif
 
-        if(!fIsOS2Image && !fExitProcess)  //Only for real win32 apps
+        if((!fIsOS2Image || fSEHEnabled) && !fExitProcess)  //Only for real win32 apps or if SEH enabled
         {
             if(OSLibDispatchException(pERepRec, pERegRec, pCtxRec, p) == TRUE)

trunk/src/kernel32/kernel32.mak

@@ -174 +174 @@
 $(ODIN32_LIB)\WIN32K.LIB \
 $(ODIN32_LIB)\UNICODE.LIB \
+$(ODIN32_LIB)\seh.lib \
 $(ODIN32_LIB)\ntdll.lib \
 so32dll.lib \

trunk/src/kernel32/kernel32dbg.def

@@ -1344 +1344 @@
     EncodePointer              = _EncodePointer@4                 @3530 NONAME
     RtlUniform                 = _RtlUniform@4                    @3531 NONAME
+    
+    ___seh_handler                                                @3600 NONAME
+    _EnableSEH@0                                                  @3601 NONAME

trunk/src/kernel32/makefile

@@ -17 +17 @@
 # Subdirectories.
 SUBDIRS = \
-unicode
+unicode \
+seh
 
 

trunk/src/kernel32/wprocess.cpp

@@ -78 +78 @@
 BOOL    fSwitchTIBSel = TRUE;           // TRUE  -> switch TIB selectors
                                         // FALSE -> don't
+BOOL    fSEHEnabled = FALSE;            // TRUE  -> SEH support enabled
+                                        // FALSE -> not enabled
 BOOL    fExitProcess = FALSE;
 
@@ -105 +107 @@
 
 
+//******************************************************************************
+//******************************************************************************
+VOID WIN32API EnableSEH()
+{
+    if(!fSEHEnabled) {
+        ODIN_SetTIBSwitch(TRUE);
+        fSEHEnabled = TRUE;
+    }
+    return;
+}
 //******************************************************************************
 //******************************************************************************
@@ -494 +506 @@
 {
     dprintf(("ODIN_SetTIBSwitch %d", fSwitchTIB));
-    fSwitchTIBSel = fSwitchTIB;
-    if(fSwitchTIBSel) {
-         SetWin32TIB();
-    }
-    else RestoreOS2TIB();
+    if (!fSEHEnabled) {
+        fSwitchTIBSel = fSwitchTIB;
+        if(fSwitchTIBSel) {
+             SetWin32TIB();
+        }
+        else RestoreOS2TIB();
+    } else {
+        dprintf(("ODIN_SetTIBSwitch: ignored due to fSEHEnabled = TRUE"));
+    }
 }
 //******************************************************************************