[ros-diffs] [fireball] 27348: - Commit a fix for KDBG's attach to process problem. See issue #1263 for more details.

[fireball at svn.reactos.org]

Author: fireball
Date: Sat Jun 30 22:58:09 2007
New Revision: 27348

URL: http://svn.reactos.org/svn/reactos?rev=27348&view=rev
Log:
- Commit a fix for KDBG's attach to process problem.
See issue #1263 for more details.

Modified:
    trunk/reactos/ntoskrnl/kdbg/kdb.c

Modified: trunk/reactos/ntoskrnl/kdbg/kdb.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb.c?rev=27348&r1=27347&r2=27348&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/kdbg/kdb.c (original)
+++ trunk/reactos/ntoskrnl/kdbg/kdb.c Sat Jun 30 22:58:09 2007
@@ -168,6 +168,29 @@
    /* FIXME: copy v86 registers if TrapFrame is a V86 trapframe */
 }
 
+STATIC VOID
+KdbpKdbTrapFrameFromKernelStack(PVOID KernelStack,
+                                PKDB_KTRAP_FRAME KdbTrapFrame)
+{
+   ULONG_PTR *StackPtr;
+
+   RtlZeroMemory(KdbTrapFrame, sizeof(KDB_KTRAP_FRAME));
+   StackPtr = (ULONG_PTR *) KernelStack;
+   KdbTrapFrame->Tf.Ebp = StackPtr[3];
+   KdbTrapFrame->Tf.Edi = StackPtr[4];
+   KdbTrapFrame->Tf.Esi = StackPtr[5];
+   KdbTrapFrame->Tf.Ebx = StackPtr[6];
+   KdbTrapFrame->Tf.Eip = StackPtr[7];
+   KdbTrapFrame->Tf.HardwareEsp = (ULONG) (StackPtr + 8);
+   KdbTrapFrame->Tf.HardwareSegSs = KGDT_R0_DATA;
+   KdbTrapFrame->Tf.SegCs = KGDT_R0_CODE;
+   KdbTrapFrame->Tf.SegDs = KGDT_R0_DATA;
+   KdbTrapFrame->Tf.SegEs = KGDT_R0_DATA;
+   KdbTrapFrame->Tf.SegGs = KGDT_R0_DATA;
+
+   /* FIXME: what about the other registers??? */
+}
+
 /*!\brief Overwrites the instruction at \a Address with \a NewInst and stores
  *        the old instruction in *OldInst.
  *
@@ -1040,7 +1063,8 @@
    if (KdbCurrentThread != KdbOriginalThread)
    {
       ASSERT(KdbCurrentTrapFrame == &KdbThreadTrapFrame);
-      KdbpKdbTrapFrameToTrapFrame(KdbCurrentTrapFrame, KdbCurrentThread->Tcb.TrapFrame);
+      /* Actually, we can't save the context, there's no guarantee that there
+       * was a trap frame */
    }
    else
    {
@@ -1050,12 +1074,13 @@
    /* Switch to the thread's context */
    if (Thread != KdbOriginalThread)
    {
-      if (Thread->Tcb.TrapFrame == NULL)
-      {
-         KdbpPrint("Threads TrapFrame is NULL! Cannot attach.\n");
-         return FALSE;
-      }
-      KdbpTrapFrameToKdbTrapFrame(Thread->Tcb.TrapFrame, &KdbThreadTrapFrame);
+      /* The thread we're attaching to isn't the thread on which we entered
+       * kdb and so the thread we're attaching to is not running. There
+       * is no guarantee that it actually has a trap frame. So we have to
+       * peek directly at the registers which were saved on the stack when the
+       * thread was preempted in the scheduler */
+      KdbpKdbTrapFrameFromKernelStack(Thread->Tcb.KernelStack,
+                                      &KdbThreadTrapFrame);
       KdbCurrentTrapFrame = &KdbThreadTrapFrame;
    }
    else /* Switching back to original thread */
@@ -1529,11 +1554,8 @@
       }
    }
 
-   /* Save the current thread's trapframe */
-   if (KdbCurrentTrapFrame == &KdbThreadTrapFrame)
-   {
-      KdbpKdbTrapFrameToTrapFrame(KdbCurrentTrapFrame, KdbCurrentThread->Tcb.TrapFrame);
-   }
+   /* We can't update the current thread's trapframe 'cause it might not
+      have one */
 
    /* Detach from attached process */
    if (KdbCurrentProcess != KdbOriginalProcess)