[NTOS:KD] Use a PCONTEXT instead of a PKTRAP_FRAME in KDBG

Author: hpoussin

ntoskrnl/kd/kdmain.c

@@ -29,23 +29,27 @@ KdpReportExceptionStateChange(IN PEXCEPTION_RECORD ExceptionRecord,
 {
     KD_CONTINUE_TYPE Return = kdHandleException;
 #ifdef KDBG
+    EXCEPTION_RECORD64 ExceptionRecord64;
+
     /* Check if this is an assertion failure */
     if (ExceptionRecord->ExceptionCode == STATUS_ASSERTION_FAILURE)
     {
         /* Bump EIP to the instruction following the int 2C */
         ContextRecord->Eip += 2;
     }
+
+    ExceptionRecord32To64((PEXCEPTION_RECORD32)ExceptionRecord,
+                          &ExceptionRecord64);
 #endif
 
     /* Get out of here if the Debugger isn't connected */
     if (KdDebuggerNotPresent) return FALSE;
 
 #ifdef KDBG
     /* Call KDBG if available */
-    Return = KdbEnterDebuggerException(ExceptionRecord,
+    Return = KdbEnterDebuggerException(&ExceptionRecord64,
                                        PreviousMode,
                                        ContextRecord,
-                                       TrapFrame,
                                        !SecondChanceException);
 #else /* not KDBG */
     /* We'll manually dump the stack for the user... */

ntoskrnl/kdbg/i386/kdb_help.S

@@ -2,7 +2,7 @@
 #include <asm.inc>
 #include <ks386.inc>
 
-EXTERN _KdbEnterDebuggerException:PROC
+EXTERN _KdbEnterDebuggerFirstChanceException:PROC
 
 .code
 
@@ -61,12 +61,8 @@ _KdbEnter:
      * Call KDB
      */
     mov eax, esp
-    push 1                  /* FirstChance */
     push eax                /* Push a pointer to the trap frame */
-    push 0                  /* Context */
-    push 0                  /* PreviousMode (KernelMode) */
-    push 0                  /* ExceptionRecord */
-    call _KdbEnterDebuggerException
+    call _KdbEnterDebuggerFirstChanceException
 
     /*
      * Pop the arguments and unused portions of the trap frame: