[NTOS:KD] Merge some more functions with kd64

Functions are KdIsThisAKdTrap, KdUpdateDataBlock, KdEnterDebugger,
KdExitDebugger, KdRefreshDebuggerNotPresent, KdDisableDebugger,
KdEnableDebuggerWithLock, KdEnableDebugger, KdSystemDebugControl

Author: hpoussin

ntoskrnl/kd/kdmain.c

@@ -45,117 +45,13 @@
 
 /* VARIABLES ***************************************************************/
 
-BOOLEAN KdDebuggerEnabled = FALSE;
-BOOLEAN KdEnteredDebugger = FALSE;
-BOOLEAN KdDebuggerNotPresent = TRUE;
-BOOLEAN KdBreakAfterSymbolLoad = FALSE;
-BOOLEAN KdPitchDebugger = TRUE;
-BOOLEAN KdIgnoreUmExceptions = FALSE;
-
 VOID NTAPI PspDumpThreads(BOOLEAN SystemThreads);
 
-#if 0
-ULONG Kd_DEFAULT_MASK = 1 << DPFLTR_ERROR_LEVEL;
-#endif
-
 extern CPPORT PortInfo;
 extern ANSI_STRING KdpLogFileName;
 
 /* PRIVATE FUNCTIONS *********************************************************/
 
-ULONG
-NTAPI
-KdpServiceDispatcher(ULONG Service,
-                     PVOID Buffer1,
-                     ULONG Buffer1Length,
-                     KPROCESSOR_MODE PreviousMode)
-{
-    ULONG Result = 0;
-
-    switch (Service)
-    {
-        case BREAKPOINT_PRINT: /* DbgPrint */
-        {
-            /* Call KDBG */
-            BOOLEAN Handled;
-            Result = KdpPrint(MAXULONG,
-                              DPFLTR_INFO_LEVEL,
-                              (PCHAR)Buffer1,
-                              (USHORT)Buffer1Length,
-                              PreviousMode,
-                              NULL, // TrapFrame,
-                              NULL, // ExceptionFrame,
-                              &Handled);
-            break;
-        }
-
-#if DBG
-        case ' soR': /* ROS-INTERNAL */
-        {
-            switch ((ULONG_PTR)Buffer1)
-            {
-                case DumpAllThreads:
-                    PspDumpThreads(TRUE);
-                    break;
-
-                case DumpUserThreads:
-                    PspDumpThreads(FALSE);
-                    break;
-
-                case KdSpare3:
-                    MmDumpArmPfnDatabase(FALSE);
-                    break;
-
-                default:
-                    break;
-            }
-            break;
-        }
-
-#if defined(_M_IX86) && !defined(_WINKD_) // See ke/i386/traphdlr.c
-        /* Register a debug callback */
-        case 'CsoR':
-        {
-            switch (Buffer1Length)
-            {
-                case ID_Win32PreServiceHook:
-                    KeWin32PreServiceHook = Buffer1;
-                    break;
-
-                case ID_Win32PostServiceHook:
-                    KeWin32PostServiceHook = Buffer1;
-                    break;
-
-            }
-            break;
-        }
-#endif
-
-        /* Special  case for stack frame dumps */
-        case 'DsoR':
-        {
-            KeRosDumpStackFrames((PULONG_PTR)Buffer1, Buffer1Length);
-            break;
-        }
-
-#if defined(KDBG)
-        /* Register KDBG CLI callback */
-        case 'RbdK':
-        {
-            Result = KdbRegisterCliCallback(Buffer1, Buffer1Length);
-            break;
-        }
-#endif /* KDBG */
-#endif /* DBG */
-        default:
-            DPRINT1("Invalid debug service call!\n");
-            HalDisplayString("Invalid debug service call!\r\n");
-            break;
-    }
-
-    return Result;
-}
-
 BOOLEAN
 NTAPI
 KdpTrap(IN PKTRAP_FRAME TrapFrame,
@@ -309,129 +205,9 @@ KdpStub(IN PKTRAP_FRAME TrapFrame,
                    SecondChanceException);
 }
 
-BOOLEAN
-NTAPI
-KdIsThisAKdTrap(IN PEXCEPTION_RECORD ExceptionRecord,
-                IN PCONTEXT Context,
-                IN KPROCESSOR_MODE PreviousMode)
-{
-    /* KDBG has its own mechanism for ignoring user mode exceptions */
-    return FALSE;
-}
-
 /* PUBLIC FUNCTIONS *********************************************************/
 
-VOID
-NTAPI
-KdUpdateDataBlock(VOID)
-{
-}
-
-BOOLEAN
-NTAPI
-KdEnterDebugger(IN PKTRAP_FRAME TrapFrame,
-                IN PKEXCEPTION_FRAME ExceptionFrame)
-{
-    return FALSE;
-}
-
-VOID
-NTAPI
-KdExitDebugger(IN BOOLEAN Enable)
-{
-}
-
-/*
- * @implemented
- */
-BOOLEAN
-NTAPI
-KdRefreshDebuggerNotPresent(VOID)
-{
-    UNIMPLEMENTED;
-
-    /* Just return whatever was set previously -- FIXME! */
-    return KdDebuggerNotPresent;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-KdDisableDebugger(VOID)
-{
-    KIRQL OldIrql;
-
-    /* Raise IRQL */
-    KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
-
-    /* TODO: Disable any breakpoints */
-
-    /* Disable the Debugger */
-    KdDebuggerEnabled = FALSE;
-    SharedUserData->KdDebuggerEnabled = FALSE;
-
-    /* Lower the IRQL */
-    KeLowerIrql(OldIrql);
-
-    /* Return success */
-    return STATUS_SUCCESS;
-}
-
-NTSTATUS
-NTAPI
-KdEnableDebuggerWithLock(IN BOOLEAN NeedLock)
-{
-    return STATUS_ACCESS_DENIED;
-}
-
-/*
- * @implemented
- */
-NTSTATUS
-NTAPI
-KdEnableDebugger(VOID)
-{
-    KIRQL OldIrql;
-
-    /* Raise IRQL */
-    KeRaiseIrql(DISPATCH_LEVEL, &OldIrql);
-
-    /* TODO: Re-enable any breakpoints */
-
-    /* Enable the Debugger */
-    KdDebuggerEnabled = TRUE;
-    SharedUserData->KdDebuggerEnabled = TRUE;
-
-    /* Lower the IRQL */
-    KeLowerIrql(OldIrql);
-
-    /* Return success */
-    return STATUS_SUCCESS;
-}
-
-/*
- * @unimplemented
- */
-NTSTATUS
-NTAPI
-KdSystemDebugControl(IN SYSDBG_COMMAND Command,
-                     IN PVOID InputBuffer,
-                     IN ULONG InputBufferLength,
-                     OUT PVOID OutputBuffer,
-                     IN ULONG OutputBufferLength,
-                     IN OUT PULONG ReturnLength,
-                     IN KPROCESSOR_MODE PreviousMode)
-{
-    /* HACK */
-    return KdpServiceDispatcher(Command,
-                                InputBuffer,
-                                InputBufferLength,
-                                PreviousMode);
-}
-
-PCHAR
+static PCHAR
 NTAPI
 KdpGetDebugMode(PCHAR Currentp2)
 {