Changeset 1801 for trunk/dll/excputil.c

Timestamp:

Apr 4, 2015, 2:30:47 AM (10 years ago)

Author:

Steven Levine

Message:

HandleException: check for ignore before checking for cascade

File:

• trunk/dll/excputil.c (modified) (3 diffs)

trunk/dll/excputil.c

@@ -5 +5 @@
   exception handlers
 
-  Copyright (c) 2008 Steven H. Levine
+  Copyright (c) 2008, 2015 Steven H. Levine
 
   Write to exceptq .trp file or ?:\fm2_trap.log
   where ? is boot volume
 
-  06 Dec 08 SHL Baseline (Ticket #26)
+  2008-12-06 SHL Baseline (Ticket #26)
+  2015-04-03 SHL HandleException: check for ignore before checking for cascade
 
 ************************************************************/
@@ -138 +139 @@
   static PSZ pszExcpMsg = "Caught exception %lx in process %lx (%lu) thread %u at %.24s";
 
-  // Try to report cascading exceptions in handler only once
-  // This simple test can get confused if multiple threads trap at same time
-  if (++working > 1) {
-    if (working == 2) {
-      DbgMsg(pszSrcFile, __LINE__, "Caught exception %lx at %p while handler active",
-             ex, pContext->ctx_RegEip);
-    }
-    working--;
-    return XCPT_CONTINUE_SEARCH;
-  }
-
   // Bypass exceptions we don't handle or exceptions we ignore
   // Keep in sync with exceptq selections since exceptq will ignore anyway
@@ -160 +150 @@
       ex == XCPT_SINGLE_STEP)
   {
+    return XCPT_CONTINUE_SEARCH;
+  }
+
+  // Try to report cascading exceptions in handler only once
+  // This simple test can get confused if multiple threads trap at same time
+  if (++working > 1) {
+    if (working == 2) {
+      DbgMsg(pszSrcFile, __LINE__, "Caught exception %lx at %p while handler active",
+             ex, pContext->ctx_RegEip);
+    }
     working--;
     return XCPT_CONTINUE_SEARCH;