Changeset 22004 for trunk/src

Timestamp:

Jul 7, 2012, 1:59:15 AM (13 years ago)

Author:

dmik

Message:

kernel32: Pick up register changes in try/except filter.

This is a regression of r21999. Fixes endless exceptions eventually
leading to program termination.

Location:

trunk/src/kernel32

Files:

• exceptions.cpp (modified) (9 diffs)
• oslibexcept.cpp (modified) (1 diff)
• seh/sehutil.s (modified) (2 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1119 +1119 @@
                              PEXCEPTIONREGISTRATIONRECORD pERegRec,
                              PCONTEXTRECORD               pCtxRec,
-                             PVOID                        p)
+                             PVOID                        p,
+                             BOOL                         fSEH)
 {
     char szTrapDump[2048];
@@ -1128 +1129 @@
 #endif
     /* now dump the information to the logfile */
-    dprintf(("\n%s", szTrapDump));
+    dprintf(("OS2ExceptionHandler: fSEH=%d\n%s", fSEH, szTrapDump));
 }
 
 #else // DEBUG
-#define dprintfException(a,b,c,d) do {} while (0)
+#define dprintfException(a,b,c,d,e) do {} while (0)
 #endif // DEBUG
 
@@ -1321 +1322 @@
     case XCPT_FLOAT_STACK_CHECK:
     case XCPT_FLOAT_UNDERFLOW:
-        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
         dprintf(("KERNEL32: OS2ExceptionHandler (fSEH=%d): FPU exception\n", fSEH));
         if((!fIsOS2Image || fForceWin32TIB || fSEH) && !fExitProcess)  //Only for real win32 apps or when forced
@@ -1344 +1345 @@
     case XCPT_ASYNC_PROCESS_TERMINATE:
 #if 0
-        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
         PrintExceptionChain();
         // fall through
@@ -1511 +1512 @@
             if(teb->o.odin.context.ContextFlags)
             {
-                dprintfException(pERepRec, pERegRec, pCtxRec, p);
+                dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
 
                 //NOTE: This will not work properly in case multiple threads execute this code
@@ -1582 +1583 @@
 
 #if defined(DEBUG)
-        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
 
         if(!fExitProcess && (pCtxRec->ContextFlags & CONTEXT_CONTROL)) {
@@ -1765 +1766 @@
 // @@VP20040507: Isn't this a bit dangerous to call dprintfon such exception
 //#ifdef DEBUG
-//        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+//        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
 //#endif
         goto continuesearch;
@@ -1790 +1791 @@
 
             case XCPT_SIGNAL_INTR:
-                dprintfException(pERepRec, pERegRec, pCtxRec, p);
+                dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
                 if (InternalGenerateConsoleCtrlEvent((breakPressed) ? CTRL_BREAK_EVENT : CTRL_C_EVENT, 0))
                 {
@@ -1805 +1806 @@
 
     default: //non-continuable exceptions
-        dprintfException(pERepRec, pERegRec, pCtxRec, p);
+        dprintfException(pERepRec, pERegRec, pCtxRec, p, fSEH);
         goto continuesearch;
     }

trunk/src/kernel32/oslibexcept.cpp

@@ -170 +170 @@
     if (rc != ExceptionContinueExecution)
     {
-        dprintf(("Win32 exception handler returned %x", rc));
+        dprintf(("Win32 exception handler returned %s (%d)",
+                 rc == ExceptionContinueSearch ? "ExceptionContinueSearch" :
+                                                 "???", rc));
         return FALSE;
     }
 
-    dprintf(("Win32 exception handler returned ExceptionContinueExecution"));
+    dprintf(("Win32 exception handler returned ExceptionContinueExecution (%d)",
+             ExceptionContinueExecution));
 
     if (pWinContextRec->ContextFlags & WINCONTEXT_CONTROL)

trunk/src/kernel32/seh/sehutil.s

@@ -154 +154 @@
     popl %ebp
 
+    /* analyze filter result */
+    movl 20(%ebx), %eax /* pFrame->filterResult */
+    cmpl $1, %eax /* EXCEPTION_EXECUTE_HANDLER? */
+    je ___seh_handler_FreeMem
+    cmpl $-1, %eax /* EXCEPTION_CONTINUE_EXECUTION? */
+    jne 1f
+    movl $0, %eax /* ExceptionContinueExecution */
+    jmp 2f
+1:
+    /* Assume EXCEPTION_CONTIUNE_SEARCH */
+    movl $1, %eax /* ExceptionContinueSearch */
+2:
+
+    /* convert Win32 exception info back to OS/2 */
+    pushl 16(%ebp)               /* pContext */
+    pushl 48(%ebx)               /* pFrame->Pointers.ContextRecord */
+    pushl %eax                   /* rc */
+    call OSLibConvertExceptionResult
+    addl $12, %esp
+    pushl %eax /* save result */
+
+___seh_handler_FreeMem:
+
     /* free heap block */
     movl 16(%ebx), %eax /* pFrame->pHandlerContext */
@@ -161 +184 @@
     addl $4, %esp
 
-    /* analyze filter result */
+    /* analyze filter result again */
     movl 20(%ebx), %eax /* pFrame->filterResult */
     cmpl $1, %eax /* EXCEPTION_EXECUTE_HANDLER? */
     je ___seh_handler_Unwind
-    cmpl $-1, %eax /* EXCEPTION_CONTINUE_EXECUTION? */
-    jne 1f
+
+    popl %eax /* restore OSLibConvertExceptionResult result */
+
+    /* %eax already contains TRUE if the execution should continue
+     * and FALSE otherwise */
+    cmp $0, %eax /* FALSE (= continue search)? */
+    je 1f
     movl $0, 52(%ebx) /* pFrame->state */
-    //movl $-1, %eax /* XCPT_CONTINUE_EXECUTION (-1) */
-    movl $1, %eax
+    movl $1, %eax /* TRUE */
     jmp ___seh_handler_Return
 1:
-    /* assume EXCEPTION_CONTINUE_SEARCH (0) */
-    xorl %eax, %eax /* return XCPT_CONTINUE_SEARCH (0) */
+    xorl %eax, %eax /* FALSE */
     jmp ___seh_handler_Return