Changeset 8339 for trunk/src/kernel32/exceptions.cpp

Timestamp:

Apr 30, 2002, 11:36:09 AM (23 years ago)

Author:

sandervl

Message:

KSO: Changes for debug heap (makefile + exception handler)

File:

• trunk/src/kernel32/exceptions.cpp (modified) (3 diffs)

trunk/src/kernel32/exceptions.cpp

@@ -1 @@
-/* $Id: exceptions.cpp,v 1.57 2001-10-25 13:19:04 sandervl Exp $ */
+/* $Id: exceptions.cpp,v 1.58 2002-04-30 09:36:09 sandervl Exp $ */
 
 /*
@@ -72 +72 @@
 #define DBG_LOCALLOG    DBG_exceptions
 #include "dbglocal.h"
+
+#ifdef WITH_KLIB
+/* quick and dirty - don't wanna mess with includes. */
+typedef enum { enmRead, enmWrite, enmUnknown } ENMACCESS;
+BOOL  _Optlink      kHeapDbgException(void *    pvAccess,
+                                      ENMACCESS enmAccess,
+                                      void *    pvIP,
+                                      void *    pvOS);
+#endif
 
 /* Exception record for handling exceptions happening inside exception handlers */
@@ -1164 +1173 @@
   case XCPT_ACCESS_VIOLATION:
   {
-   Win32MemMap *map;
-   BOOL  fWriteAccess = FALSE;
-   ULONG offset, accessflag;
+        Win32MemMap *map;
+        BOOL  fWriteAccess = FALSE;
+        ULONG offset, accessflag;
+
+#ifdef WITH_KLIB
+        if (     pERepRec->ExceptionInfo[0] == XCPT_READ_ACCESS
+              || pERepRec->ExceptionInfo[0] == XCPT_WRITE_ACCESS
+              || pERepRec->ExceptionInfo[0] == XCPT_EXECUTE_ACCESS
+              || pERepRec->ExceptionInfo[0] == XCPT_UNKNOWN_ACCESS
+                )
+        {
+            ENMACCESS enmAccess = enmRead;
+            switch (pERepRec->ExceptionInfo[0])
+            {
+                case XCPT_WRITE_ACCESS:     enmAccess = enmWrite; break;
+                case XCPT_UNKNOWN_ACCESS:   enmAccess = enmUnknown; break;
+            }
+
+            if (kHeapDbgException((void*)pERepRec->ExceptionInfo[1],
+                                  enmAccess,
+                                  pERepRec->ExceptionAddress,
+                                  pERepRec))
+                goto continueexecution;
+        }
+#endif
 
         if(pERepRec->ExceptionInfo[1] == 0 && pERepRec->ExceptionInfo[1] == XCPT_DATA_UNKNOWN) {