Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[dgorbachev] 25842: Fix a bug
by dgorbachev＠svn.reactos.org 19 Feb '07

19 Feb '07

Author: dgorbachev Date: Mon Feb 19 16:20:09 2007 New Revision: 25842 URL: http://svn.reactos.org/svn/reactos?rev=25842&view=rev Log: Fix a bug Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Modified: trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/asmmacro.S Mon Feb 19 16:20:09 2007 @@ -1033,7 +1033,7 @@ .endif /* Check if we were called from kernel mode */ - cmp dword ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE + cmp word ptr [ebp+KTRAP_FRAME_CS], KGDT_R0_CODE jz 9f .if \RestoreSegments

1 0

[weiden] 25841: Minor fixes, thanks Ged
by weiden＠svn.reactos.org 19 Feb '07

19 Feb '07

Author: weiden Date: Mon Feb 19 16:15:28 2007 New Revision: 25841 URL: http://svn.reactos.org/svn/reactos?rev=25841&view=rev Log: Minor fixes, thanks Ged Modified: trunk/reactos/base/applications/charmap/charmap.c trunk/reactos/base/applications/charmap/charmap.rbuild Modified: trunk/reactos/base/applications/charmap/charmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.c (original) +++ trunk/reactos/base/applications/charmap/charmap.c Mon Feb 19 16:15:28 2007 @@ -216,10 +216,7 @@ switch(wParam) { case ID_ABOUT: - DialogBox(hInstance, - MAKEINTRESOURCE(IDD_ABOUTBOX), - hDlg, - AboutDialogProc); + ShowAboutDlg(hDlg); break; } } @@ -234,10 +231,10 @@ INT WINAPI -WinMain(HINSTANCE hInst, - HINSTANCE hPrev, - LPSTR Cmd, - int iCmd) +_tWinMain(HINSTANCE hInst, + HINSTANCE hPrev, + LPTSTR Cmd, + int iCmd) { INITCOMMONCONTROLSEX iccx; INT Ret = 1; Modified: trunk/reactos/base/applications/charmap/charmap.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… ============================================================================== --- trunk/reactos/base/applications/charmap/charmap.rbuild (original) +++ trunk/reactos/base/applications/charmap/charmap.rbuild Mon Feb 19 16:15:28 2007 @@ -1,9 +1,7 @@ <?xml version="1.0"?> <rbuild xmlns:xi="http://www.w3.org/2001/XInclude"> - <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe"> - <include base="charmap">.</include> - <define name="UNICODE" /> - <define name="_UNICODE" /> + <module name="charmap" type="win32gui" installbase="system32" installname="charmap.exe" unicode="yes"> + <include base="charmap">.</include> <define name="__REACTOS__" /> <define name="__USE_W32API" /> <define name="_WIN32_IE">0x600</define>

1 0

[ion] 25840: - Dummy commit for documentation purposes: "The KD64 6.0 implementation is based on information from the VSJ article located at: http://www.vsj.co.uk/articles/display.asp?id=265 by Albert Alameida. Although Windows 2000 shipped with KD64 5.0, much of the implementation details have not changed. Additionally, the Windows 2000 DDK (accidentally?) shipped with a file called windbgkd.h which contains internal KD64 information and documentation. WinDBG's SDK ships with wdbgexts.h which c
by ion＠svn.reactos.org 18 Feb '07

18 Feb '07

Author: ion Date: Mon Feb 19 01:46:01 2007 New Revision: 25840 URL: http://svn.reactos.org/svn/reactos?rev=25840&view=rev Log: - Dummy commit for documentation purposes: "The KD64 6.0 implementation is based on information from the VSJ article located at: http://www.vsj.co.uk/articles/display.asp?id=265 by Albert Alameida. Although Windows 2000 shipped with KD64 5.0, much of the implementation details have not changed. Additionally, the Windows 2000 DDK (accidentally?) shipped with a file called windbgkd.h which contains internal KD64 information and documentation. WinDBG's SDK ships with wdbgexts.h which contains more internal information on some portable structures. Other information was gathered through people such as Skywing." Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c Mon Feb 19 01:46:01 2007 @@ -97,8 +97,8 @@ Status = KdpReportLoadSymbolsStateChange(DllPath, DllBase, Unload, - &Prcb-> - ProcessorState.ContextFrame); + &Prcb->ProcessorState. + ContextFrame); #else Status = FALSE; #endif

1 0

[ion] 25839: - KdDebuggerNotPresent should be FALSE by default. - KdpTimeSlipPending should be 1 by defalt. - Enable KdInitSystem; don't touch SharedUserData yet because our loader doesn't map it properly until we hit MmInit1, so disable this code for now. - Implement KdpPollBreakInWithPortLock. - Add calls to KdpPrint, KdpSymbol since KdpTrap now gets activated. Implement KdpPrint and KdpPrintString, but not KdLogDbgPrint (so debug messages before WinDBG connects are currently lost). - Implemen
by ion＠svn.reactos.org 18 Feb '07

18 Feb '07

Author: ion Date: Mon Feb 19 01:32:32 2007 New Revision: 25839 URL: http://svn.reactos.org/svn/reactos?rev=25839&view=rev Log: - KdDebuggerNotPresent should be FALSE by default. - KdpTimeSlipPending should be 1 by defalt. - Enable KdInitSystem; don't touch SharedUserData yet because our loader doesn't map it properly until we hit MmInit1, so disable this code for now. - Implement KdpPollBreakInWithPortLock. - Add calls to KdpPrint, KdpSymbol since KdpTrap now gets activated. Implement KdpPrint and KdpPrintString, but not KdLogDbgPrint (so debug messages before WinDBG connects are currently lost). - Implement KdpSymbol but not essential call to KdpReportLoadSymbolsStateChange. - Only save/restore CR4 if KeFeatureBits indicates CR4 support exists. - Export KdDebuggerNotPresent since KDCOM needs it. Added: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdlock.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/cpu.c branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/kiinit.c branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h Mon Feb 19 01:32:32 2007 @@ -104,6 +104,37 @@ IN BOOLEAN NeedLock ); +ULONG +NTAPI +KdpPrint( + IN ULONG ComponentId, + IN ULONG ComponentMask, + IN LPSTR String, + IN ULONG Length, + IN KPROCESSOR_MODE PreviousMode, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + OUT PBOOLEAN Status +); + +ULONG +NTAPI +KdpSymbol( + IN LPSTR DllPath, + IN ULONG DllBase, + IN BOOLEAN Unload, + IN KPROCESSOR_MODE PreviousMode, + IN PCONTEXT ContextRecord, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame +); + +BOOLEAN +NTAPI +KdpPollBreakInWithPortLock( + VOID +); + extern DBGKD_GET_VERSION64 KdVersionBlock; extern KDDEBUGGER_DATA64 KdDebuggerDataBlock; extern LIST_ENTRY KdpDebuggerDataListHead; @@ -133,4 +164,6 @@ extern BOOLEAN KdpPortLocked; extern KSPIN_LOCK KdpDebuggerLock; extern LARGE_INTEGER KdTimerStop, KdTimerStart, KdTimerDifference; - +extern ULONG KdComponentTableSize; +extern ULONG Kd_WIN2000_Mask; +extern PULONG KdComponentTable[104]; Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c Mon Feb 19 01:32:32 2007 @@ -62,7 +62,7 @@ // BOOLEAN KdBreakAfterSymbolLoad; BOOLEAN KdPitchDebugger; -BOOLEAN _KdDebuggerNotPresent = TRUE; +BOOLEAN _KdDebuggerNotPresent; BOOLEAN _KdDebuggerEnabled; BOOLEAN KdAutoEnableOnEvent; BOOLEAN KdPreviouslyEnabled; @@ -77,7 +77,7 @@ KDPC KdpTimeSlipDpc; KTIMER KdpTimeSlipTimer; WORK_QUEUE_ITEM KdpTimeSlipWorkItem; -LONG KdpTimeSlipPending; +LONG KdpTimeSlipPending = 1; PKEVENT KdpTimeSlipEvent; KSPIN_LOCK KdpTimeSlipEventLock; LARGE_INTEGER KdTimerStop, KdTimerStart, KdTimerDifference; Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c Mon Feb 19 01:32:32 2007 @@ -70,7 +70,6 @@ PLIST_ENTRY NextEntry; ULONG i; CHAR NameBuffer[256]; - return TRUE; /* Check if this is Phase 1 */ if (BootPhase) @@ -207,9 +206,9 @@ KdDebuggerEnabled = TRUE; /* Let user-mode know that it's enabled as well */ -#undef KdDebuggerEnabled - SharedUserData->KdDebuggerEnabled = TRUE; -#define KdDebuggerEnabled _KdDebuggerEnabled +//#undef KdDebuggerEnabled + //SharedUserData->KdDebuggerEnabled = TRUE; +//#define KdDebuggerEnabled _KdDebuggerEnabled /* Check if we have a loader block */ if (LoaderBlock) Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdlock.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdlock.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdlock.c Mon Feb 19 01:32:32 2007 @@ -28,6 +28,41 @@ { /* Release the lock */ KiReleaseSpinLock(&KdpDebuggerLock); +} + +BOOLEAN +NTAPI +KdpPollBreakInWithPortLock(VOID) +{ + BOOLEAN DoBreak = FALSE; + + /* First make sure that KD is enabled */ + if (KdDebuggerEnabled) + { + /* Check if a CTRL-C is in the queue */ + if (KdpContext.KdpControlCPending) + { + /* Set it and prepare for break */ + DoBreak = TRUE; + KdpContext.KdpControlCPending = FALSE; + } + else + { + /* Now get a packet */ + if (!KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, + NULL, + NULL, + NULL, + NULL)) + { + /* Successful breakin */ + DoBreak = TRUE; + } + } + } + + /* Tell the caller to do a break */ + return DoBreak; } /* PUBLIC FUNCTIONS **********************************************************/ Added: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c (added) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdprint.c Mon Feb 19 01:32:32 2007 @@ -1,0 +1,204 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdprint.c + * PURPOSE: KD64 Trap Handler Routines + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +CHAR KdpMessageBuffer[4096]; + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +KdpPrintString(IN PSTRING Output) +{ + STRING Data, Header; + DBGKD_DEBUG_IO DebugIo; + ULONG Length = Output->Length; + + /* Copy the string */ + RtlMoveMemory(KdpMessageBuffer, Output->Buffer, Length); + + /* Make sure we don't exceed the KD Packet size */ + if ((sizeof(DBGKD_DEBUG_IO) + Length) > PACKET_MAX_SIZE) + { + /* Normalize length */ + Length = PACKET_MAX_SIZE - sizeof(DBGKD_DEBUG_IO); + } + + /* Build the packet header */ + DebugIo.ApiNumber = DbgKdPrintStringApi; + DebugIo.ProcessorLevel = KeProcessorLevel; + DebugIo.Processor = KeGetCurrentPrcb()->Number; + DebugIo.u.PrintString.LengthOfString = Length; + Header.Length = sizeof(DBGKD_DEBUG_IO); + Header.Buffer = (PCHAR)&DebugIo; + + /* Build the data */ + Data.Length = Length; + Data.Buffer = KdpMessageBuffer; + + /* Send the packet */ + KdSendPacket(PACKET_TYPE_KD_DEBUG_IO, &Header, &Data, &KdpContext); + + /* Check if the user pressed CTRL+C */ + return KdpPollBreakInWithPortLock(); +} + +ULONG +NTAPI +KdpCommandString(IN ULONG Length, + IN LPSTR String, + IN KPROCESSOR_MODE PreviousMode, + IN PCONTEXT ContextRecord, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + /* FIXME */ + return FALSE; +} + +ULONG +NTAPI +KdpSymbol(IN LPSTR DllPath, + IN ULONG DllBase, + IN BOOLEAN Unload, + IN KPROCESSOR_MODE PreviousMode, + IN PCONTEXT ContextRecord, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + BOOLEAN Entered; + PKPRCB Prcb = KeGetCurrentPrcb(); + ULONG Status; + + /* Check if we need to do anything */ + if ((PreviousMode != KernelMode) || (KdDebuggerNotPresent)) return 0; + + /* Enter the debugger */ + Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); + + /* Save the CPU Control State and save the context */ + KiSaveProcessorControlState(&Prcb->ProcessorState); + RtlCopyMemory(&Prcb->ProcessorState.ContextFrame, + ContextRecord, + sizeof(CONTEXT)); + + /* Report the new state */ +#if 0 + Status = KdpReportLoadSymbolsStateChange(DllPath, + DllBase, + Unload, + &Prcb-> + ProcessorState.ContextFrame); +#else + Status = FALSE; +#endif + + /* Now restore the processor state, manually again. */ + RtlCopyMemory(ContextRecord, + &Prcb->ProcessorState.ContextFrame, + sizeof(CONTEXT)); + KiRestoreProcessorControlState(&Prcb->ProcessorState); + + /* Exit the debugger and clear the CTRL-C state */ + KdExitDebugger(Entered); + return 0; +} + +ULONG +NTAPI +KdpPrompt(IN LPSTR InString, + IN ULONG InStringLength, + OUT LPSTR OutString, + IN ULONG OutStringLength, + IN KPROCESSOR_MODE PreviousMode, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + /* FIXME */ + return FALSE; +} + +ULONG +NTAPI +KdpPrint(IN ULONG ComponentId, + IN ULONG ComponentMask, + IN LPSTR String, + IN ULONG Length, + IN KPROCESSOR_MODE PreviousMode, + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + OUT PBOOLEAN Status) +{ + NTSTATUS ReturnValue; + BOOLEAN Entered; + ANSI_STRING AnsiString; + + /* Assume failure */ + *Status = FALSE; + + /* Validate the mask */ + if (ComponentMask <= 0x1F) ComponentMask = 1 << ComponentMask; + if (!(Kd_WIN2000_Mask & ComponentMask) || + ((ComponentId < KdComponentTableSize) && + !(*KdComponentTable[ComponentId] & ComponentMask))) + { + /* Mask validation failed */ + *Status = TRUE; + return FALSE; + } + + /* Normalize the length */ + Length = min(Length, 512); + + /* Check if we need to verify the buffer */ + if (PreviousMode != KernelMode) + { + /* FIXME: Support user-mode */ + } + + /* Setup the ANSI string */ + AnsiString.Buffer = String; + AnsiString.Length = (USHORT)Length; + + /* Log the print */ + //KdLogDbgPrint(&AnsiString); + + /* Check for a debugger */ + if (KdDebuggerNotPresent) + { + /* Fail */ + *Status = TRUE; + return (ULONG)STATUS_DEVICE_NOT_CONNECTED; + } + + /* Enter the debugger */ + Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); + + /* Print the string */ + if (KdpPrintString(&AnsiString)) + { + /* User pressed CTRL-C, breakpoint on return */ + ReturnValue = STATUS_BREAKPOINT; + } + else + { + /* String was printed */ + ReturnValue = STATUS_SUCCESS; + } + + /* Exit the debugger and return */ + KdExitDebugger(Entered); + *Status = TRUE; + return ReturnValue; +} + Modified: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c Mon Feb 19 01:32:32 2007 @@ -101,7 +101,6 @@ BOOLEAN Unload = FALSE; ULONG Eip, Eax; BOOLEAN Status = FALSE; - while (TRUE); /* * Check if we got a STATUS_BREAKPOINT with a SubID for Print, Prompt or @@ -120,7 +119,14 @@ case BREAKPOINT_PRINT: /* Call the worker routine */ - Eax = 0; + Eax = KdpPrint(ContextRecord->Ebx, + ContextRecord->Edi, + (LPSTR)ExceptionRecord->ExceptionInformation[1], + (ULONG)ExceptionRecord->ExceptionInformation[2], + PreviousMode, + TrapFrame, + ExceptionFrame, + &Status); /* Update the return value for the caller */ ContextRecord->Eax = Eax; @@ -130,6 +136,7 @@ case BREAKPOINT_PROMPT: /* Call the worker routine */ + while (TRUE); Eax = 0; Status = TRUE; @@ -147,6 +154,13 @@ case BREAKPOINT_LOAD_SYMBOLS: /* Call the worker routine */ + KdpSymbol(UlongToPtr(ExceptionRecord->ExceptionInformation[1]), + (ULONG)ExceptionRecord->ExceptionInformation[2], + Unload, + PreviousMode, + ContextRecord, + TrapFrame, + ExceptionFrame); Status = TRUE; break; @@ -154,6 +168,7 @@ case BREAKPOINT_COMMAND_STRING: /* Call the worker routine */ + while (TRUE); Status = TRUE; /* Anything else, do nothing */ Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/cpu.c Mon Feb 19 01:32:32 2007 @@ -678,11 +678,12 @@ NTAPI KiRestoreProcessorControlState(PKPROCESSOR_STATE ProcessorState) { + return; /* Restore the CR registers */ __writecr0(ProcessorState->SpecialRegisters.Cr0); Ke386SetCr2(ProcessorState->SpecialRegisters.Cr2); __writecr3(ProcessorState->SpecialRegisters.Cr3); - __writecr4(ProcessorState->SpecialRegisters.Cr4); + if (KeFeatureBits & KF_CR4) __writecr4(ProcessorState->SpecialRegisters.Cr4); // // Restore the DR registers @@ -711,7 +712,8 @@ ProcessorState->SpecialRegisters.Cr0 = __readcr0(); ProcessorState->SpecialRegisters.Cr2 = __readcr2(); ProcessorState->SpecialRegisters.Cr3 = __readcr3(); - ProcessorState->SpecialRegisters.Cr4 = __readcr4(); + ProcessorState->SpecialRegisters.Cr4 = (KeFeatureBits & KF_CR4) ? + __readcr4() : 0; /* Save the DR registers */ ProcessorState->SpecialRegisters.KernelDr0 = Ke386GetDr0(); Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/kiinit.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/kiinit.c Mon Feb 19 01:32:32 2007 @@ -786,5 +786,3 @@ /* Jump into the idle loop */ KiIdleLoop(); } - - Modified: branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def Mon Feb 19 01:32:32 2007 @@ -518,7 +518,8 @@ @IofCallDriver@8 @IofCompleteRequest@8 IoIsWdmVersionAvailable@8 -KdComPortInUse DATA +KdComPortInUse +KdDebuggerNotPresent=_KdDebuggerNotPresent Ke386CallBios@8 @KeAcquireGuardedMutex@4 @KeAcquireGuardedMutexUnsafe@4 Modified: branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild Mon Feb 19 01:32:32 2007 @@ -198,6 +198,7 @@ <file>kddata.c</file> <file>kdinit.c</file> <file>kdlock.c</file> + <file>kdprint.c</file> <file>kdtrap.c</file> </directory> <directory name="ldr">

1 0

[ion] 25838: - Add kd64 folder for KD64 6.0 implementation. - Implement KdEnterDebugger, KdExitDebugger, KdEnableDebuggerWithLock, KdEnableDebugger. - Add KD Version Block, KD Component Masks, and KD Configuration Options. - Implement KdInitSystem and KdRegisterDebuggerDataBlock. - Implement KdPollBreakIn, KdpLockPort, KdpUnlockPort. - Implement KdpStub and KdpReport. Implement logic of KdpTrap but not helper calls (KdpTrap is only enabled after KD connects). - Implement KD Time Slip support, Kd
by ion＠svn.reactos.org 18 Feb '07

18 Feb '07

Author: ion Date: Sun Feb 18 23:51:30 2007 New Revision: 25838 URL: http://svn.reactos.org/svn/reactos?rev=25838&view=rev Log: - Add kd64 folder for KD64 6.0 implementation. - Implement KdEnterDebugger, KdExitDebugger, KdEnableDebuggerWithLock, KdEnableDebugger. - Add KD Version Block, KD Component Masks, and KD Configuration Options. - Implement KdInitSystem and KdRegisterDebuggerDataBlock. - Implement KdPollBreakIn, KdpLockPort, KdpUnlockPort. - Implement KdpStub and KdpReport. Implement logic of KdpTrap but not helper calls (KdpTrap is only enabled after KD connects). - Implement KD Time Slip support, KdpSwitchProcessor, KdpQueryPerformanceCounter. Added: branches/alex-kd-branch/reactos/ntoskrnl/kd64/ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdlock.c branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/kd.h Sun Feb 18 23:51:30 2007 @@ -1,12 +1,3 @@ -// -// Kernel Debugger Port Definition -// -extern BOOLEAN _KdDebuggerEnabled; -extern BOOLEAN _KdDebuggerNotPresent; -extern BOOLEAN KdBreakAfterSymbolLoad; - -/* KD GLOBALS ***************************************************************/ - typedef BOOLEAN (NTAPI *PKDEBUG_ROUTINE)( @@ -18,4 +9,128 @@ IN BOOLEAN SecondChance ); +typedef +BOOLEAN +(NTAPI *PKDEBUG_SWITCH_ROUTINE)( + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN BOOLEAN SecondChance +); + +BOOLEAN +NTAPI +KdpEnterDebuggerException( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT Context, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChance +); + +VOID +NTAPI +KdpTimeSlipWork( + IN PVOID Context +); + +BOOLEAN +NTAPI +KdpSwitchProcessor( + IN PEXCEPTION_RECORD ExceptionRecord, + IN OUT PCONTEXT ContextRecord, + IN BOOLEAN SecondChanceException +); + +VOID +NTAPI +KdpTimeSlipDpcRoutine( + IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2 +); + +BOOLEAN +NTAPI +KdpStub( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException +); + +BOOLEAN +NTAPI +KdpTrap( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException +); + +VOID +NTAPI +KdpPortLock( + VOID +); + +VOID +NTAPI +KdpPortUnlock( + VOID +); + +BOOLEAN +NTAPI +KdEnterDebugger( + IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame +); + +VOID +NTAPI +KdExitDebugger( + IN BOOLEAN Entered +); + +NTSTATUS +NTAPI +KdEnableDebuggerWithLock( + IN BOOLEAN NeedLock +); + +extern DBGKD_GET_VERSION64 KdVersionBlock; +extern KDDEBUGGER_DATA64 KdDebuggerDataBlock; +extern LIST_ENTRY KdpDebuggerDataListHead; +extern KSPIN_LOCK KdpDataSpinLock; +extern LARGE_INTEGER KdPerformanceCounterRate; +extern LARGE_INTEGER KdTimerStart; +extern ULONG KdDisableCount; +extern KD_CONTEXT KdpContext; extern PKDEBUG_ROUTINE KiDebugRoutine; +extern PKDEBUG_SWITCH_ROUTINE KiDebugSwitchRoutine; +extern BOOLEAN KdBreakAfterSymbolLoad; +extern BOOLEAN KdPitchDebugger; +extern BOOLEAN _KdDebuggerNotPresent; +extern BOOLEAN _KdDebuggerEnabled; +extern BOOLEAN KdAutoEnableOnEvent; +extern BOOLEAN KdPreviouslyEnabled; +extern BOOLEAN KdpDebuggerStructuresInitialized; +extern BOOLEAN KdEnteredDebugger; +extern KDPC KdpTimeSlipDpc; +extern KTIMER KdpTimeSlipTimer; +extern WORK_QUEUE_ITEM KdpTimeSlipWorkItem; +extern LONG KdpTimeSlipPending; +extern PKEVENT KdpTimeSlipEvent; +extern KSPIN_LOCK KdpTimeSlipEventLock; +extern BOOLEAN KdpControlCPressed; +extern BOOLEAN KdpControlCWaiting; +extern BOOLEAN KdpPortLocked; +extern KSPIN_LOCK KdpDebuggerLock; +extern LARGE_INTEGER KdTimerStop, KdTimerStart, KdTimerDifference; + Added: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c (added) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdapi.c Sun Feb 18 23:51:30 2007 @@ -1,0 +1,261 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdapi.c + * PURPOSE: KD64 Public Routines and Internal Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpTimeSlipDpcRoutine(IN PKDPC Dpc, + IN PVOID DeferredContext, + IN PVOID SystemArgument1, + IN PVOID SystemArgument2) +{ + LONG OldSlip, NewSlip, PendingSlip; + + /* Get the current pending slip */ + PendingSlip = KdpTimeSlipPending; + do + { + /* Save the old value and either disable or enable it now. */ + OldSlip = PendingSlip; + NewSlip = OldSlip > 1 ? 1 : 0; + + /* Try to change the value */ + } while (InterlockedCompareExchange(&KdpTimeSlipPending, + NewSlip, + OldSlip) != OldSlip); + + /* If the New Slip value is 1, then do the Time Slipping */ + if (NewSlip) ExQueueWorkItem(&KdpTimeSlipWorkItem, DelayedWorkQueue); +} + +VOID +NTAPI +KdpTimeSlipWork(IN PVOID Context) +{ + KIRQL OldIrql; + LARGE_INTEGER DueTime; + + /* Update the System time from the CMOS */ + ExAcquireTimeRefreshLock(FALSE); + ExUpdateSystemTimeFromCmos(FALSE, 0); + ExReleaseTimeRefreshLock(); + + /* Check if we have a registered Time Slip Event and signal it */ + KeAcquireSpinLock(&KdpTimeSlipEventLock, &OldIrql); + if (KdpTimeSlipEvent) KeSetEvent(KdpTimeSlipEvent, 0, FALSE); + KeReleaseSpinLock(&KdpTimeSlipEventLock, OldIrql); + + /* Delay the DPC until it runs next time */ + DueTime.QuadPart = -1800000000; + KeSetTimer(&KdpTimeSlipTimer, DueTime, &KdpTimeSlipDpc); +} + +BOOLEAN +NTAPI +KdpSwitchProcessor(IN PEXCEPTION_RECORD ExceptionRecord, + IN OUT PCONTEXT ContextRecord, + IN BOOLEAN SecondChanceException) +{ + BOOLEAN Status; + + /* Save the port data */ + KdSave(FALSE); + + /* Report a state change */ +#if 0 + Status = KdpReportExceptionStateChange(ExceptionRecord, + ContextRecord, + SecondChanceException); +#else + Status = FALSE; +#endif + + /* Restore the port data and return */ + KdRestore(FALSE); + return Status; +} + +LARGE_INTEGER +NTAPI +KdpQueryPerformanceCounter(IN PKTRAP_FRAME TrapFrame) +{ + LARGE_INTEGER Null = {{0}}; + + /* Check if interrupts were disabled */ + if (!(TrapFrame->EFlags & EFLAGS_INTERRUPT_MASK)) + { + /* Nothing to return */ + return Null; + } + + /* Otherwise, do the call */ + return KeQueryPerformanceCounter(NULL); +} + +BOOLEAN +NTAPI +KdEnterDebugger(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + BOOLEAN Entered; + + /* Check if we have a trap frame */ + if (TrapFrame) + { + /* Calculate the time difference for the enter */ + KdTimerStop = KdpQueryPerformanceCounter(TrapFrame); + KdTimerDifference.QuadPart = KdTimerStop.QuadPart - + KdTimerStart.QuadPart; + } + else + { + /* No trap frame, so can't calculate */ + KdTimerStop.QuadPart = 0; + } + + /* Save the current IRQL */ + KeGetCurrentPrcb()->DebuggerSavedIRQL = KeGetCurrentIrql(); + + /* Freeze all CPUs */ + Entered = KeFreezeExecution(TrapFrame, ExceptionFrame); + + /* Lock the port, save the state and set debugger entered */ + KdpPortLocked = KeTryToAcquireSpinLockAtDpcLevel(&KdpDebuggerLock); + KdSave(FALSE); + KdEnteredDebugger = TRUE; + + /* Check freeze flag */ + if (KiFreezeFlag & 1) + { + /* Print out errror */ + DbgPrint("FreezeLock was jammed! Backup SpinLock was used!\n"); + } + + /* Check processor state */ + if (KiFreezeFlag & 2) + { + /* Print out errror */ + DbgPrint("Some processors not frozen in debugger!\n"); + } + + /* Make sure we acquired the port */ + if (!KdpPortLocked) DbgPrint("Port lock was not acquired!\n"); + + /* Return enter state */ + return Entered; +} + +VOID +NTAPI +KdExitDebugger(IN BOOLEAN Entered) +{ + ULONG TimeSlip; + + /* Restore the state and unlock the port */ + KdRestore(FALSE); + if (KdpPortLocked) KdpPortUnlock(); + + /* Unfreeze the CPUs */ + KeThawExecution(Entered); + + /* Compare time with the one from KdEnterDebugger */ + if (!KdTimerStop.QuadPart) + { + /* We didn't get a trap frame earlier in so never got the time */ + KdTimerStart = KdTimerStop; + } + else + { + /* Query the timer */ + KdTimerStart = KeQueryPerformanceCounter(NULL); + } + + /* Check if a Time Slip was on queue */ + TimeSlip = InterlockedIncrement(&KdpTimeSlipPending); + if (TimeSlip == 1) + { + /* Queue a DPC for the time slip */ + InterlockedIncrement(&KdpTimeSlipPending); + KeInsertQueueDpc(&KdpTimeSlipDpc, NULL, NULL); + } +} + +NTSTATUS +NTAPI +KdEnableDebuggerWithLock(BOOLEAN NeedLock) +{ + KIRQL OldIrql; + + /* Check if we need to acquire the lock */ + if (NeedLock) + { + /* Lock the port */ + KeRaiseIrql(DISPATCH_LEVEL, &OldIrql); + KdpPortLock(); + } + + /* Check if we're not disabled */ + if (!KdDisableCount) + { + /* Check if we had locked the port before */ + if (NeedLock) + { + /* Do the unlock */ + KeLowerIrql(OldIrql); + KdpPortUnlock(); + } + + /* Fail: We're already enabled */ + return STATUS_INVALID_PARAMETER; + } + + /* Decrease the disable count */ + if (!(--KdDisableCount)) + { + /* We're now enabled again! Were we enabled before, too? */ + if (KdPreviouslyEnabled) + { + /* Reinitialize the Debugger */ + KdInitSystem(0, NULL) ; + //KdpRestoreAllBreakpoints(); + } + } + + /* Check if we had locked the port before */ + if (NeedLock) + { + /* Yes, now unlock it */ + KeLowerIrql(OldIrql); + KdpPortUnlock(); + } + + /* We're done */ + return STATUS_SUCCESS; +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +NTSTATUS +NTAPI +KdEnableDebugger(VOID) +{ + /* Use the internal routine */ + while (TRUE); + return KdEnableDebuggerWithLock(TRUE); +} + Added: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c (added) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kddata.c Sun Feb 18 23:51:30 2007 @@ -1,0 +1,305 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kddata.c + * PURPOSE: Contains all global variables and settings for KD64 + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* GLOBALS *******************************************************************/ + +// +// Debugger Version Block +// +DBGKD_GET_VERSION64 KdVersionBlock = +{ + 0, + 0, + DBGKD_64BIT_PROTOCOL_VERSION2, + KD_SECONDARY_VERSION_DEFAULT, + DBGKD_VERS_FLAG_DATA, + IMAGE_FILE_MACHINE_I386, + PACKET_TYPE_MAX, + 0, + 0, + DBGKD_SIMULATION_NONE, + {0}, + 0, + 0, + 0 +}; + +// +// Debugger Data +// +KDDEBUGGER_DATA64 KdDebuggerDataBlock; +LIST_ENTRY KdpDebuggerDataListHead; +KSPIN_LOCK KdpDataSpinLock; + +// +// Debugger State +// +KD_CONTEXT KdpContext; +BOOLEAN KdpControlCPressed; +BOOLEAN KdpControlCWaiting; +BOOLEAN KdpPortLocked; +KSPIN_LOCK KdpDebuggerLock; + +// +// Debug Trap Handlers +// +PKDEBUG_ROUTINE KiDebugRoutine = KdpStub; +PKDEBUG_SWITCH_ROUTINE KiDebugSwitchRoutine; + +// +// Debugger Configuration Settings +// +BOOLEAN KdBreakAfterSymbolLoad; +BOOLEAN KdPitchDebugger; +BOOLEAN _KdDebuggerNotPresent = TRUE; +BOOLEAN _KdDebuggerEnabled; +BOOLEAN KdAutoEnableOnEvent; +BOOLEAN KdPreviouslyEnabled; +BOOLEAN KdpDebuggerStructuresInitialized; +BOOLEAN KdEnteredDebugger; +ULONG KdDisableCount; +LARGE_INTEGER KdPerformanceCounterRate; + +// +// Time Slip Support +// +KDPC KdpTimeSlipDpc; +KTIMER KdpTimeSlipTimer; +WORK_QUEUE_ITEM KdpTimeSlipWorkItem; +LONG KdpTimeSlipPending; +PKEVENT KdpTimeSlipEvent; +KSPIN_LOCK KdpTimeSlipEventLock; +LARGE_INTEGER KdTimerStop, KdTimerStart, KdTimerDifference; + +// +// Debug Filter Masks +// +ULONG Kd_WIN2000_Mask = 1; +ULONG Kd_SYSTEM_Mask; +ULONG Kd_SMSS_Mask; +ULONG Kd_SETUP_Mask; +ULONG Kd_NTFS_Mask; +ULONG Kd_FSTUB_Mask; +ULONG Kd_CRASHDUMP_Mask; +ULONG Kd_CDAUDIO_Mask; +ULONG Kd_CDROM_Mask; +ULONG Kd_CLASSPNP_Mask; +ULONG Kd_DISK_Mask; +ULONG Kd_REDBOOK_Mask; +ULONG Kd_STORPROP_Mask; +ULONG Kd_SCSIPORT_Mask; +ULONG Kd_SCSIMINIPORT_Mask; +ULONG Kd_CONFIG_Mask; +ULONG Kd_I8042PRT_Mask; +ULONG Kd_SERMOUSE_Mask; +ULONG Kd_LSERMOUS_Mask; +ULONG Kd_KBDHID_Mask; +ULONG Kd_MOUHID_Mask; +ULONG Kd_KBDCLASS_Mask; +ULONG Kd_MOUCLASS_Mask; +ULONG Kd_TWOTRACK_Mask; +ULONG Kd_WMILIB_Mask; +ULONG Kd_ACPI_Mask; +ULONG Kd_AMLI_Mask; +ULONG Kd_HALIA64_Mask; +ULONG Kd_VIDEO_Mask; +ULONG Kd_SVCHOST_Mask; +ULONG Kd_VIDEOPRT_Mask; +ULONG Kd_TCPIP_Mask; +ULONG Kd_DMSYNTH_Mask; +ULONG Kd_NTOSPNP_Mask; +ULONG Kd_FASTFAT_Mask; +ULONG Kd_SAMSS_Mask; +ULONG Kd_PNPMGR_Mask; +ULONG Kd_NETAPI_Mask; +ULONG Kd_SCSERVER_Mask; +ULONG Kd_SCCLIENT_Mask; +ULONG Kd_SERIAL_Mask; +ULONG Kd_SERENUM_Mask; +ULONG Kd_UHCD_Mask; +ULONG Kd_RPCPROXY_Mask; +ULONG Kd_AUTOCHK_Mask; +ULONG Kd_DCOMSS_Mask; +ULONG Kd_UNIMODEM_Mask; +ULONG Kd_SIS_Mask; +ULONG Kd_FLTMGR_Mask; +ULONG Kd_WMICORE_Mask; +ULONG Kd_BURNENG_Mask; +ULONG Kd_IMAPI_Mask; +ULONG Kd_SXS_Mask; +ULONG Kd_FUSION_Mask; +ULONG Kd_IDLETASK_Mask; +ULONG Kd_SOFTPCI_Mask; +ULONG Kd_TAPE_Mask; +ULONG Kd_MCHGR_Mask; +ULONG Kd_IDEP_Mask; +ULONG Kd_PCIIDE_Mask; +ULONG Kd_FLOPPY_Mask; +ULONG Kd_FDC_Mask; +ULONG Kd_TERMSRV_Mask; +ULONG Kd_W32TIME_Mask; +ULONG Kd_PREFETCHER_Mask; +ULONG Kd_RSFILTER_Mask; +ULONG Kd_FCPORT_Mask; +ULONG Kd_PCI_Mask; +ULONG Kd_DMIO_Mask; +ULONG Kd_DMCONFIG_Mask; +ULONG Kd_DMADMIN_Mask; +ULONG Kd_WSOCKTRANSPORT_Mask; +ULONG Kd_VSS_Mask; +ULONG Kd_PNPMEM_Mask; +ULONG Kd_PROCESSOR_Mask; +ULONG Kd_DMSERVER_Mask; +ULONG Kd_SR_Mask; +ULONG Kd_INFINIBAND_Mask; +ULONG Kd_IHVDRIVER_Mask; +ULONG Kd_IHVVIDEO_Mask; +ULONG Kd_IHVAUDIO_Mask; +ULONG Kd_IHVNETWORK_Mask; +ULONG Kd_IHVSTREAMING_Mask; +ULONG Kd_IHVBUS_Mask; +ULONG Kd_HPS_Mask; +ULONG Kd_RTLTHREADPOOL_Mask; +ULONG Kd_LDR_Mask; +ULONG Kd_TCPIP6_Mask; +ULONG Kd_ISAPNP_Mask; +ULONG Kd_SHPC_Mask; +ULONG Kd_STORPORT_Mask; +ULONG Kd_STORMINIPORT_Mask; +ULONG Kd_PRINTSPOOLER_Mask; +ULONG Kd_VSSDYNDISK_Mask; +ULONG Kd_VERIFIER_Mask; +ULONG Kd_VDS_Mask; +ULONG Kd_VDSBAS_Mask; +ULONG Kd_VDSDYNDR_Mask; +ULONG Kd_VDSUTIL_Mask; +ULONG Kd_DFRGIFC_Mask; +ULONG Kd_DEFAULT_Mask; +ULONG Kd_MM_Mask; +ULONG Kd_DFSC_Mask; +ULONG Kd_WOW64_Mask; +ULONG Kd_ENDOFTABLE_Mask; + +// +// Debug Filter Component Table +// +PULONG KdComponentTable[104] = +{ + &Kd_SYSTEM_Mask, + &Kd_SMSS_Mask, + &Kd_SETUP_Mask, + &Kd_NTFS_Mask, + &Kd_FSTUB_Mask, + &Kd_CRASHDUMP_Mask, + &Kd_CDAUDIO_Mask, + &Kd_CDROM_Mask, + &Kd_CLASSPNP_Mask, + &Kd_DISK_Mask, + &Kd_REDBOOK_Mask, + &Kd_STORPROP_Mask, + &Kd_SCSIPORT_Mask, + &Kd_SCSIMINIPORT_Mask, + &Kd_CONFIG_Mask, + &Kd_I8042PRT_Mask, + &Kd_SERMOUSE_Mask, + &Kd_LSERMOUS_Mask, + &Kd_KBDHID_Mask, + &Kd_MOUHID_Mask, + &Kd_KBDCLASS_Mask, + &Kd_MOUCLASS_Mask, + &Kd_TWOTRACK_Mask, + &Kd_WMILIB_Mask, + &Kd_ACPI_Mask, + &Kd_AMLI_Mask, + &Kd_HALIA64_Mask, + &Kd_VIDEO_Mask, + &Kd_SVCHOST_Mask, + &Kd_VIDEOPRT_Mask, + &Kd_TCPIP_Mask, + &Kd_DMSYNTH_Mask, + &Kd_NTOSPNP_Mask, + &Kd_FASTFAT_Mask, + &Kd_SAMSS_Mask, + &Kd_PNPMGR_Mask, + &Kd_NETAPI_Mask, + &Kd_SCSERVER_Mask, + &Kd_SCCLIENT_Mask, + &Kd_SERIAL_Mask, + &Kd_SERENUM_Mask, + &Kd_UHCD_Mask, + &Kd_RPCPROXY_Mask, + &Kd_AUTOCHK_Mask, + &Kd_DCOMSS_Mask, + &Kd_UNIMODEM_Mask, + &Kd_SIS_Mask, + &Kd_FLTMGR_Mask, + &Kd_WMICORE_Mask, + &Kd_BURNENG_Mask, + &Kd_IMAPI_Mask, + &Kd_SXS_Mask, + &Kd_FUSION_Mask, + &Kd_IDLETASK_Mask, + &Kd_SOFTPCI_Mask, + &Kd_TAPE_Mask, + &Kd_MCHGR_Mask, + &Kd_IDEP_Mask, + &Kd_PCIIDE_Mask, + &Kd_FLOPPY_Mask, + &Kd_FDC_Mask, + &Kd_TERMSRV_Mask, + &Kd_W32TIME_Mask, + &Kd_PREFETCHER_Mask, + &Kd_RSFILTER_Mask, + &Kd_FCPORT_Mask, + &Kd_PCI_Mask, + &Kd_DMIO_Mask, + &Kd_DMCONFIG_Mask, + &Kd_DMADMIN_Mask, + &Kd_WSOCKTRANSPORT_Mask, + &Kd_VSS_Mask, + &Kd_PNPMEM_Mask, + &Kd_PROCESSOR_Mask, + &Kd_DMSERVER_Mask, + &Kd_SR_Mask, + &Kd_INFINIBAND_Mask, + &Kd_IHVDRIVER_Mask, + &Kd_IHVVIDEO_Mask, + &Kd_IHVAUDIO_Mask, + &Kd_IHVNETWORK_Mask, + &Kd_IHVSTREAMING_Mask, + &Kd_IHVBUS_Mask, + &Kd_HPS_Mask, + &Kd_RTLTHREADPOOL_Mask, + &Kd_LDR_Mask, + &Kd_TCPIP6_Mask, + &Kd_ISAPNP_Mask, + &Kd_SHPC_Mask, + &Kd_STORPORT_Mask, + &Kd_STORMINIPORT_Mask, + &Kd_PRINTSPOOLER_Mask, + &Kd_VSSDYNDISK_Mask, + &Kd_VERIFIER_Mask, + &Kd_VDS_Mask, + &Kd_VDSBAS_Mask, + &Kd_VDSDYNDR_Mask, + &Kd_VDSUTIL_Mask, + &Kd_DFRGIFC_Mask, + &Kd_DEFAULT_Mask, + &Kd_MM_Mask, + &Kd_DFSC_Mask, + &Kd_WOW64_Mask, + &Kd_ENDOFTABLE_Mask, +}; + +ULONG KdComponentTableSize = sizeof(KdComponentTable); Added: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c (added) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdinit.c Sun Feb 18 23:51:30 2007 @@ -1,0 +1,250 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdinit.c + * PURPOSE: KD64 Initialization Code + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +KdRegisterDebuggerDataBlock(IN ULONG Tag, + IN PDBGKD_DEBUG_DATA_HEADER64 DataHeader, + IN ULONG Size) +{ + KIRQL OldIrql; + PLIST_ENTRY NextEntry; + PDBGKD_DEBUG_DATA_HEADER64 CurrentHeader; + + /* Acquire the Data Lock */ + KeAcquireSpinLock(&KdpDataSpinLock, &OldIrql); + + /* Loop the debugger data list */ + NextEntry = KdpDebuggerDataListHead.Flink; + while (NextEntry != &KdpDebuggerDataListHead) + { + /* Get the header for this entry */ + CurrentHeader = CONTAINING_RECORD(NextEntry, + DBGKD_DEBUG_DATA_HEADER64, + List); + + /* Move to the next one */ + NextEntry = NextEntry->Flink; + + /* Check if we already have this data block */ + if ((CurrentHeader == DataHeader) || (CurrentHeader->OwnerTag == Tag)) + { + /* Release the lock and fail */ + KeReleaseSpinLock(&KdpDataSpinLock, OldIrql); + return FALSE; + } + } + + /* Setup the header */ + DataHeader->OwnerTag = Tag; + DataHeader->Size = Size; + + /* Insert it into the list and release the lock */ + InsertTailList(&KdpDebuggerDataListHead, (PLIST_ENTRY)&DataHeader->List); + KeReleaseSpinLock(&KdpDataSpinLock, OldIrql); + return TRUE; +} + +BOOLEAN +NTAPI +KdInitSystem(IN ULONG BootPhase, + IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + BOOLEAN EnableKd; + LPSTR CommandLine, DebugLine; + ANSI_STRING ImageName; + PLDR_DATA_TABLE_ENTRY LdrEntry; + PLIST_ENTRY NextEntry; + ULONG i; + CHAR NameBuffer[256]; + return TRUE; + + /* Check if this is Phase 1 */ + if (BootPhase) + { + /* Just query the performance counter */ + KeQueryPerformanceCounter(&KdPerformanceCounterRate); + return TRUE; + } + + /* Check if we already initialized once */ + if (KdDebuggerEnabled) return TRUE; + + /* Set the Debug Routine as the Stub for now */ + KiDebugRoutine = KdpStub; + + /* Disable break after symbol load for now */ + KdBreakAfterSymbolLoad = FALSE; + + /* Check if the Debugger Data Block was already initialized */ + if (!KdpDebuggerDataListHead.Flink) + { + /* It wasn't...Initialize the KD Data Listhead */ + InitializeListHead(&KdpDebuggerDataListHead); + + /* Register the Debugger Data Block */ + KdRegisterDebuggerDataBlock(KDBG_TAG, + &KdDebuggerDataBlock.Header, + sizeof(KdDebuggerDataBlock)); + + /* Fill out the KD Version Block */ + KdVersionBlock.MajorVersion = (USHORT)(NtBuildNumber >> 28); + KdVersionBlock.MinorVersion = (USHORT)(NtBuildNumber & 0xFFFF); + +#ifdef CONFIG_SMP + /* This is an MP Build */ + KdVersionBlock.Flags |= DBGKD_VERS_FLAG_MP; +#endif + + /* Save Pointers to Loaded Module List and Debugger Data */ + KdVersionBlock.PsLoadedModuleList = (ULONG64)&PsLoadedModuleList; + KdVersionBlock.DebuggerDataList = (ULONG64)&KdpDebuggerDataListHead; + + /* Set protocol limits */ + KdVersionBlock.MaxStateChange = DbgKdMaximumStateChange - + DbgKdMinimumStateChange; + KdVersionBlock.MaxManipulate = DbgKdMaximumManipulate - + DbgKdMinimumManipulate; + KdVersionBlock.Unused[0] = 0; + + /* Link us in the KPCR */ + KeGetPcr()->KdVersionBlock = &KdVersionBlock; + } + + /* Check if we have a loader block */ + if (LoaderBlock) + { + /* Save the Kernel Base */ + KdVersionBlock.KernBase = (ULONG64)LoaderBlock->KernelStack; + + /* Check if we have a command line */ + CommandLine = LoaderBlock->LoadOptions; + if (CommandLine) + { + /* Upcase it */ + _strupr(CommandLine); + + /* Assume we'll disable KD */ + EnableKd = FALSE; + + /* Check for CRASHDEBUG and NODEBUG */ + if (strstr(CommandLine, "CRASHDEBUG")) KdPitchDebugger = FALSE; + if (strstr(CommandLine, "NODEBUG")) KdPitchDebugger = TRUE; + + /* Check if DEBUG was on */ + DebugLine = strstr(CommandLine, "DEBUG"); + if (DebugLine) + { + /* Enable KD */ + EnableKd = TRUE; + + /* Check if there was additional data */ + if (DebugLine[5] == '=') + { + /* FIXME: Check for NOUMEX, DISABLE, AUTOENABLE */ + } + } + } + else + { + /* No command line options? Disable debugger by default */ + KdPitchDebugger = TRUE; + EnableKd = FALSE; + } + } + else + { + /* Called from a bugcheck...Save the Kernel Base */ + KdVersionBlock.KernBase = PsNtosImageBase; + + /* Unconditionally enable KD */ + EnableKd = TRUE; + } + + /* Set the Kernel Base in the Data Block */ + KdDebuggerDataBlock.KernBase = KdVersionBlock.KernBase; + + /* Initialize the debugger if requested */ + if ((EnableKd) && (NT_SUCCESS(KdDebuggerInitialize0(LoaderBlock)))) + { + /* Now set our real KD routine */ + KiDebugRoutine = KdpTrap; + + /* Check if we've already initialized our structures */ + if (!KdpDebuggerStructuresInitialized) + { + /* Set the Debug Switch Routine and Retries*/ + KdpContext.KdpDefaultRetries = 20; + KiDebugSwitchRoutine = KdpSwitchProcessor; + + /* Initialize the Time Slip DPC */ + KeInitializeDpc(&KdpTimeSlipDpc, KdpTimeSlipDpcRoutine, NULL); + KeInitializeTimer(&KdpTimeSlipTimer); + ExInitializeWorkItem(&KdpTimeSlipWorkItem, KdpTimeSlipWork, NULL); + + /* First-time initialization done! */ + KdpDebuggerStructuresInitialized = TRUE; + } + + /* Initialize the timer */ + KdTimerStart.QuadPart = 0; + + /* Officially enable KD */ + KdPitchDebugger = FALSE; + KdDebuggerEnabled = TRUE; + + /* Let user-mode know that it's enabled as well */ +#undef KdDebuggerEnabled + SharedUserData->KdDebuggerEnabled = TRUE; +#define KdDebuggerEnabled _KdDebuggerEnabled + + /* Check if we have a loader block */ + if (LoaderBlock) + { + /* Loop boot images */ + NextEntry = LoaderBlock->LoadOrderListHead.Flink; + i = 0; + while ((NextEntry != &LoaderBlock->LoadOrderListHead) && (i < 2)) + { + /* Get the image entry */ + LdrEntry = CONTAINING_RECORD(NextEntry, + LDR_DATA_TABLE_ENTRY, + InLoadOrderLinks); + + /* Generate the image name */ + + /* Load symbols for image */ + RtlInitAnsiString(&ImageName, NameBuffer); + DbgLoadImageSymbols(&ImageName, LdrEntry->DllBase, -1); + + /* Go to the next entry */ + NextEntry = NextEntry->Flink; + i++; + } + } + + /* Check for incoming breakin and break on symbol load if we have it*/ + KdBreakAfterSymbolLoad = KdPollBreakIn(); + } + else + { + /* Disable debugger */ + KdDebuggerNotPresent = TRUE; + } + + /* Return initialized */ + return TRUE; +} Added: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdlock.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdlock.c (added) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdlock.c Sun Feb 18 23:51:30 2007 @@ -1,0 +1,90 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdlock.c + * PURPOSE: KD64 Port Lock and Breakin Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpPortLock(VOID) +{ + /* Acquire the lock */ + KiAcquireSpinLock(&KdpDebuggerLock); +} + +VOID +NTAPI +KdpPortUnlock(VOID) +{ + /* Release the lock */ + KiReleaseSpinLock(&KdpDebuggerLock); +} + +/* PUBLIC FUNCTIONS **********************************************************/ + +/* + * @implemented + */ +BOOLEAN +NTAPI +KdPollBreakIn(VOID) +{ + BOOLEAN DoBreak = FALSE; + ULONG Flags; + + /* First make sure that KD is enabled */ + if (KdDebuggerEnabled) + { + /* Disable interrupts */ + Ke386SaveFlags(Flags); + //Flags = __getcallerseflags(); + _disable(); + + /* Check if a CTRL-C is in the queue */ + if (KdpControlCWaiting) + { + /* Set it and prepare for break */ + KdpControlCPressed = TRUE; + DoBreak = TRUE; + KdpControlCWaiting = FALSE; + } + else + { + /* Try to acquire the lock */ + if (KeTryToAcquireSpinLockAtDpcLevel(&KdpDebuggerLock)) + { + /* Now get a packet */ + if (!KdReceivePacket(PACKET_TYPE_KD_POLL_BREAKIN, + NULL, + NULL, + NULL, + NULL)) + { + /* Successful breakin */ + DoBreak = TRUE; + KdpControlCPressed = TRUE; + } + + /* Let go of the port */ + KdpPortUnlock(); + } + } + + /* Re-enable interrupts if they were disabled */ + if (Flags & EFLAGS_INTERRUPT_MASK) _enable(); + } + + /* Tell the caller to do a break */ + return DoBreak; +} + Added: branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c (added) +++ branches/alex-kd-branch/reactos/ntoskrnl/kd64/kdtrap.c Sun Feb 18 23:51:30 2007 @@ -1,0 +1,234 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/kdtrap.c + * PURPOSE: KD64 Trap Handlers + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* FUNCTIONS *****************************************************************/ + +BOOLEAN +NTAPI +KdpReport(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException) +{ + BOOLEAN Entered, Status; + PKPRCB Prcb; + while (TRUE); + + /* + * Only go ahead with this if this is an INT3 or an INT1, or if the global + * flag forces us to call up the debugger on exception, or if this is a + * second chance exception which means it hasn't been handled by now. + */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) || + (ExceptionRecord->ExceptionCode == STATUS_SINGLE_STEP) || + (NtGlobalFlag & FLG_STOP_ON_EXCEPTION) || + (SecondChanceException)) + { + /* + * Also, unless this is a second chance exception, then do not call up + * the debugger if the debug port is disconnected or the exception code + * indicates success. + */ + if (!(SecondChanceException) && + ((ExceptionRecord->ExceptionCode == STATUS_PORT_DISCONNECTED) || + (NT_SUCCESS(ExceptionRecord->ExceptionCode)))) + { + /* Return false to hide the exception */ + return FALSE; + } + + /* Enter the debugger */ + Entered = KdEnterDebugger(TrapFrame, ExceptionFrame); + + /* + * Get the KPRCB and save the CPU Control State manually instead of + * using KiSaveProcessorState, since we already have a valid CONTEXT. + */ + Prcb = KeGetCurrentPrcb(); + KiSaveProcessorControlState(&Prcb->ProcessorState); + RtlCopyMemory(&Prcb->ProcessorState.ContextFrame, + ContextRecord, + sizeof(CONTEXT)); + + /* Report the new state */ +#if 0 + Status = KdpReportExceptionStateChange(ExceptionRecord, + &Prcb->ProcessorState. + ContextFrame, + SecondChanceException); +#else + Status = FALSE; +#endif + + /* Now restore the processor state, manually again. */ + RtlCopyMemory(ContextRecord, + &Prcb->ProcessorState.ContextFrame, + sizeof(CONTEXT)); + KiRestoreProcessorControlState(&Prcb->ProcessorState); + + /* Exit the debugger and clear the CTRL-C state */ + KdExitDebugger(Entered); + KdpControlCPressed = FALSE; + return Status; + } + + /* Fail if we got here */ + return FALSE; +} + +BOOLEAN +NTAPI +KdpTrap(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException) +{ + BOOLEAN Unload = FALSE; + ULONG Eip, Eax; + BOOLEAN Status = FALSE; + while (TRUE); + + /* + * Check if we got a STATUS_BREAKPOINT with a SubID for Print, Prompt or + * Load/Unload symbols. + */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && + (ExceptionRecord->ExceptionInformation[0] != BREAKPOINT_BREAK)) + { + /* Save EIP */ + Eip = ContextRecord->Eip; + + /* Check what kind of operation was requested from us */ + switch (ExceptionRecord->ExceptionInformation[0]) + { + /* DbgPrint */ + case BREAKPOINT_PRINT: + + /* Call the worker routine */ + Eax = 0; + + /* Update the return value for the caller */ + ContextRecord->Eax = Eax; + break; + + /* DbgPrompt */ + case BREAKPOINT_PROMPT: + + /* Call the worker routine */ + Eax = 0; + Status = TRUE; + + /* Update the return value for the caller */ + ContextRecord->Eax = Eax; + break; + + /* DbgUnloadSymbols */ + case BREAKPOINT_UNLOAD_SYMBOLS: + + /* Drop into the load case below, with the unload parameter */ + Unload = TRUE; + + /* DbgLoadSymbols */ + case BREAKPOINT_LOAD_SYMBOLS: + + /* Call the worker routine */ + Status = TRUE; + break; + + /* DbgCommandString*/ + case BREAKPOINT_COMMAND_STRING: + + /* Call the worker routine */ + Status = TRUE; + + /* Anything else, do nothing */ + default: + + /* Get out */ + break; + } + + /* + * If EIP was not updated, we'll increment it ourselves so execution + * continues past the breakpoint. + */ + if (ContextRecord->Eip == Eip) ContextRecord->Eip++; + } + else + { + /* Call the worker routine */ + Status = KdpReport(TrapFrame, + ExceptionFrame, + ExceptionRecord, + ContextRecord, + PreviousMode, + SecondChanceException); + } + + /* Return TRUE or FALSE to caller */ + return Status; +} + +BOOLEAN +NTAPI +KdpStub(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException) +{ + ULONG ExceptionCommand = ExceptionRecord->ExceptionInformation[0]; + + /* Check if this was a breakpoint due to DbgPrint or Load/UnloadSymbols */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && + (ExceptionRecord->NumberParameters > 0) && + ((ExceptionCommand == BREAKPOINT_LOAD_SYMBOLS) || + (ExceptionCommand == BREAKPOINT_UNLOAD_SYMBOLS) || + (ExceptionCommand == BREAKPOINT_COMMAND_STRING) || + (ExceptionCommand == BREAKPOINT_PRINT))) + { + /* This we can handle: simply bump EIP */ + ContextRecord->Eip++; + return TRUE; + } + else if (KdPitchDebugger) + { + /* There's no debugger, fail. */ + return FALSE; + } + else if ((KdAutoEnableOnEvent) && + (KdPreviouslyEnabled) && + !(KdDebuggerEnabled) && + (KdEnableDebugger()) && + (KdDebuggerEnabled)) + { + /* Debugging was Auto-Enabled. We can now send this to KD. */ + return KdpTrap(TrapFrame, + ExceptionFrame, + ExceptionRecord, + ContextRecord, + PreviousMode, + SecondChanceException); + } + else + { + /* FIXME: All we can do in this case is trace this exception */ + return FALSE; + } +} Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/exp.c Sun Feb 18 23:51:30 2007 @@ -15,47 +15,6 @@ #include <debug.h> /* GLOBALS *******************************************************************/ - -BOOLEAN -NTAPI -KdpEnterDebuggerException(IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame, - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT Context, - IN KPROCESSOR_MODE PreviousMode, - IN BOOLEAN SecondChance) -{ - /* HACK (just like all this routine */ - if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) - { - Context->Eip++; - return TRUE; - } - - return FALSE; -} - -BOOLEAN -NTAPI -KdInitSystem(IN ULONG BootPhase, - IN PLOADER_PARAMETER_BLOCK LoaderBlock) -{ - /* STUB */ - return TRUE; -} - -BOOLEAN -NTAPI -KdPollBreakIn(VOID) -{ - /* STUB */ - return FALSE; -} - -BOOLEAN _KdDebuggerEnabled = FALSE; -BOOLEAN _KdDebuggerNotPresent = TRUE; -BOOLEAN KdBreakAfterSymbolLoad = FALSE; -PKDEBUG_ROUTINE KiDebugRoutine = KdpEnterDebuggerException; /* DR Registers in the CONTEXT structure */ UCHAR KiDebugRegisterContextOffsets[9] = Modified: branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.rbuild Sun Feb 18 23:51:30 2007 @@ -193,6 +193,13 @@ <file>pnproot.c</file> </directory> </directory> + <directory name="kd64"> + <file>kdapi.c</file> + <file>kddata.c</file> + <file>kdinit.c</file> + <file>kdlock.c</file> + <file>kdtrap.c</file> + </directory> <directory name="ldr"> <file>loader.c</file> <file>rtl.c</file>

1 0

[ion] 25837: - Add KdDebuggerInitialize1 and enable call to it. - Fix KD_SYMBOLS_INFO definition and DbgLoadImageSymbols prototype. - Implement DbgUnLoadImageSymbols. - Fix some small bugs in KeBugCheckWithTf and add various debugger calls/checks where needed. - Fix bugcheck recursion code which was incorrect.
by ion＠svn.reactos.org 18 Feb '07

18 Feb '07

Author: ion Date: Sun Feb 18 23:47:04 2007 New Revision: 25837 URL: http://svn.reactos.org/svn/reactos?rev=25837&view=rev Log: - Add KdDebuggerInitialize1 and enable call to it. - Fix KD_SYMBOLS_INFO definition and DbgLoadImageSymbols prototype. - Implement DbgUnLoadImageSymbols. - Fix some small bugs in KeBugCheckWithTf and add various debugger calls/checks where needed. - Fix bugcheck recursion code which was incorrect. Modified: branches/alex-kd-branch/reactos/drivers/base/kdcom/kdbg.c branches/alex-kd-branch/reactos/drivers/base/kdcom/kdcom.def branches/alex-kd-branch/reactos/include/ndk/kdtypes.h branches/alex-kd-branch/reactos/include/ndk/rtlfuncs.h branches/alex-kd-branch/reactos/include/reactos/kddll.h branches/alex-kd-branch/reactos/lib/rtl/debug.c branches/alex-kd-branch/reactos/ntoskrnl/ex/init.c branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c Modified: branches/alex-kd-branch/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/drivers/… ============================================================================== --- branches/alex-kd-branch/reactos/drivers/base/kdcom/kdbg.c (original) +++ branches/alex-kd-branch/reactos/drivers/base/kdcom/kdbg.c Sun Feb 18 23:47:04 2007 @@ -567,6 +567,17 @@ } /* + * @unimplemented + */ +NTSTATUS +NTAPI +KdDebuggerInitialize1(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +/* * @implemented */ NTSTATUS Modified: branches/alex-kd-branch/reactos/drivers/base/kdcom/kdcom.def URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/drivers/… ============================================================================== --- branches/alex-kd-branch/reactos/drivers/base/kdcom/kdcom.def (original) +++ branches/alex-kd-branch/reactos/drivers/base/kdcom/kdcom.def Sun Feb 18 23:47:04 2007 @@ -2,6 +2,7 @@ EXPORTS KdDebuggerInitialize0@4 +KdDebuggerInitialize1@4 KdSave@4 KdRestore@4 KdReceivePacket@20 Modified: branches/alex-kd-branch/reactos/include/ndk/kdtypes.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/ndk/kdtypes.h (original) +++ branches/alex-kd-branch/reactos/include/ndk/kdtypes.h Sun Feb 18 23:47:04 2007 @@ -168,7 +168,7 @@ typedef struct _KD_SYMBOLS_INFO { PVOID BaseOfDll; - PVOID ProcessId; + ULONG_PTR ProcessId; ULONG CheckSum; ULONG SizeOfImage; } KD_SYMBOLS_INFO, *PKD_SYMBOLS_INFO; Modified: branches/alex-kd-branch/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/ndk/rtlfuncs.h (original) +++ branches/alex-kd-branch/reactos/include/ndk/rtlfuncs.h Sun Feb 18 23:47:04 2007 @@ -2511,7 +2511,15 @@ DbgLoadImageSymbols( IN PANSI_STRING Name, IN PVOID Base, - IN ULONG ProcessId + IN ULONG_PTR ProcessId +); + +VOID +NTAPI +DbgUnLoadImageSymbols( + IN PANSI_STRING Name, + IN PVOID Base, + IN ULONG_PTR ProcessId ); // Modified: branches/alex-kd-branch/reactos/include/reactos/kddll.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/reactos/kddll.h (original) +++ branches/alex-kd-branch/reactos/include/reactos/kddll.h Sun Feb 18 23:47:04 2007 @@ -4,6 +4,12 @@ NTSTATUS NTAPI KdDebuggerInitialize0( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +NTSTATUS +NTAPI +KdDebuggerInitialize1( IN PLOADER_PARAMETER_BLOCK LoaderBlock ); Modified: branches/alex-kd-branch/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/lib/rtl/… ============================================================================== --- branches/alex-kd-branch/reactos/lib/rtl/debug.c (original) +++ branches/alex-kd-branch/reactos/lib/rtl/debug.c Sun Feb 18 23:47:04 2007 @@ -315,14 +315,14 @@ NTAPI DbgLoadImageSymbols(IN PANSI_STRING Name, IN PVOID Base, - IN ULONG ProcessId) + IN ULONG_PTR ProcessId) { PIMAGE_NT_HEADERS NtHeader; KD_SYMBOLS_INFO SymbolInfo; /* Setup the symbol data */ SymbolInfo.BaseOfDll = Base; - SymbolInfo.ProcessId = UlongToPtr(ProcessId); + SymbolInfo.ProcessId = ProcessId; /* Get NT Headers */ NtHeader = NULL; //RtlImageNtHeader(Base); @@ -342,4 +342,25 @@ DebugService2(Name, &SymbolInfo, BREAKPOINT_LOAD_SYMBOLS); return STATUS_SUCCESS; } + +/* +* @implemented +*/ +VOID +NTAPI +DbgUnLoadImageSymbols(IN PANSI_STRING Name, + IN PVOID Base, + IN ULONG_PTR ProcessId) +{ + KD_SYMBOLS_INFO SymbolInfo; + + /* Setup the symbol data */ + SymbolInfo.BaseOfDll = Base; + SymbolInfo.ProcessId = ProcessId; + SymbolInfo.CheckSum = SymbolInfo.SizeOfImage = 0; + + /* Load the symbols */ + DebugService2(Name, &SymbolInfo, BREAKPOINT_UNLOAD_SYMBOLS); +} + /* EOF */ Modified: branches/alex-kd-branch/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ex/init.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ex/init.c Sun Feb 18 23:47:04 2007 @@ -1155,7 +1155,7 @@ HalReportResourceUsage(); /* Call the debugger DLL once we have KD64 6.0 support */ - //KdDebuggerInitialize1(LoaderBlock); + KdDebuggerInitialize1(LoaderBlock); /* Setup PnP Manager in phase 1 */ if (!PpInitSystem()) KeBugCheck(PP1_INITIALIZATION_FAILED); Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c Sun Feb 18 23:47:04 2007 @@ -427,13 +427,27 @@ { CHAR AnsiName[75]; + /* Check if bootvid is installed */ + if (InbvIsBootDriverInstalled()) + { + /* Acquire ownership and reset the display */ + InbvAcquireDisplayOwnership(); + InbvResetDisplay(); + + /* Display blue screen */ + InbvSolidColorFill(0, 0, 639, 479, 4); + InbvSetTextColor(15); + InbvInstallDisplayStringFilter(NULL); + InbvEnableDisplayString(TRUE); + InbvSetScrollRegion(0, 0, 639, 479); + } + /* Check if this is a hard error */ if (IsHardError) { /* Display caption and message */ if (HardErrCaption) InbvDisplayString(HardErrCaption); if (HardErrMessage) InbvDisplayString(HardErrMessage); - return; } /* Begin the display */ @@ -514,7 +528,7 @@ CONTEXT Context; ULONG MessageId; CHAR AnsiName[128]; - BOOLEAN IsSystem, IsHardError = FALSE; + BOOLEAN IsSystem, IsHardError = FALSE, Reboot = FALSE; PCHAR HardErrCaption = NULL, HardErrMessage = NULL; PVOID Eip = NULL, Memory; PVOID DriverBase; @@ -543,9 +557,10 @@ /* Capture the CPU Context */ RtlCaptureContext(&Prcb->ProcessorState.ContextFrame); + KiSaveProcessorControlState(&Prcb->ProcessorState); Context = Prcb->ProcessorState.ContextFrame; - /* FIXME: Call the Watchdog if it's regsitered */ + /* FIXME: Call the Watchdog if it's registered */ /* Check which bugcode this is */ switch (BugCheckCode) @@ -560,7 +575,6 @@ case FAT_FILE_SYSTEM: case NO_MORE_SYSTEM_PTES: case INACCESSIBLE_BOOT_DEVICE: - case KMODE_EXCEPTION_NOT_HANDLED: /* Keep the same code */ MessageId = BugCheckCode; @@ -568,33 +582,40 @@ /* Check if this is a kernel-mode exception */ case KERNEL_MODE_EXCEPTION_NOT_HANDLED: + //case SYSTEM_THREAD_EXCEPTION_NOT_HANDLED: + case KMODE_EXCEPTION_NOT_HANDLED: /* Use the generic text message */ MessageId = KMODE_EXCEPTION_NOT_HANDLED; + break; /* File-system errors */ case NTFS_FILE_SYSTEM: /* Use the generic message for FAT */ MessageId = FAT_FILE_SYSTEM; + break; /* Check if this is a coruption of the Mm's Pool */ case DRIVER_CORRUPTED_MMPOOL: /* Use generic corruption message */ MessageId = DRIVER_CORRUPTED_EXPOOL; + break; /* Check if this is a signature check failure */ case STATUS_SYSTEM_IMAGE_BAD_SIGNATURE: /* Use the generic corruption message */ MessageId = BUGCODE_PSS_MESSAGE_SIGNATURE; + break; /* All other codes */ default: /* Use the default bugcheck message */ MessageId = BUGCODE_PSS_MESSAGE; + break; } /* Save bugcheck data */ @@ -721,9 +742,13 @@ { /* Get EIP */ Eip = (PVOID)TrapFrame->Eip; + KiBugCheckData[3] = (ULONG)Eip; /* Find out if was in the kernel or drivers */ - DriverBase = KiPcToFileHeader(Eip, &LdrEntry, FALSE, &IsSystem); + DriverBase = KiPcToFileHeader(Eip, + &LdrEntry, + FALSE, + &IsSystem); } /* @@ -732,8 +757,8 @@ * and update the bugcheck code appropriately. */ - /* Check if we had a driver base */ - if (DriverBase) + /* Check if we didn't have a driver base */ + if (!DriverBase) { /* Find the driver that unloaded at this address */ KiBugCheckDriver = NULL; // FIXME: ROS can't locate @@ -757,10 +782,9 @@ /* Check if the driver consumed too many PTEs */ case DRIVER_USED_EXCESSIVE_PTES: - /* Driver base is in parameter 1 */ - DriverBase = (PVOID)BugCheckParameter1; - /* FIXME: LdrEntry is uninitialized for god's sake!!! - KiBugCheckDriver = &LdrEntry->BaseDllName; */ + /* Loader entry is in parameter 1 */ + LdrEntry = (PVOID)BugCheckParameter1; + KiBugCheckDriver = &LdrEntry->BaseDllName; break; /* Check if the driver has a stuck thread */ @@ -794,7 +818,8 @@ } } - /* FIXME: Check if we need to save the context for KD */ + /* Check if we need to save the context for KD */ + if (!KdPitchDebugger) KdDebuggerDataBlock.SavedContext = (ULONG)&Context; /* Check if a debugger is connected */ if ((BugCheckCode != MANUALLY_INITIATED_CRASH) && (KdDebuggerEnabled)) @@ -829,35 +854,13 @@ /* Break in the debugger */ KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_FIRST); } - else - { - /* - * ROS HACK. - * Ok, so debugging is enabled, but KDBG isn't there. - * We'll manually dump the stack for the user. - */ - KeRosDumpStackFrames(NULL, 0); - } - } - - /* Use the boot video driver to clear, fill and write to screen. */ - if (InbvIsBootDriverInstalled()) - { - /* FIXME: This should happen in KiDisplayBlueScreen!!! */ - InbvAcquireDisplayOwnership(); - InbvResetDisplay(); - InbvSolidColorFill(0, 0, 639, 479, 4); - InbvSetTextColor(15); - InbvInstallDisplayStringFilter(NULL); - InbvEnableDisplayString(TRUE); - InbvSetScrollRegion(0, 0, 639, 479); } /* Raise IRQL to HIGH_LEVEL */ _disable(); KeRaiseIrql(HIGH_LEVEL, &OldIrql); - /* Unlock the Kernel Adress Space if we own it */ + /* ROS HACK: Unlock the Kernel Address Space if we own it */ if (KernelAddressSpaceLock.Owner == KeGetCurrentThread()) { MmUnlockAddressSpace(MmGetKernelAddressSpace()); @@ -866,10 +869,10 @@ /* Avoid recursion */ if (!InterlockedDecrement((PLONG)&KeBugCheckCount)) { +#ifdef CONFIG_SMP /* Set CPU that is bug checking now */ KeBugCheckOwner = Prcb->Number; -#ifdef CONFIG_SMP /* Freeze the other CPUs */ for (i = 0; i < KeNumberProcessors; i++) { @@ -889,10 +892,17 @@ HardErrMessage, AnsiName); - /* FIXME: Enable debugger if it was pending */ - - /* Print the last line */ - InbvDisplayString("\r\n"); + /* Check if the debugger is disabled but we can enable it */ + if (!(KdDebuggerEnabled) && !(KdPitchDebugger)) + { + /* Enable it */ + KdEnableDebuggerWithLock(FALSE); + } + else + { + /* Otherwise, print the last line */ + InbvDisplayString("\r\n"); + } /* Save the context */ Prcb->ProcessorState.ContextFrame = Context; @@ -907,24 +917,34 @@ KiBugCheckData[3], TrapFrame); } - - /* Increase recursioun count */ - KeBugCheckOwnerRecursionCount++; - if (KeBugCheckOwnerRecursionCount == 2) - { - /* Break in the debugger */ - KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_SECOND); - } - else if (KeBugCheckOwnerRecursionCount > 2) - { - /* Halt the CPU */ - for (;;) Ke386HaltProcessor(); + else + { + /* Increase recursion count */ + KeBugCheckOwnerRecursionCount++; + if (KeBugCheckOwnerRecursionCount == 2) + { + /* Break in the debugger */ + KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_SECOND); + } + else if (KeBugCheckOwnerRecursionCount > 2) + { + /* Halt the CPU */ + for (;;) Ke386HaltProcessor(); + } } /* Call the Callbacks */ KiDoBugCheckCallbacks(); /* FIXME: Call Watchdog if enabled */ + + /* Check if we have to reboot */ + if (Reboot) + { + /* Unload symbols */ + DbgUnLoadImageSymbols(NULL, NtCurrentProcess(), 0); + HalReturnToFirmware(HalRebootRoutine); + } /* Attempt to break in the debugger (otherwise halt CPU) */ KiBugCheckDebugBreak(DBG_STATUS_BUGCHECK_SECOND);

1 0

[ion] 25836: - Fix KiDebugService to load EDX from KTRAP_FRAME_EDX, not KTRAP_FRAME_EAX!. - Fix CommonDispatchException to check for the argument count in ECX, not EAX. Previously we were ignoring parameter counts and never filling out exception records! - Fix DebugPrint to be the same in user-mode and kernel-mode by using DebugService. This now works because the bugs above were fixed.
by ion＠svn.reactos.org 18 Feb '07

18 Feb '07

Author: ion Date: Sun Feb 18 22:30:33 2007 New Revision: 25836 URL: http://svn.reactos.org/svn/reactos?rev=25836&view=rev Log: - Fix KiDebugService to load EDX from KTRAP_FRAME_EDX, not KTRAP_FRAME_EAX!. - Fix CommonDispatchException to check for the argument count in ECX, not EAX. Previously we were ignoring parameter counts and never filling out exception records! - Fix DebugPrint to be the same in user-mode and kernel-mode by using DebugService. This now works because the bugs above were fixed. Modified: branches/alex-kd-branch/reactos/dll/ntdll/dbg/dbgui.c branches/alex-kd-branch/reactos/lib/rtl/debug.c branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/trap.s branches/alex-kd-branch/reactos/ntoskrnl/rtl/misc.c Modified: branches/alex-kd-branch/reactos/dll/ntdll/dbg/dbgui.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/dll/ntdl… ============================================================================== --- branches/alex-kd-branch/reactos/dll/ntdll/dbg/dbgui.c (original) +++ branches/alex-kd-branch/reactos/dll/ntdll/dbg/dbgui.c Sun Feb 18 22:30:33 2007 @@ -13,28 +13,6 @@ #include <debug.h> /* FUNCTIONS *****************************************************************/ - -NTSTATUS -NTAPI -DebugService(IN ULONG Service, - IN PVOID Buffer, - IN ULONG Length, - IN PVOID Argument1, - IN PVOID Argument2); - -NTSTATUS -NTAPI -DebugPrint(IN PANSI_STRING DebugString, - IN ULONG ComponentId, - IN ULONG Level) -{ - /* Call the INT2D Service */ - return DebugService(BREAKPOINT_PRINT, - DebugString->Buffer, - DebugString->Length, - UlongToPtr(ComponentId), - UlongToPtr(Level)); -} /* * @implemented Modified: branches/alex-kd-branch/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/lib/rtl/… ============================================================================== --- branches/alex-kd-branch/reactos/lib/rtl/debug.c (original) +++ branches/alex-kd-branch/reactos/lib/rtl/debug.c Sun Feb 18 22:30:33 2007 @@ -16,27 +16,21 @@ /* PRIVATE FUNCTIONS ********************************************************/ -#if 0 NTSTATUS NTAPI DebugPrint(IN PANSI_STRING DebugString, IN ULONG ComponentId, IN ULONG Level) { + return STATUS_SUCCESS; + /* Call the INT2D Service */ return DebugService(BREAKPOINT_PRINT, DebugString->Buffer, DebugString->Length, UlongToPtr(ComponentId), - UlongToPtr(Level)); -} -#else -NTSTATUS -NTAPI -DebugPrint(IN PANSI_STRING DebugString, - IN ULONG ComponentId, - IN ULONG Level); -#endif + UlongToPtr(Level)); +} NTSTATUS NTAPI @@ -282,7 +276,7 @@ Input.Buffer = Response; /* Setup the output string */ - Output.Length = strlen (Prompt); + Output.Length = strlen(Prompt); Output.Buffer = Prompt; /* Call the system service */ Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/trap.s (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/trap.s Sun Feb 18 22:30:33 2007 @@ -471,7 +471,7 @@ /* Call debug service dispatcher */ mov eax, [ebp+KTRAP_FRAME_EAX] mov ecx, [ebp+KTRAP_FRAME_ECX] - mov edx, [ebp+KTRAP_FRAME_EAX] + mov edx, [ebp+KTRAP_FRAME_EDX] /* Jump to INT3 handler */ jmp PrepareInt3 @@ -591,7 +591,7 @@ mov [esp+EXCEPTION_RECORD_NUMBER_PARAMETERS], ecx /* Check parameter count */ - cmp eax, 0 + cmp ecx, 0 jz NoParams /* Get information */ @@ -613,9 +613,11 @@ SetPreviousMode: - /* Calculate the previous mode */ + /* Get the caller's CS */ mov eax, [ebp+KTRAP_FRAME_CS] + MaskMode: + /* Check if it was user-mode or kernel-mode */ and eax, MODE_MASK /* Dispatch the exception */ @@ -797,8 +799,8 @@ /* Setup EIP, NTSTATUS and parameter count, then dispatch */ mov ebx, [ebp+KTRAP_FRAME_EIP] dec ebx + mov ecx, 3 mov eax, STATUS_BREAKPOINT - mov ecx, 3 call _CommonDispatchException V86Int3: Modified: branches/alex-kd-branch/reactos/ntoskrnl/rtl/misc.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/rtl/misc.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/rtl/misc.c Sun Feb 18 22:30:33 2007 @@ -22,18 +22,6 @@ extern ULONG NtOSCSDVersion; /* FUNCTIONS *****************************************************************/ - -NTSTATUS -NTAPI -DebugPrint(IN PANSI_STRING DebugString, - IN ULONG ComponentId, - IN ULONG Level) -{ - /* Temporary hack */ - //KdpPrintString(DebugString->Buffer, DebugString->Length); - //HalDisplayString((PCHAR)DebugString->Buffer); - return STATUS_SUCCESS; -} /* * @implemented

1 0

[ion] 25835: - Add stubs for KdSave, KdRestore, KdDebuggerInitialize0, KdSendPacket, KdReceivePacket to kdcom.dll - Implement and export KeTryToAcquireSpinLockAtDpcLevel.
by ion＠svn.reactos.org 18 Feb '07

18 Feb '07

Author: ion Date: Sun Feb 18 19:50:37 2007 New Revision: 25835 URL: http://svn.reactos.org/svn/reactos?rev=25835&view=rev Log: - Add stubs for KdSave, KdRestore, KdDebuggerInitialize0, KdSendPacket, KdReceivePacket to kdcom.dll - Implement and export KeTryToAcquireSpinLockAtDpcLevel. Modified: branches/alex-kd-branch/reactos/drivers/base/kdcom/kdbg.c branches/alex-kd-branch/reactos/drivers/base/kdcom/kdcom.def branches/alex-kd-branch/reactos/ntoskrnl/ke/spinlock.c branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def Modified: branches/alex-kd-branch/reactos/drivers/base/kdcom/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/drivers/… ============================================================================== --- branches/alex-kd-branch/reactos/drivers/base/kdcom/kdbg.c (original) +++ branches/alex-kd-branch/reactos/drivers/base/kdcom/kdbg.c Sun Feb 18 19:50:37 2007 @@ -17,6 +17,8 @@ #include <halfuncs.h> #include <stdio.h> #include <debug.h> +#include "arc/arc.h" +#include "windbgkd.h" typedef struct _KD_PORT_INFORMATION { @@ -553,4 +555,66 @@ return TRUE; } +/* + * @unimplemented + */ +NTSTATUS +NTAPI +KdDebuggerInitialize0(IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) +{ + /* FIXME: TODO */ + return STATUS_UNSUCCESSFUL; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +KdSave(IN BOOLEAN SleepTransition) +{ + /* Nothing to do on COM ports */ + return STATUS_SUCCESS; +} + +/* + * @implemented + */ +NTSTATUS +NTAPI +KdRestore(IN BOOLEAN SleepTransition) +{ + /* Nothing to do on COM ports */ + return STATUS_SUCCESS; +} + +/* + * @unimplemented + */ +VOID +NTAPI +KdSendPacket(IN USHORT PacketType, + IN PSTRING Header, + IN PSTRING Data OPTIONAL, + OUT PKD_CONTEXT Context) +{ + /* FIXME: TODO */ + return; +} + +/* + * @unimplemented + */ +ULONG +NTAPI +KdReceivePacket(IN USHORT PacketType, + OUT PSTRING Header, + OUT PSTRING Data, + OUT PUSHORT DataSize, + OUT PKD_CONTEXT Context OPTIONAL) +{ + /* FIXME: TODO */ + return 0; +} + /* EOF */ Modified: branches/alex-kd-branch/reactos/drivers/base/kdcom/kdcom.def URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/drivers/… ============================================================================== --- branches/alex-kd-branch/reactos/drivers/base/kdcom/kdcom.def (original) +++ branches/alex-kd-branch/reactos/drivers/base/kdcom/kdcom.def Sun Feb 18 19:50:37 2007 @@ -1,15 +1,8 @@ LIBRARY kdcom.dll EXPORTS -KdPortGetByte@4 -KdPortGetByteEx@8 -KdPortInitialize@12 -KdPortInitializeEx@12 -KdPortPollByte@4 -KdPortPollByteEx@8 -KdPortPutByte@4 -KdPortPutByteEx@8 -KdPortRestore@0 -KdPortSave@0 -KdPortDisableInterrupts@0 -KdPortEnableInterrupts@0 +KdDebuggerInitialize0@4 +KdSave@4 +KdRestore@4 +KdReceivePacket@20 +KdSendPacket@16 Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/spinlock.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/spinlock.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/spinlock.c Sun Feb 18 19:50:37 2007 @@ -168,6 +168,40 @@ /* * @implemented */ +BOOLEAN +FASTCALL +KeTryToAcquireSpinLockAtDpcLevel(IN OUT PKSPIN_LOCK SpinLock) +{ +#ifdef CONFIG_SMP + /* Check if it's already acquired */ + if (!(*SpinLock)) + { + /* Try to acquire it */ + if (InterlockedBitTestAndSet((PLONG)SpinLock, 0)) + { + /* Someone else acquired it */ + return FALSE; + } + } + else + { + /* It was already acquired */ + return FALSE; + } + +#ifdef DBG + /* On debug builds, we OR in the KTHREAD */ + *SpinLock = (ULONG_PTR)KeGetCurrentThread() | 1; +#endif +#endif + + /* All is well, return TRUE */ + return TRUE; +} + +/* + * @implemented + */ VOID FASTCALL KeAcquireInStackQueuedSpinLockAtDpcLevel(IN PKSPIN_LOCK SpinLock, Modified: branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ntoskrnl.def Sun Feb 18 19:50:37 2007 @@ -650,6 +650,7 @@ KeTerminateThread@4 KeTickCount DATA @KeTryToAcquireGuardedMutex@4 +@KeTryToAcquireSpinLockAtDpcLevel@4 KeUpdateRunTime@4 KeUpdateSystemTime@0 KeUnstackDetachProcess@4

1 0

[tretiakov] 25834: Patch from Preston: fix bug 1918 "Keyboard config unavailable".
by tretiakov＠svn.reactos.org 18 Feb '07

18 Feb '07

Author: tretiakov Date: Sun Feb 18 19:35:09 2007 New Revision: 25834 URL: http://svn.reactos.org/svn/reactos?rev=25834&view=rev Log: Patch from Preston: fix bug 1918 "Keyboard config unavailable". Modified: trunk/reactos/dll/win32/shell32/control.c Modified: trunk/reactos/dll/win32/shell32/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/control.… ============================================================================== --- trunk/reactos/dll/win32/shell32/control.c (original) +++ trunk/reactos/dll/win32/shell32/control.c Sun Feb 18 19:35:09 2007 @@ -352,6 +352,7 @@ unsigned sp = 0; LPWSTR extraPmts = NULL; int quoted = 0; + BOOL spSet = FALSE; buffer = HeapAlloc(GetProcessHeap(), 0, (lstrlenW(wszCmd) + 1) * sizeof(*wszCmd)); if (!buffer) return; @@ -366,8 +367,10 @@ if (beg) { if (*beg == '@') { sp = atoiW(beg + 1); + spSet = TRUE; } else if (*beg == '\0') { sp = 0; + spSet = TRUE; } else { extraPmts = beg; } @@ -381,6 +384,9 @@ while ((ptr = StrChrW(buffer, '"'))) memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + while ((ptr = StrChrW(extraPmts, '"'))) + memmove(ptr, ptr+1, lstrlenW(ptr)*sizeof(WCHAR)); + TRACE("cmd %s, extra %s, sp %d\n", debugstr_w(buffer), debugstr_w(extraPmts), sp); Control_LoadApplet(hWnd, buffer, panel); @@ -393,6 +399,13 @@ WARN("Out of bounds (%u >= %u), setting to 0\n", sp, applet->count); sp = 0; } + + if ((extraPmts)&&(!spSet)) + { + while ((lstrcmpiW(extraPmts, applet->info[sp].szName)) && (sp < applet->count)) + sp++; + } + if (applet->info[sp].dwSize) { if (!applet->proc(applet->hWnd, CPL_STARTWPARMSA, sp, (LPARAM)extraPmts)) applet->proc(applet->hWnd, CPL_DBLCLK, sp, applet->info[sp].lData);

1 0

[ion] 25833: - Add EXCEPTION_RECORD64 and LIST_ENTRY64, KeTryToAcquireSpinLockAtDpcLevel, BREAKPOINT_COMMAND_STRING, Ke386SetCr2, Ke386SetDr3, Ke386SetDr6. - Remove non-kernel routines from kdfuncs.h and remove deprecated routines from ke.h. - Implement KiRestoreProcessorControlState, KeFreezeExecution, KeThawExecution, ExAcquireTimeRefreshLock, ExReleaseTimeRefreshLock. - Rename ModuleLoadList to PsLoadedModuleList. Add PsNtosImageBase and set value in it. - Add skeleton wdbgexts.h with what's
by ion＠svn.reactos.org 18 Feb '07

18 Feb '07

Author: ion Date: Sun Feb 18 10:21:03 2007 New Revision: 25833 URL: http://svn.reactos.org/svn/reactos?rev=25833&view=rev Log: - Add EXCEPTION_RECORD64 and LIST_ENTRY64, KeTryToAcquireSpinLockAtDpcLevel, BREAKPOINT_COMMAND_STRING, Ke386SetCr2, Ke386SetDr3, Ke386SetDr6. - Remove non-kernel routines from kdfuncs.h and remove deprecated routines from ke.h. - Implement KiRestoreProcessorControlState, KeFreezeExecution, KeThawExecution, ExAcquireTimeRefreshLock, ExReleaseTimeRefreshLock. - Rename ModuleLoadList to PsLoadedModuleList. Add PsNtosImageBase and set value in it. - Add skeleton wdbgexts.h with what's needed until now, this is a PSDK header. - Add kddll.h for KDCOM/1394/USB2.DLL prototypes. - Add windbgkd.h with KD protocol definitions. Used to be an NT5 DDK header, but was removed, so this goes into include\reactos. Added: branches/alex-kd-branch/reactos/include/psdk/wdbgexts.h branches/alex-kd-branch/reactos/include/reactos/kddll.h branches/alex-kd-branch/reactos/include/reactos/windbgkd.h Modified: branches/alex-kd-branch/reactos/include/ddk/winddk.h branches/alex-kd-branch/reactos/include/ndk/kdfuncs.h branches/alex-kd-branch/reactos/include/ndk/kdtypes.h branches/alex-kd-branch/reactos/include/psdk/ntdef.h branches/alex-kd-branch/reactos/ntoskrnl/ex/time.c branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ex.h branches/alex-kd-branch/reactos/ntoskrnl/include/internal/i386/intrin_i.h branches/alex-kd-branch/reactos/ntoskrnl/include/internal/i386/ke.h branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ke.h branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ps.h branches/alex-kd-branch/reactos/ntoskrnl/include/ntoskrnl.h branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/cpu.c branches/alex-kd-branch/reactos/ntoskrnl/ldr/loader.c branches/alex-kd-branch/reactos/ntoskrnl/mm/mm.c branches/alex-kd-branch/reactos/ntoskrnl/mm/rpoolmgr.h branches/alex-kd-branch/reactos/ntoskrnl/mm/verifier.c Modified: branches/alex-kd-branch/reactos/include/ddk/winddk.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/ddk/winddk.h (original) +++ branches/alex-kd-branch/reactos/include/ddk/winddk.h Sun Feb 18 10:21:03 2007 @@ -634,6 +634,17 @@ IN struct _IRP *Irp, IN PVOID MapRegisterBase, IN PVOID Context); + +typedef struct _EXCEPTION_RECORD64 +{ + NTSTATUS ExceptionCode; + ULONG ExceptionFlags; + ULONG64 ExceptionRecord; + ULONG64 ExceptionAddress; + ULONG NumberParameters; + ULONG __unusedAlignment; + ULONG64 ExceptionInformation[EXCEPTION_MAXIMUM_PARAMETERS]; +} EXCEPTION_RECORD64, *PEXCEPTION_RECORD64; typedef EXCEPTION_DISPOSITION (DDKAPI *PEXCEPTION_ROUTINE)( @@ -5423,6 +5434,13 @@ IN PKSPIN_LOCK SpinLock, IN KIRQL NewIrql); +NTKERNELAPI +BOOLEAN +FASTCALL +KeTryToAcquireSpinLockAtDpcLevel( + IN OUT PKSPIN_LOCK SpinLock +); + #define KeAcquireSpinLockAtDpcLevel(SpinLock) KefAcquireSpinLockAtDpcLevel(SpinLock) #define KeReleaseSpinLockFromDpcLevel(SpinLock) KefReleaseSpinLockFromDpcLevel(SpinLock) #define KeAcquireSpinLock(a,b) *(b) = KfAcquireSpinLock(a) Modified: branches/alex-kd-branch/reactos/include/ndk/kdfuncs.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/ndk/kdfuncs.h (original) +++ branches/alex-kd-branch/reactos/include/ndk/kdfuncs.h Sun Feb 18 10:21:03 2007 @@ -28,29 +28,6 @@ #ifndef NTOS_MODE_USER // -// Port Functions -// -UCHAR -NTAPI -KdPollBreakIn(VOID); - -NTSTATUS -NTAPI -KdRestore(IN BOOLEAN DisableDbgPorts); - -NTSTATUS -NTAPI -KdSave(IN ULONG Unknown); - -#ifdef _ARC_ -NTSTATUS -NTAPI -KdDebuggerInitialize0( - IN struct _LOADER_PARAMETER_BLOCK *LoaderBlock -); -#endif - -// // Debugger API // NTSTATUS @@ -63,6 +40,12 @@ ULONG OutputBufferLength, PULONG ReturnLength, KPROCESSOR_MODE PreviousMode +); + +BOOLEAN +NTAPI +KdPollBreakIn( + VOID ); #endif Modified: branches/alex-kd-branch/reactos/include/ndk/kdtypes.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/ndk/kdtypes.h (original) +++ branches/alex-kd-branch/reactos/include/ndk/kdtypes.h Sun Feb 18 10:21:03 2007 @@ -52,6 +52,7 @@ #define BREAKPOINT_PROMPT 2 #define BREAKPOINT_LOAD_SYMBOLS 3 #define BREAKPOINT_UNLOAD_SYMBOLS 4 +#define BREAKPOINT_COMMAND_STRING 5 // // Debug Control Codes for NtSystemDebugcontrol Modified: branches/alex-kd-branch/reactos/include/psdk/ntdef.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/psdk/ntdef.h (original) +++ branches/alex-kd-branch/reactos/include/psdk/ntdef.h Sun Feb 18 10:21:03 2007 @@ -89,6 +89,21 @@ PVOID SecurityQualityOfService; } OBJECT_ATTRIBUTES, *POBJECT_ATTRIBUTES; #endif + +typedef struct LIST_ENTRY32 +{ + ULONG Flink; + ULONG Blink; +} LIST_ENTRY32; +typedef LIST_ENTRY32 *PLIST_ENTRY32; + +typedef struct LIST_ENTRY64 +{ + ULONGLONG Flink; + ULONGLONG Blink; +} LIST_ENTRY64; +typedef LIST_ENTRY64 *PLIST_ENTRY64; + #define NOTHING #define RTL_CONSTANT_STRING(s) { sizeof(s)-sizeof((s)[0]), sizeof(s), s } #define TYPE_ALIGNMENT( t ) FIELD_OFFSET( struct { char x; t test; }, test ) Added: branches/alex-kd-branch/reactos/include/psdk/wdbgexts.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/psdk/wdbgexts.h (added) +++ branches/alex-kd-branch/reactos/include/psdk/wdbgexts.h Sun Feb 18 10:21:03 2007 @@ -1,0 +1,185 @@ +#ifndef _WDBGEXTS_ +#define _WDBGEXTS_ + +enum +{ + DBGKD_SIMULATION_NONE, + DBGKD_SIMULATION_EXDI +}; + +#define KD_SECONDARY_VERSION_DEFAULT 0 +#define KD_SECONDARY_VERSION_AMD64_OBSOLETE_CONTEXT_1 0 +#define KD_SECONDARY_VERSION_AMD64_OBSOLETE_CONTEXT_2 1 +#define KD_SECONDARY_VERSION_AMD64_CONTEXT 2 +#define CURRENT_KD_SECONDARY_VERSION KD_SECONDARY_VERSION_DEFAULT + +#define DBGKD_VERS_FLAG_MP 0x0001 +#define DBGKD_VERS_FLAG_DATA 0x0002 +#define DBGKD_VERS_FLAG_PTR64 0x0004 +#define DBGKD_VERS_FLAG_NOMM 0x0008 +#define DBGKD_VERS_FLAG_HSS 0x0010 +#define DBGKD_VERS_FLAG_PARTITIONS 0x0020 + +#define KDBG_TAG TAG('G', 'B', 'D', 'K') + +typedef struct _DBGKD_GET_VERSION64 +{ + USHORT MajorVersion; + USHORT MinorVersion; + UCHAR ProtocolVersion; + UCHAR KdSecondaryVersion; + USHORT Flags; + USHORT MachineType; + UCHAR MaxPacketType; + UCHAR MaxStateChange; + UCHAR MaxManipulate; + UCHAR Simulation; + USHORT Unused[1]; + ULONG64 KernBase; + ULONG64 PsLoadedModuleList; + ULONG64 DebuggerDataList; +} DBGKD_GET_VERSION64, *PDBGKD_GET_VERSION64; + +typedef struct _DBGKD_DEBUG_DATA_HEADER64 +{ + LIST_ENTRY64 List; + ULONG OwnerTag; + ULONG Size; +} DBGKD_DEBUG_DATA_HEADER64, *PDBGKD_DEBUG_DATA_HEADER64; + +typedef struct _KDDEBUGGER_DATA64 +{ + DBGKD_DEBUG_DATA_HEADER64 Header; + ULONG64 KernBase; + ULONG64 BreakpointWithStatus; + ULONG64 SavedContext; + USHORT ThCallbackStack; + USHORT NextCallback; + USHORT FramePointer; + USHORT PaeEnabled:1; + ULONG64 KiCallUserMode; + ULONG64 KeUserCallbackDispatcher; + ULONG64 PsLoadedModuleList; + ULONG64 PsActiveProcessHead; + ULONG64 PspCidTable; + ULONG64 ExpSystemResourcesList; + ULONG64 ExpPagedPoolDescriptor; + ULONG64 ExpNumberOfPagedPools; + ULONG64 KeTimeIncrement; + ULONG64 KeBugCheckCallbackListHead; + ULONG64 KiBugcheckData; + ULONG64 IopErrorLogListHead; + ULONG64 ObpRootDirectoryObject; + ULONG64 ObpTypeObjectType; + ULONG64 MmSystemCacheStart; + ULONG64 MmSystemCacheEnd; + ULONG64 MmSystemCacheWs; + ULONG64 MmPfnDatabase; + ULONG64 MmSystemPtesStart; + ULONG64 MmSystemPtesEnd; + ULONG64 MmSubsectionBase; + ULONG64 MmNumberOfPagingFiles; + ULONG64 MmLowestPhysicalPage; + ULONG64 MmHighestPhysicalPage; + ULONG64 MmNumberOfPhysicalPages; + ULONG64 MmMaximumNonPagedPoolInBytes; + ULONG64 MmNonPagedSystemStart; + ULONG64 MmNonPagedPoolStart; + ULONG64 MmNonPagedPoolEnd; + ULONG64 MmPagedPoolStart; + ULONG64 MmPagedPoolEnd; + ULONG64 MmPagedPoolInformation; + ULONG64 MmPageSize; + ULONG64 MmSizeOfPagedPoolInBytes; + ULONG64 MmTotalCommitLimit; + ULONG64 MmTotalCommittedPages; + ULONG64 MmSharedCommit; + ULONG64 MmDriverCommit; + ULONG64 MmProcessCommit; + ULONG64 MmPagedPoolCommit; + ULONG64 MmExtendedCommit; + ULONG64 MmZeroedPageListHead; + ULONG64 MmFreePageListHead; + ULONG64 MmStandbyPageListHead; + ULONG64 MmModifiedPageListHead; + ULONG64 MmModifiedNoWritePageListHead; + ULONG64 MmAvailablePages; + ULONG64 MmResidentAvailablePages; + ULONG64 PoolTrackTable; + ULONG64 NonPagedPoolDescriptor; + ULONG64 MmHighestUserAddress; + ULONG64 MmSystemRangeStart; + ULONG64 MmUserProbeAddress; + ULONG64 KdPrintCircularBuffer; + ULONG64 KdPrintCircularBufferEnd; + ULONG64 KdPrintWritePointer; + ULONG64 KdPrintRolloverCount; + ULONG64 MmLoadedUserImageList; + ULONG64 NtBuildLab; + ULONG64 KiNormalSystemCall; + ULONG64 KiProcessorBlock; + ULONG64 MmUnloadedDrivers; + ULONG64 MmLastUnloadedDriver; + ULONG64 MmTriageActionTaken; + ULONG64 MmSpecialPoolTag; + ULONG64 KernelVerifier; + ULONG64 MmVerifierData; + ULONG64 MmAllocatedNonPagedPool; + ULONG64 MmPeakCommitment; + ULONG64 MmTotalCommitLimitMaximum; + ULONG64 CmNtCSDVersion; + ULONG64 MmPhysicalMemoryBlock; + ULONG64 MmSessionBase; + ULONG64 MmSessionSize; + ULONG64 MmSystemParentTablePage; + ULONG64 MmVirtualTranslationBase; + USHORT OffsetKThreadNextProcessor; + USHORT OffsetKThreadTeb; + USHORT OffsetKThreadKernelStack; + USHORT OffsetKThreadInitialStack; + USHORT OffsetKThreadApcProcess; + USHORT OffsetKThreadState; + USHORT OffsetKThreadBStore; + USHORT OffsetKThreadBStoreLimit; + USHORT SizeEProcess; + USHORT OffsetEprocessPeb; + USHORT OffsetEprocessParentCID; + USHORT OffsetEprocessDirectoryTableBase; + USHORT SizePrcb; + USHORT OffsetPrcbDpcRoutine; + USHORT OffsetPrcbCurrentThread; + USHORT OffsetPrcbMhz; + USHORT OffsetPrcbCpuType; + USHORT OffsetPrcbVendorString; + USHORT OffsetPrcbProcStateContext; + USHORT OffsetPrcbNumber; + USHORT SizeEThread; + ULONG64 KdPrintCircularBufferPtr; + ULONG64 KdPrintBufferSize; + ULONG64 KeLoaderBlock; + USHORT SizePcr; + USHORT OffsetPcrSelfPcr; + USHORT OffsetPcrCurrentPrcb; + USHORT OffsetPcrContainedPrcb; + USHORT OffsetPcrInitialBStore; + USHORT OffsetPcrBStoreLimit; + USHORT OffsetPcrInitialStack; + USHORT OffsetPcrStackLimit; + USHORT OffsetPrcbPcrPage; + USHORT OffsetPrcbProcStateSpecialReg; + USHORT GdtR0Code; + USHORT GdtR0Data; + USHORT GdtR0Pcr; + USHORT GdtR3Code; + USHORT GdtR3Data; + USHORT GdtR3Teb; + USHORT GdtLdt; + USHORT GdtTss; + USHORT Gdt64R3CmCode; + USHORT Gdt64R3CmTeb; + ULONG64 IopNumTriageDumpDataBlocks; + ULONG64 IopTriageDumpDataBlocks; + ULONG64 VfCrashDataBlock; +} KDDEBUGGER_DATA64, *PKDDEBUGGER_DATA64; + +#endif Added: branches/alex-kd-branch/reactos/include/reactos/kddll.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/reactos/kddll.h (added) +++ branches/alex-kd-branch/reactos/include/reactos/kddll.h Sun Feb 18 10:21:03 2007 @@ -1,0 +1,41 @@ +#ifndef _KDDLL_ +#define _KDDLL_ + +NTSTATUS +NTAPI +KdDebuggerInitialize0( + IN PLOADER_PARAMETER_BLOCK LoaderBlock +); + +ULONG +NTAPI +KdReceivePacket( + IN ULONG PacketType, + OUT PSTRING MessageHeader, + OUT PSTRING MessageData, + OUT PULONG DataLength, + IN OUT PKD_CONTEXT Context +); + +NTSTATUS +NTAPI +KdRestore( + IN BOOLEAN SleepTransition +); + +NTSTATUS +NTAPI +KdSave( + IN BOOLEAN SleepTransition +); + +VOID +NTAPI +KdSendPacket( + IN ULONG PacketType, + IN PSTRING MessageHeader, + IN PSTRING MessageData, + IN OUT PKD_CONTEXT Context +); + +#endif Added: branches/alex-kd-branch/reactos/include/reactos/windbgkd.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/include/… ============================================================================== --- branches/alex-kd-branch/reactos/include/reactos/windbgkd.h (added) +++ branches/alex-kd-branch/reactos/include/reactos/windbgkd.h Sun Feb 18 10:21:03 2007 @@ -1,0 +1,229 @@ +#ifndef _WINDBGKD_ +#define _WINDBGKG_ + +// +// Packet Size and Control Stream Size +// +#define PACKET_MAX_SIZE 4000 +#define DBGKD_MAXSTREAM 16 + +// +// Magic Packet IDs +// +#define INITIAL_PACKET_ID 0x80800000 +#define SYNC_PACKET_ID 0x00000800 + +// +// Magic Packet bytes +// +#define BREAKIN_PACKET 0x62626262 +#define BREAKIN_PACKET_BYTE 0x62 +#define PACKET_LEADER 0x30303030 +#define PACKET_LEADER_BYTE 0x30 +#define CONTROL_PACKET_LEADER 0x69696969 +#define CONTROL_PACKET_LEADER_BYTE 0x69 +#define PACKET_TRAILING_BYTE 0xAA + +// +// Packet Types +// +#define PACKET_TYPE_UNUSED 0 +#define PACKET_TYPE_KD_STATE_CHANGE32 1 +#define PACKET_TYPE_KD_STATE_MANIPULATE 2 +#define PACKET_TYPE_KD_DEBUG_IO 3 +#define PACKET_TYPE_KD_ACKNOWLEDGE 4 +#define PACKET_TYPE_KD_RESEND 5 +#define PACKET_TYPE_KD_RESET 6 +#define PACKET_TYPE_KD_STATE_CHANGE64 7 +#define PACKET_TYPE_KD_POLL_BREAKIN 8 +#define PACKET_TYPE_KD_TRACE_IO 9 +#define PACKET_TYPE_KD_CONTROL_REQUEST 10 +#define PACKET_TYPE_KD_FILE_IO 11 +#define PACKET_TYPE_MAX 12 + +// +// Wait State Change Types +// +#define DbgKdMinimumStateChange 0x00003030 +#define DbgKdExceptionStateChange 0x00003030 +#define DbgKdLoadSymbolsStateChange 0x00003031 +#define DbgKdCommandStringStateChange 0x00003032 +#define DbgKdMaximumStateChange 0x00003033 + +// +// Manipulate Types +// +#define DbgKdMinimumManipulate 0x00003130 +#define DbgKdReadVirtualMemoryApi 0x00003130 +#define DbgKdWriteVirtualMemoryApi 0x00003131 +#define DbgKdGetContextApi 0x00003132 +#define DbgKdSetContextApi 0x00003133 +#define DbgKdWriteBreakPointApi 0x00003134 +#define DbgKdRestoreBreakPointApi 0x00003135 +#define DbgKdContinueApi 0x00003136 +#define DbgKdReadControlSpaceApi 0x00003137 +#define DbgKdWriteControlSpaceApi 0x00003138 +#define DbgKdReadIoSpaceApi 0x00003139 +#define DbgKdWriteIoSpaceApi 0x0000313A +#define DbgKdRebootApi 0x0000313B +#define DbgKdContinueApi2 0x0000313C +#define DbgKdReadPhysicalMemoryApi 0x0000313D +#define DbgKdWritePhysicalMemoryApi 0x0000313E +#define DbgKdQuerySpecialCallsApi 0x0000313F +#define DbgKdSetSpecialCallApi 0x00003140 +#define DbgKdClearSpecialCallsApi 0x00003141 +#define DbgKdSetInternalBreakPointApi 0x00003142 +#define DbgKdGetInternalBreakPointApi 0x00003143 +#define DbgKdReadIoSpaceExtendedApi 0x00003144 +#define DbgKdWriteIoSpaceExtendedApi 0x00003145 +#define DbgKdGetVersionApi 0x00003146 +#define DbgKdWriteBreakPointExApi 0x00003147 +#define DbgKdRestoreBreakPointExApi 0x00003148 +#define DbgKdCauseBugCheckApi 0x00003149 +#define DbgKdSwitchProcessor 0x00003150 +#define DbgKdPageInApi 0x00003151 +#define DbgKdReadMachineSpecificRegister 0x00003152 +#define DbgKdWriteMachineSpecificRegister 0x00003153 +#define OldVlm1 0x00003154 +#define OldVlm2 0x00003155 +#define DbgKdSearchMemoryApi 0x00003156 +#define DbgKdGetBusDataApi 0x00003157 +#define DbgKdSetBusDataApi 0x00003158 +#define DbgKdCheckLowMemoryApi 0x00003159 +#define DbgKdClearAllInternalBreakpointsApi 0x0000315A +#define DbgKdFillMemoryApi 0x0000315B +#define DbgKdQueryMemoryApi 0x0000315C +#define DbgKdSwitchPartition 0x0000315D +#define DbgKdMaximumManipulate 0x0000315E + +// +// Debug I/O Types +// +#define DbgKdPrintStringApi 0x00003230 +#define DbgKdGetStringApi 0x00003231 + +// +// Control Report Flags +// +#define REPORT_INCLUDES_SEGS 0x0001 +#define REPORT_INCLUDES_CS 0x0002 + +// +// Protocol Versions +// +#define DBGKD_64BIT_PROTOCOL_VERSION1 5 +#define DBGKD_64BIT_PROTOCOL_VERSION2 6 + +// +// KD Packet Structure +// +typedef struct _KD_PACKET +{ + ULONG PacketLeader; + USHORT PacketType; + USHORT ByteCount; + ULONG PacketId; + ULONG Checksum; +} KD_PACKET, *PKD_PACKET; + +// +// KD Context +// +typedef struct _KD_CONTEXT +{ + ULONG KdpDefaultRetries; + BOOLEAN KdpControlCPending; +} KD_CONTEXT, *PKD_CONTEXT; + +// +// DBGKM Structure for Exceptions +// +typedef struct _DBGKM_EXCEPTION64 +{ + EXCEPTION_RECORD64 ExceptionRecord; + ULONG FirstChance; +} DBGKM_EXCEPTION64, *PDBGKM_EXCEPTION64; + +// +// DBGKD Structure for State Change +// +typedef struct _DBGKD_CONTROL_REPORT +{ + ULONG Dr6; + ULONG Dr7; + USHORT InstructionCount; + USHORT ReportFlags; + UCHAR InstructionStream[DBGKD_MAXSTREAM]; + USHORT SegCs; + USHORT SegDs; + USHORT SegEs; + USHORT SegFs; + ULONG EFlags; +} DBGKD_CONTROL_REPORT, *PDBGKD_CONTROL_REPORT; + +// +// DBGKD Structure for Debug I/O Type Print String +// +typedef struct _DBGKD_PRINT_STRING +{ + ULONG LengthOfString; +} DBGKD_PRINT_STRING, *PDBGKD_PRINT_STRING; + +// +// DBGKD Structure for Debug I/O Type Get String +// +typedef struct _DBGKD_GET_STRING +{ + ULONG LengthOfPromptString; + ULONG LengthOfStringRead; +} DBGKD_GET_STRING, *PDBGKD_GET_STRING; + +// +// DBGKD Structure for Debug I/O +// +typedef struct _DBGKD_DEBUG_IO +{ + ULONG ApiNumber; + USHORT ProcessorLevel; + USHORT Processor; + union + { + DBGKD_PRINT_STRING PrintString; + DBGKD_GET_STRING GetString; + } u; +} DBGKD_DEBUG_IO, *PDBGKD_DEBUG_IO; + +// +// DBGKD Structure for Load Symbols +// +typedef struct _DBGKD_LOAD_SYMBOLS64 +{ + ULONG PathNameLength; + ULONG64 BaseOfDll; + ULONG64 ProcessId; + ULONG CheckSum; + ULONG SizeOfImage; + BOOLEAN UnloadSymbols; +} DBGKD_LOAD_SYMBOLS64, *PDBGKD_LOAD_SYMBOLS64; + +// +// DBGKD Structure for Wait State Change +// +typedef struct _DBGKD_WAIT_STATE_CHANGE64 +{ + ULONG NewState; + USHORT ProcessorLevel; + USHORT Processor; + ULONG NumberProcessors; + ULONG64 Thread; + ULONG64 ProgramCounter; + union + { + DBGKM_EXCEPTION64 Exception; + DBGKD_LOAD_SYMBOLS64 LoadSymbols; + } u; + DBGKD_CONTROL_REPORT ControlReport; + CONTEXT Context; +} DBGKD_WAIT_STATE_CHANGE64, *PDBGKD_WAIT_STATE_CHANGE64; + +#endif Modified: branches/alex-kd-branch/reactos/ntoskrnl/ex/time.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ex/time.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ex/time.c Sun Feb 18 10:21:03 2007 @@ -23,8 +23,44 @@ LARGE_INTEGER ExpTimeZoneBias; ULONG ExpTimeZoneId; ULONG ExpTickCountMultiplier; +ERESOURCE ExpTimeRefreshLock; /* FUNCTIONS ****************************************************************/ + +BOOLEAN +NTAPI +ExAcquireTimeRefreshLock(BOOLEAN Wait) +{ + /* Simply acquire the Resource */ + KeEnterCriticalRegion(); + if (!(ExAcquireResourceExclusiveLite(&ExpTimeRefreshLock, Wait))) + { + /* We failed! */ + KeLeaveCriticalRegion(); + return FALSE; + } + + /* Success */ + return TRUE; +} + +VOID +NTAPI +ExReleaseTimeRefreshLock(VOID) +{ + /* Simply release the Resource */ + ExReleaseResourceLite(&ExpTimeRefreshLock); + KeLeaveCriticalRegion(); +} + +VOID +NTAPI +ExUpdateSystemTimeFromCmos(IN BOOLEAN UpdateInterruptTime, + IN ULONG MaxSepInSeconds) +{ + /* FIXME: TODO */ + return; +} BOOLEAN NTAPI Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ex.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ex.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ex.h Sun Feb 18 10:21:03 2007 @@ -17,6 +17,7 @@ extern ERESOURCE ExpFirmwareTableResource; extern LIST_ENTRY ExpFirmwareTableProviderListHead; extern BOOLEAN ExpIsWinPEMode; +extern ULONG NtGlobalFlag; ULONG ExpAnsiCodePageDataOffset, ExpOemCodePageDataOffset; ULONG ExpUnicodeCaseTableDataOffset; PVOID ExpNlsSectionPointer; @@ -910,7 +911,7 @@ /* Unlock the pushlock */ OldValue.Value = InterlockedExchangeAddSizeT((PLONG)PushLock, - -EX_PUSH_LOCK_LOCK); + -(LONG)EX_PUSH_LOCK_LOCK); /* Sanity checks */ ASSERT(OldValue.Locked); @@ -989,6 +990,19 @@ NTSTATUS ExpSetTimeZoneInformation(PTIME_ZONE_INFORMATION TimeZoneInformation); +BOOLEAN +NTAPI +ExAcquireTimeRefreshLock(BOOLEAN Wait); + +VOID +NTAPI +ExReleaseTimeRefreshLock(VOID); + +VOID +NTAPI +ExUpdateSystemTimeFromCmos(IN BOOLEAN UpdateInterruptTime, + IN ULONG MaxSepInSeconds); + NTSTATUS NTAPI ExpAllocateLocallyUniqueId(OUT LUID *LocallyUniqueId); Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/i386/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/i386/intrin_i.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/i386/intrin_i.h Sun Feb 18 10:21:03 2007 @@ -81,17 +81,25 @@ #define Ke386FnInit() __asm__("fninit\n\t"); // +// CR Macros +// +#define Ke386SetCr2(X) __asm__ __volatile__("movl %0,%%cr2" : :"r" (X)); + +// // DR Macros // #define Ke386GetDr0() _Ke386GetDr(0) #define Ke386GetDr1() _Ke386GetDr(1) #define Ke386SetDr0(X) _Ke386SetDr(0,X) +#define Ke386SetDr1(X) _Ke386SetDr(1,X) #define Ke386GetDr2() _Ke386GetDr(2) #define Ke386SetDr2(X) _Ke386SetDr(2,X) #define Ke386GetDr3() _Ke386GetDr(3) +#define Ke386SetDr3(X) _Ke386SetDr(3,X) #define Ke386GetDr4() _Ke386GetDr(4) #define Ke386SetDr4(X) _Ke386SetDr(4,X) #define Ke386GetDr6() _Ke386GetDr(6) +#define Ke386SetDr6(X) _Ke386SetDr(6,X) #define Ke386GetDr7() _Ke386GetDr(7) #define Ke386SetDr7(X) _Ke386SetDr(7,X) @@ -193,6 +201,17 @@ } // +// CR Macros +// +VOID +FORCEINLINE +Ke386SetCr2(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov cr2, eax; +} + +// // DR Macros // ULONG @@ -243,6 +262,14 @@ { __asm mov eax, Value; __asm mov dr0, eax; +} + +VOID +FORCEINLINE +Ke386SetDr1(IN ULONG Value) +{ + __asm mov eax, Value; + __asm mov dr1, eax; } VOID Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/i386/ke.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/i386/ke.h Sun Feb 18 10:21:03 2007 @@ -63,8 +63,14 @@ VOID NTAPI +KiRestoreProcessorControlState( + IN PKPROCESSOR_STATE ProcessorState +); + +VOID +NTAPI KiSaveProcessorControlState( - IN PKPROCESSOR_STATE ProcessorState + OUT PKPROCESSOR_STATE ProcessorState ); VOID Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ke.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ke.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ke.h Sun Feb 18 10:21:03 2007 @@ -70,11 +70,6 @@ IN PCHAR Ansi, IN ULONG Length ); - -struct _KIRQ_TRAPFRAME; -struct _KPCR; -struct _KPRCB; -struct _KEXCEPTION_FRAME; extern ULONG_PTR MmFreeLdrFirstKrnlPhysAddr; extern ULONG_PTR MmFreeLdrLastKrnlPhysAddr; @@ -154,6 +149,7 @@ extern PVOID KeRaiseUserExceptionDispatcher; extern UCHAR KiDebugRegisterTrapOffsets[9]; extern UCHAR KiDebugRegisterContextOffsets[9]; +extern ULONG KiFreezeFlag; /* MACROS *************************************************************************/ @@ -193,16 +189,6 @@ /* INTERNAL KERNEL FUNCTIONS ************************************************/ -/* Readies a Thread for Execution. */ -BOOLEAN -NTAPI -KiDispatchThreadNoLock(ULONG NewThreadStatus); - -/* Readies a Thread for Execution. */ -VOID -NTAPI -KiDispatchThread(ULONG NewThreadStatus); - /* Finds a new thread to run */ NTSTATUS FASTCALL @@ -392,10 +378,6 @@ IN PKTRAP_FRAME TrapFrame, IN KPROFILE_SOURCE Source ); - -BOOLEAN -NTAPI -KiRosPrintAddress(PVOID Address); VOID NTAPI @@ -520,27 +502,11 @@ IN KPRIORITY Priority ); -BOOLEAN -NTAPI -KiDispatcherObjectWake( - DISPATCHER_HEADER* hdr, - KPRIORITY increment -); - VOID FASTCALL KiUnlinkThread( IN PKTHREAD Thread, IN NTSTATUS WaitStatus -); - -VOID -NTAPI -KeExpireTimers( - PKDPC Apc, - PVOID Arg1, - PVOID Arg2, - PVOID Arg3 ); VOID @@ -726,10 +692,6 @@ VOID NTAPI -KiInitializeSystemClock(VOID); - -VOID -NTAPI KiSystemStartup( IN PLOADER_PARAMETER_BLOCK LoaderBlock ); @@ -949,6 +911,15 @@ IN LONGLONG Value ); +BOOLEAN +NTAPI +KeFreezeExecution(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame); + +VOID +NTAPI +KeThawExecution(IN BOOLEAN Enable); + #include "ke_x.h" #endif /* __NTOSKRNL_INCLUDE_INTERNAL_KE_H */ Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ps.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ps.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/internal/ps.h Sun Feb 18 10:21:03 2007 @@ -384,7 +384,8 @@ extern POBJECT_TYPE PsJobType; extern LARGE_INTEGER ShortPsLockDelay; extern UNICODE_STRING PsNtDllPathName; -extern LIST_ENTRY PriorityListHead[MAXIMUM_PRIORITY]; +extern LIST_ENTRY PsLoadedModuleList; +extern ULONG PsNtosImageBase; // // Inlined Functions Modified: branches/alex-kd-branch/reactos/ntoskrnl/include/ntoskrnl.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/include/ntoskrnl.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/include/ntoskrnl.h Sun Feb 18 10:21:03 2007 @@ -12,6 +12,7 @@ #define _WIN32_WINNT _WIN32_WINNT_WS03 #define NTDDI_VERSION NTDDI_WS03SP1 #define NTKERNELAPI +#define NOEXTAPI /* DDK/IFS/NDK Headers */ #include <ntifs.h> @@ -51,6 +52,11 @@ /* SetupLDR Support */ #include <arc/setupblk.h> +/* KD Support */ +#include <windbgkd.h> +#include <wdbgexts.h> +#include <kddll.h> + /* PNP GUIDs */ #include <umpnpmgr/sysguid.h> Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/bug.c Sun Feb 18 10:21:03 2007 @@ -37,15 +37,15 @@ { PLIST_ENTRY current_entry; PLDR_DATA_TABLE_ENTRY current; - extern LIST_ENTRY ModuleListHead; + extern LIST_ENTRY PsLoadedModuleList; ULONG_PTR RelativeAddress; ULONG i = 0; do { - current_entry = ModuleListHead.Flink; - - while (current_entry != &ModuleListHead) + current_entry = PsLoadedModuleList.Flink; + + while (current_entry != &PsLoadedModuleList) { current = CONTAINING_RECORD(current_entry, LDR_DATA_TABLE_ENTRY, @@ -267,13 +267,13 @@ PVOID ImageBase, EipBase = NULL; PLDR_DATA_TABLE_ENTRY Entry; PLIST_ENTRY ListHead, NextEntry; - extern LIST_ENTRY ModuleListHead; + extern LIST_ENTRY PsLoadedModuleList; /* Assume no */ *InKernel = FALSE; /* Set list pointers and make sure it's valid */ - ListHead = &ModuleListHead; + ListHead = &PsLoadedModuleList; NextEntry = ListHead->Flink; if (NextEntry) { Modified: branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/cpu.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/cpu.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ke/i386/cpu.c Sun Feb 18 10:21:03 2007 @@ -74,6 +74,10 @@ BOOLEAN KiI386PentiumLockErrataPresent; BOOLEAN KiSMTProcessorsPresent; +/* Freeze data */ +KIRQL KiOldIrql; +ULONG KiFreezeFlag; + /* CPU Signatures */ static const CHAR CmpIntelID[] = "GenuineIntel"; static const CHAR CmpAmdID[] = "AuthenticAMD"; @@ -672,7 +676,36 @@ VOID NTAPI -KiSaveProcessorControlState(IN PKPROCESSOR_STATE ProcessorState) +KiRestoreProcessorControlState(PKPROCESSOR_STATE ProcessorState) +{ + /* Restore the CR registers */ + __writecr0(ProcessorState->SpecialRegisters.Cr0); + Ke386SetCr2(ProcessorState->SpecialRegisters.Cr2); + __writecr3(ProcessorState->SpecialRegisters.Cr3); + __writecr4(ProcessorState->SpecialRegisters.Cr4); + + // + // Restore the DR registers + // + Ke386SetDr0(ProcessorState->SpecialRegisters.KernelDr0); + Ke386SetDr1(ProcessorState->SpecialRegisters.KernelDr1); + Ke386SetDr2(ProcessorState->SpecialRegisters.KernelDr2); + Ke386SetDr3(ProcessorState->SpecialRegisters.KernelDr3); + Ke386SetDr6(ProcessorState->SpecialRegisters.KernelDr6); + Ke386SetDr7(ProcessorState->SpecialRegisters.KernelDr7); + + // + // Restore GDT, IDT, LDT and TSS + // + Ke386SetGlobalDescriptorTable(ProcessorState->SpecialRegisters.Gdtr); + Ke386SetInterruptDescriptorTable(ProcessorState->SpecialRegisters.Idtr); + Ke386SetTr(ProcessorState->SpecialRegisters.Tr); + Ke386SetLocalDescriptorTable(ProcessorState->SpecialRegisters.Ldtr); +} + +VOID +NTAPI +KiSaveProcessorControlState(OUT PKPROCESSOR_STATE ProcessorState) { /* Save the CR registers */ ProcessorState->SpecialRegisters.Cr0 = __readcr0(); @@ -807,6 +840,39 @@ MmSetPageProtect(NULL, NewIdt, PAGE_READONLY); } +BOOLEAN +NTAPI +KeFreezeExecution(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame) +{ + ULONG Flags; + + /* Disable interrupts and get previous state */ + Ke386SaveFlags(Flags); + //Flags = __getcallerseflags(); + _disable(); + + /* Save freeze flag */ + KiFreezeFlag = 4; + + /* Save the old IRQL */ + KiOldIrql = KeGetCurrentIrql(); + + /* Return whether interrupts were enabled */ + return (Flags & EFLAGS_INTERRUPT_MASK) ? TRUE: FALSE; +} + +VOID +NTAPI +KeThawExecution(IN BOOLEAN Enable) +{ + /* Cleanup CPU caches */ + KeFlushCurrentTb(); + + /* Re-enable interrupts */ + if (Enable) _enable(); +} + /* PUBLIC FUNCTIONS **********************************************************/ /* Modified: branches/alex-kd-branch/reactos/ntoskrnl/ldr/loader.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/ldr/loader.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/ldr/loader.c Sun Feb 18 10:21:03 2007 @@ -42,7 +42,8 @@ /* GLOBALS *******************************************************************/ -LIST_ENTRY ModuleListHead; +LIST_ENTRY PsLoadedModuleList; +ULONG PsNtosImageBase = 0x80100000; KSPIN_LOCK ModuleListLock; LDR_DATA_TABLE_ENTRY NtoskrnlModuleObject; LDR_DATA_TABLE_ENTRY HalModuleObject; @@ -101,7 +102,7 @@ PLDR_DATA_TABLE_ENTRY HalModuleObject, NtoskrnlModuleObject, LdrEntry; /* Initialize the module list and spinlock */ - InitializeListHead(&ModuleListHead); + InitializeListHead(&PsLoadedModuleList); KeInitializeSpinLock(&ModuleListLock); /* Get the NTOSKRNL Entry from the loader */ @@ -112,13 +113,14 @@ sizeof(LDR_DATA_TABLE_ENTRY), TAG('M', 'm', 'L', 'd')); NtoskrnlModuleObject->DllBase = LdrEntry->DllBase; + PsNtosImageBase = PtrToUlong(LdrEntry->DllBase); RtlInitUnicodeString(&NtoskrnlModuleObject->FullDllName, KERNEL_MODULE_NAME); LdrpBuildModuleBaseName(&NtoskrnlModuleObject->BaseDllName, &NtoskrnlModuleObject->FullDllName); NtoskrnlModuleObject->EntryPoint = LdrEntry->EntryPoint; NtoskrnlModuleObject->SizeOfImage = LdrEntry->SizeOfImage; /* Insert it into the list */ - InsertTailList(&ModuleListHead, &NtoskrnlModuleObject->InLoadOrderLinks); + InsertTailList(&PsLoadedModuleList, &NtoskrnlModuleObject->InLoadOrderLinks); /* Get the HAL Entry from the loader */ LdrEntry = CONTAINING_RECORD(KeLoaderBlock->LoadOrderListHead.Flink->Flink, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); @@ -134,7 +136,7 @@ HalModuleObject->SizeOfImage = LdrEntry->SizeOfImage; /* Insert it into the list */ - InsertTailList(&ModuleListHead, &HalModuleObject->InLoadOrderLinks); + InsertTailList(&PsLoadedModuleList, &HalModuleObject->InLoadOrderLinks); } NTSTATUS @@ -384,8 +386,8 @@ KeAcquireSpinLock(&ModuleListLock,&Irql); /* calculate required size */ - current_entry = ModuleListHead.Flink; - while (current_entry != (&ModuleListHead)) + current_entry = PsLoadedModuleList.Flink; + while (current_entry != (&PsLoadedModuleList)) { ModuleCount++; current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); @@ -418,8 +420,8 @@ Smi->NumberOfModules = ModuleCount; ModuleCount = 0; - current_entry = ModuleListHead.Flink; - while (current_entry != (&ModuleListHead)) + current_entry = PsLoadedModuleList.Flink; + while (current_entry != (&PsLoadedModuleList)) { current = CONTAINING_RECORD(current_entry,LDR_DATA_TABLE_ENTRY,InLoadOrderLinks); @@ -576,8 +578,8 @@ KeAcquireSpinLock(&ModuleListLock,&Irql); - Entry = ModuleListHead.Flink; - while (Entry != &ModuleListHead) + Entry = PsLoadedModuleList.Flink; + while (Entry != &PsLoadedModuleList) { Module = CONTAINING_RECORD(Entry, LDR_DATA_TABLE_ENTRY, InLoadOrderLinks); @@ -871,7 +873,7 @@ /* Insert module */ KeAcquireSpinLock(&ModuleListLock, &Irql); - InsertTailList(&ModuleListHead, + InsertTailList(&PsLoadedModuleList, &CreatedModuleObject->InLoadOrderLinks); KeReleaseSpinLock(&ModuleListLock, Irql); Modified: branches/alex-kd-branch/reactos/ntoskrnl/mm/mm.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/mm/mm.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/mm/mm.c Sun Feb 18 10:21:03 2007 @@ -409,7 +409,7 @@ ANSI_STRING AnsiRoutineName; NTSTATUS Status; PLIST_ENTRY NextEntry; - extern LIST_ENTRY ModuleListHead; + extern LIST_ENTRY PsLoadedModuleList; PLDR_DATA_TABLE_ENTRY LdrEntry; BOOLEAN Found = FALSE; UNICODE_STRING KernelName = RTL_CONSTANT_STRING(L"ntoskrnl.exe"); @@ -422,8 +422,8 @@ if (!NT_SUCCESS(Status)) return NULL; /* Loop the loaded module list */ - NextEntry = ModuleListHead.Flink; - while (NextEntry != &ModuleListHead) + NextEntry = PsLoadedModuleList.Flink; + while (NextEntry != &PsLoadedModuleList) { /* Get the entry */ LdrEntry = CONTAINING_RECORD(NextEntry, Modified: branches/alex-kd-branch/reactos/ntoskrnl/mm/rpoolmgr.h URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/mm/rpoolmgr.h (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/mm/rpoolmgr.h Sun Feb 18 10:21:03 2007 @@ -143,7 +143,7 @@ if ( Block->LastOwnerStack[i] != 0xDEADBEEF ) { R_DEBUG(" "); - if (!R_PRINT_ADDRESS ((PVOID)Block->LastOwnerStack[i]) ) + //if (!R_PRINT_ADDRESS ((PVOID)Block->LastOwnerStack[i]) ) { R_DEBUG("<%X>", Block->LastOwnerStack[i] ); } Modified: branches/alex-kd-branch/reactos/ntoskrnl/mm/verifier.c URL: http://svn.reactos.org/svn/reactos/branches/alex-kd-branch/reactos/ntoskrnl… ============================================================================== --- branches/alex-kd-branch/reactos/ntoskrnl/mm/verifier.c (original) +++ branches/alex-kd-branch/reactos/ntoskrnl/mm/verifier.c Sun Feb 18 10:21:03 2007 @@ -19,7 +19,7 @@ KMUTANT MmSystemLoadLock; ULONG MiActiveVerifierThunks; -extern LIST_ENTRY ModuleListHead; +extern LIST_ENTRY PsLoadedModuleList; /* PRIVATE FUNCTIONS *********************************************************/ @@ -32,7 +32,7 @@ PAGED_CODE(); /* Loop entries */ - NextEntry = ModuleListHead.Flink; + NextEntry = PsLoadedModuleList.Flink; do { /* Get the loader entry */ @@ -51,7 +51,7 @@ /* Move on */ NextEntry = NextEntry->Flink; - } while(NextEntry != &ModuleListHead); + } while(NextEntry != &PsLoadedModuleList); /* Return the entry */ return FoundEntry;

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2007