Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Jun 22 17:28:18 2009 New Revision: 41538 URL: http://svn.reactos.org/svn/reactos?rev=41538&view=rev Log: Fix comment. Modified: trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/kdbg.… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/kdbg.c [iso-8859-1] Mon Jun 22 17:28:18 2009 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel - * FILE: ntoskrnl/kd/wrappers/bochs.c + * FILE: ntoskrnl/kd/wrappers/kdbg.c * PURPOSE: KDBG Wrapper for Kd * * PROGRAMMERS: Aleksey Bragin (aleksey(a)reactos.org)

15 years, 4 months

[dgorbachev] 41537: [FORMATTING]

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Jun 22 17:26:12 2009 New Revision: 41537 URL: http://svn.reactos.org/svn/reactos?rev=41537&view=rev Log: [FORMATTING] Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Mon Jun 22 17:26:12 2009 @@ -33,9 +33,9 @@ static BOOLEAN GspInitialized; static BOOLEAN GspRemoteDebug; -static CONST CHAR HexChars[]="0123456789abcdef"; - -static PETHREAD GspRunThread; /* NULL means run all threads */ +static CONST CHAR HexChars[] = "0123456789abcdef"; + +static PETHREAD GspRunThread; /* NULL means run all threads */ static PETHREAD GspDbgThread; static PETHREAD GspEnumThread; @@ -54,202 +54,192 @@ enum REGISTER_NAMES { - EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI, - PC /* also known as eip */, - PS /* also known as eflags */, - CS, SS, DS, ES, FS, GS + EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI, + PC /* also known as eip */ , + PS /* also known as eflags */ , + CS, SS, DS, ES, FS, GS }; typedef struct _CPU_REGISTER { - ULONG Size; - ULONG OffsetInTF; - ULONG OffsetInContext; - BOOLEAN SetInContext; + ULONG Size; + ULONG OffsetInTF; + ULONG OffsetInContext; + BOOLEAN SetInContext; } CPU_REGISTER, *PCPU_REGISTER; static CPU_REGISTER GspRegisters[NUMREGS] = { - { 4, FIELD_OFFSET(KTRAP_FRAME, Eax), FIELD_OFFSET(CONTEXT, Eax), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Ecx), FIELD_OFFSET(CONTEXT, Ecx), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Edx), FIELD_OFFSET(CONTEXT, Edx), FALSE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Ebx), FIELD_OFFSET(CONTEXT, Ebx), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, HardwareEsp ), FIELD_OFFSET(CONTEXT, Esp), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, DbgEbp), FIELD_OFFSET(CONTEXT, Ebp), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Esi), FIELD_OFFSET(CONTEXT, Esi), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, Edi), FIELD_OFFSET(CONTEXT, Edi), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, DbgEip), FIELD_OFFSET(CONTEXT, Eip), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, EFlags), FIELD_OFFSET(CONTEXT, EFlags), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, SegCs), FIELD_OFFSET(CONTEXT, SegCs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, HardwareSegSs), FIELD_OFFSET(CONTEXT, SegSs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, SegDs), FIELD_OFFSET(CONTEXT, SegDs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, SegEs), FIELD_OFFSET(CONTEXT, SegEs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, SegFs), FIELD_OFFSET(CONTEXT, SegFs), TRUE }, - { 4, FIELD_OFFSET(KTRAP_FRAME, SegGs), FIELD_OFFSET(CONTEXT, SegGs), TRUE } + { 4, FIELD_OFFSET(KTRAP_FRAME, Eax), FIELD_OFFSET(CONTEXT, Eax), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Ecx), FIELD_OFFSET(CONTEXT, Ecx), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Edx), FIELD_OFFSET(CONTEXT, Edx), FALSE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Ebx), FIELD_OFFSET(CONTEXT, Ebx), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, HardwareEsp), FIELD_OFFSET(CONTEXT, Esp), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, DbgEbp), FIELD_OFFSET(CONTEXT, Ebp), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Esi), FIELD_OFFSET(CONTEXT, Esi), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, Edi), FIELD_OFFSET(CONTEXT, Edi), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, DbgEip), FIELD_OFFSET(CONTEXT, Eip), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, EFlags), FIELD_OFFSET(CONTEXT, EFlags), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegCs), FIELD_OFFSET(CONTEXT, SegCs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, HardwareSegSs), FIELD_OFFSET(CONTEXT, SegSs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegDs), FIELD_OFFSET(CONTEXT, SegDs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegEs), FIELD_OFFSET(CONTEXT, SegEs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegFs), FIELD_OFFSET(CONTEXT, SegFs), TRUE }, + { 4, FIELD_OFFSET(KTRAP_FRAME, SegGs), FIELD_OFFSET(CONTEXT, SegGs), TRUE } }; -static PCHAR GspThreadStates[DeferredReady+1] = -{ - "Initialized", - "Ready", - "Running", - "Standby", - "Terminated", - "Waiting", - "Transition", - "DeferredReady" +static PCHAR GspThreadStates[DeferredReady + 1] = +{ + "Initialized", + "Ready", + "Running", + "Standby", + "Terminated", + "Waiting", + "Transition", + "DeferredReady" }; - LONG HexValue(CHAR ch) { - if ((ch >= '0') && (ch <= '9')) - { - return (ch - '0'); - } - if ((ch >= 'a') && (ch <= 'f')) - { - return (ch - 'a' + 10); - } - if ((ch >= 'A') && (ch <= 'F')) - { - return (ch - 'A' + 10); - } - - return -1; -} - + if ((ch >= '0') && (ch <= '9')) + return (ch - '0'); + + if ((ch >= 'a') && (ch <= 'f')) + return (ch - 'a' + 10); + + if ((ch >= 'A') && (ch <= 'F')) + return (ch - 'A' + 10); + + return -1; +} VOID GdbPutChar(UCHAR Value) { - KdPortPutByteEx(&GdbPortInfo, Value); + KdPortPutByteEx(&GdbPortInfo, Value); } UCHAR GdbGetChar(VOID) { - UCHAR Value; - - while (!KdPortGetByteEx(&GdbPortInfo, &Value)) - ; - - return Value; -} - -/* scan for the sequence $<data>#<Checksum> */ + UCHAR Value; + + while (!KdPortGetByteEx(&GdbPortInfo, &Value)) + ; + + return Value; +} + +/* scan for the sequence $<data>#<Checksum> */ PCHAR GspGetPacket() { - PCHAR Buffer = &GspInBuffer[0]; - CHAR Checksum; - CHAR XmitChecksum; - ULONG Count; - CHAR ch; - - while (TRUE) - { - /* wait around for the start character, ignore all other characters */ - while ((ch = GdbGetChar ()) != '$') - ; - - retry: - Checksum = 0; - XmitChecksum = -1; - Count = 0; - - /* now, read until a # or end of Buffer is found */ - while (Count < sizeof(GspInBuffer) - 1) - { - ch = GdbGetChar(); - if (ch == '$') - { - goto retry; - } - if (ch == '#') - { - break; - } - Checksum = Checksum + ch; - Buffer[Count] = ch; - Count = Count + 1; - } - Buffer[Count] = 0; - - if (ch == '#') - { - ch = GdbGetChar(); - XmitChecksum = (CHAR)(HexValue(ch) << 4); - ch = GdbGetChar(); - XmitChecksum += (CHAR)(HexValue(ch)); - - if (Checksum != XmitChecksum) - { - GdbPutChar('-'); /* failed checksum */ - } - else - { - GdbPutChar('+'); /* successful transfer */ - - return &Buffer[0]; - } - } - } -} - -/* send the packet in Buffer. */ + PCHAR Buffer = &GspInBuffer[0]; + CHAR Checksum; + CHAR XmitChecksum; + ULONG Count; + CHAR ch; + + while (TRUE) + { + /* wait around for the start character, ignore all other characters */ + while ((ch = GdbGetChar()) != '$') + ; + +retry: + Checksum = 0; + XmitChecksum = -1; + Count = 0; + + /* now, read until a # or end of Buffer is found */ + while (Count < sizeof(GspInBuffer) - 1) + { + ch = GdbGetChar(); + if (ch == '$') + goto retry; + + if (ch == '#') + break; + + Checksum = Checksum + ch; + Buffer[Count] = ch; + Count = Count + 1; + } + Buffer[Count] = 0; + + if (ch == '#') + { + ch = GdbGetChar(); + XmitChecksum = (CHAR)(HexValue(ch) << 4); + ch = GdbGetChar(); + XmitChecksum += (CHAR)(HexValue(ch)); + + if (Checksum != XmitChecksum) + { + GdbPutChar('-'); /* failed checksum */ + } + else + { + GdbPutChar('+'); /* successful transfer */ + return &Buffer[0]; + } + } + } +} + +/* send the packet in Buffer. */ VOID GspPutPacket(PCHAR Buffer) { - CHAR Checksum; - LONG Count; - CHAR ch; - - /* $<packet info>#<Checksum>. */ - do - { - GdbPutChar('$'); - Checksum = 0; - Count = 0; - - while ((ch = Buffer[Count])) - { - GdbPutChar(ch); - Checksum += ch; - Count += 1; - } - - GdbPutChar('#'); - GdbPutChar(HexChars[(Checksum >> 4) & 0xf]); - GdbPutChar(HexChars[Checksum & 0xf]); - } - while (GdbGetChar() != '+'); -} - + CHAR Checksum; + LONG Count; + CHAR ch; + + /* $<packet info>#<Checksum>. */ + do + { + GdbPutChar('$'); + Checksum = 0; + Count = 0; + + while ((ch = Buffer[Count])) + { + GdbPutChar(ch); + Checksum += ch; + Count += 1; + } + + GdbPutChar('#'); + GdbPutChar(HexChars[(Checksum >> 4) & 0xf]); + GdbPutChar(HexChars[Checksum & 0xf]); + } + while (GdbGetChar() != '+'); +} VOID GspPutPacketNoWait(PCHAR Buffer) { - CHAR Checksum; - LONG Count; - CHAR ch; - - /* $<packet info>#<Checksum>. */ - GdbPutChar('$'); - Checksum = 0; - Count = 0; - - while ((ch = Buffer[Count])) - { - GdbPutChar(ch); - Checksum += ch; - Count += 1; - } - - GdbPutChar('#'); - GdbPutChar(HexChars[(Checksum >> 4) & 0xf]); - GdbPutChar(HexChars[Checksum & 0xf]); + CHAR Checksum; + LONG Count; + CHAR ch; + + /* $<packet info>#<Checksum>. */ + GdbPutChar('$'); + Checksum = 0; + Count = 0; + + while ((ch = Buffer[Count])) + { + GdbPutChar(ch); + Checksum += ch; + Count += 1; + } + + GdbPutChar('#'); + GdbPutChar(HexChars[(Checksum >> 4) & 0xf]); + GdbPutChar(HexChars[Checksum & 0xf]); } /* Indicate to caller of GspMem2Hex or GspHex2Mem that there has been an error. */ @@ -259,8 +249,10 @@ GspReadMemSafe(PCHAR Address) { CHAR ch = 0; + if (!KdpSafeReadMemory((ULONG_PTR)Address, 1, &ch)) - GspMemoryError = TRUE; + GspMemoryError = TRUE; + return ch; } @@ -268,118 +260,101 @@ GspWriteMemSafe(PCHAR Address, CHAR Ch) { if (!KdpSafeWriteMemory((ULONG_PTR)Address, 1, Ch)) - GspMemoryError = TRUE; -} - -/* Convert the memory pointed to by Address into hex, placing result in Buffer */ -/* Return a pointer to the last char put in Buffer (null) */ -/* If MayFault is TRUE, then we should set GspMemoryError in response to - a fault; if FALSE treat a fault like any other fault in the stub. */ + GspMemoryError = TRUE; +} + +/* Convert the memory pointed to by Address into hex, placing result in Buffer + * Return a pointer to the last char put in Buffer (null) + * If MayFault is TRUE, then we should set GspMemoryError in response to + * a fault; if FALSE treat a fault like any other fault in the stub. + */ static PCHAR -GspMem2Hex(PCHAR Address, - PCHAR Buffer, - LONG Count, - BOOLEAN MayFault) -{ - ULONG i; - CHAR ch; - - for (i = 0; i < (ULONG) Count; i++) - { - if (MayFault) - { - ch = GspReadMemSafe(Address); - if (GspMemoryError) - { - return Buffer; - } - } - else - { - ch = *Address; - } - *Buffer++ = HexChars[(ch >> 4) & 0xf]; - *Buffer++ = HexChars[ch & 0xf]; - Address++; - } - - *Buffer = 0; - return Buffer; +GspMem2Hex(PCHAR Address, PCHAR Buffer, LONG Count, BOOLEAN MayFault) +{ + ULONG i; + CHAR ch; + + for (i = 0; i < (ULONG)Count; i++) + { + if (MayFault) + { + ch = GspReadMemSafe(Address); + if (GspMemoryError) + return Buffer; + } + else + { + ch = *Address; + } + *Buffer++ = HexChars[(ch >> 4) & 0xf]; + *Buffer++ = HexChars[ch & 0xf]; + Address++; + } + + *Buffer = 0; + return Buffer; } static ULONG -GspWriteMem(PCHAR Address, - ULONG Count, - BOOLEAN MayFault, - CHAR (*GetContent)(PVOID Context, ULONG Offset), - PVOID Context) -{ - PCHAR Current; - PCHAR Page; - ULONG CountInPage; - ULONG i; - CHAR ch; - - Current = Address; - while (Current < Address + Count) - { - Page = (PCHAR)PAGE_ROUND_DOWN(Current); - if (Address + Count <= Page + PAGE_SIZE) - { - /* Fits in this page */ - CountInPage = Count; - } - else - { - /* Flows into next page, handle only current page in this iteration */ - CountInPage = PAGE_SIZE - (Address - Page); - } - - for (i = 0; i < CountInPage && ! GspMemoryError; i++) - { - ch = (*GetContent)(Context, Current - Address); - - if (MayFault) - { - GspWriteMemSafe(Current, ch); - } - else - { - *Current = ch; - } - - Current++; - } - if (MayFault) - { - if (GspMemoryError) - { - return Current - Address; - } - } - } - - return Current - Address; +GspWriteMem(PCHAR Address, ULONG Count, BOOLEAN MayFault, + CHAR (*GetContent)(PVOID Context, ULONG Offset), PVOID Context) +{ + PCHAR Current; + PCHAR Page; + ULONG CountInPage; + ULONG i; + CHAR ch; + + Current = Address; + while (Current < Address + Count) + { + Page = (PCHAR)PAGE_ROUND_DOWN(Current); + if (Address + Count <= Page + PAGE_SIZE) + { + /* Fits in this page */ + CountInPage = Count; + } + else + { + /* Flows into next page, handle only current page in this iteration */ + CountInPage = PAGE_SIZE - (Address - Page); + } + + for (i = 0; i < CountInPage && !GspMemoryError; i++) + { + ch = (*GetContent)(Context, Current - Address); + + if (MayFault) + GspWriteMemSafe(Current, ch); + else + *Current = ch; + + Current++; + } + if (MayFault) + { + if (GspMemoryError) + return Current - Address; + } + } + + return Current - Address; } static CHAR GspHex2MemGetContent(PVOID Context, ULONG Offset) { - return (CHAR)((HexValue(*((PCHAR) Context + 2 * Offset)) << 4) + - HexValue(*((PCHAR) Context + 2 * Offset + 1))); + return (CHAR)((HexValue(*((PCHAR)Context + 2 * Offset)) << 4) + + HexValue(*((PCHAR)Context + 2 * Offset + 1))); } /* Convert the hex array pointed to by Buffer into binary to be placed at Address * Return a pointer to the character AFTER the last byte read from Buffer */ static PCHAR -GspHex2Mem(PCHAR Buffer, - PCHAR Address, - ULONG Count, - BOOLEAN MayFault) -{ - Count = GspWriteMem(Address, Count, MayFault, GspHex2MemGetContent, Buffer); - - return Buffer + 2 * Count; +GspHex2Mem(PCHAR Buffer, PCHAR Address, ULONG Count, BOOLEAN MayFault) +{ + Count = GspWriteMem(Address, Count, MayFault, GspHex2MemGetContent, Buffer); + return Buffer + 2 * Count; } /**********************************************/ @@ -387,47 +362,42 @@ /* RETURN NUMBER OF CHARS PROCESSED */ /**********************************************/ LONG -GspHex2Long(PCHAR *Address, - PLONG Value) -{ - LONG NumChars = 0; - LONG Hex; - - *Value = 0; - - while (**Address) - { - Hex = HexValue(**Address); - if (Hex >= 0) - { - *Value = (*Value << 4) | Hex; - NumChars++; - } - else - { - break; - } - - (*Address)++; - } - - return NumChars; -} - +GspHex2Long(PCHAR *Address, PLONG Value) +{ + LONG NumChars = 0; + LONG Hex; + + *Value = 0; + + while (**Address) + { + Hex = HexValue(**Address); + if (Hex >= 0) + { + *Value = (*Value << 4) | Hex; + NumChars++; + } + else + { + break; + } + + (*Address)++; + } + + return NumChars; +} VOID -GspLong2Hex(PCHAR *Address, - LONG Value) -{ - LONG Save; - - Save = (((Value >> 0) & 0xff) << 24) | - (((Value >> 8) & 0xff) << 16) | - (((Value >> 16) & 0xff) << 8) | - (((Value >> 24) & 0xff) << 0); - *Address = GspMem2Hex((PCHAR) &Save, *Address, 4, FALSE); -} - +GspLong2Hex(PCHAR *Address, LONG Value) +{ + LONG Save; + + Save = (((Value >> 0) & 0xff) << 24) | (((Value >> 8) & 0xff) << 16) | + (((Value >> 16) & 0xff) << 8) | (((Value >> 24) & 0xff) << 0); + + *Address = GspMem2Hex((PCHAR)&Save, *Address, 4, FALSE); +} /* * When coming from kernel mode, Esp is not stored in the trap frame. @@ -438,447 +408,428 @@ static LONG GspGetEspFromTrapFrame(PKTRAP_FRAME TrapFrame) { - return KeGetPreviousMode() == KernelMode - ? (LONG) &TrapFrame->HardwareEsp : (LONG)TrapFrame->HardwareEsp; -} - + return KeGetPreviousMode() == KernelMode ? + (LONG)&TrapFrame->HardwareEsp : (LONG)TrapFrame->HardwareEsp; +} static VOID -GspGetRegisters(PCHAR Address, - PKTRAP_FRAME TrapFrame) -{ - ULONG_PTR Value; - PULONG p; - ULONG i; - PETHREAD Thread; - ULONG_PTR *KernelStack; - - if (NULL == GspDbgThread) - { - Thread = PsGetCurrentThread(); - } - else - { - TrapFrame = GspDbgThread->Tcb.TrapFrame; - Thread = GspDbgThread; - } - - if (Waiting == Thread->Tcb.State) - { - KernelStack = Thread->Tcb.KernelStack; - for (i = 0; i < sizeof(GspRegisters) / sizeof(GspRegisters[0]); i++) - { - switch(i) - { - case EBP: - Value = KernelStack[3]; - break; - case EDI: - Value = KernelStack[4]; - break; - case ESI: - Value = KernelStack[5]; - break; - case EBX: - Value = KernelStack[6]; - break; - case PC: - Value = KernelStack[7]; - break; - case ESP: - Value = (ULONG_PTR) (KernelStack + 8); - break; - case CS: - Value = KGDT_R0_CODE; - break; - case DS: - Value = KGDT_R0_DATA; - break; - default: +GspGetRegisters(PCHAR Address, PKTRAP_FRAME TrapFrame) +{ + ULONG_PTR Value; + PULONG p; + ULONG i; + PETHREAD Thread; + ULONG_PTR *KernelStack; + + if (NULL == GspDbgThread) + { + Thread = PsGetCurrentThread(); + } + else + { + TrapFrame = GspDbgThread->Tcb.TrapFrame; + Thread = GspDbgThread; + } + + if (Waiting == Thread->Tcb.State) + { + KernelStack = Thread->Tcb.KernelStack; + for (i = 0; i < sizeof(GspRegisters) / sizeof(GspRegisters[0]); i++) + { + switch (i) + { + case EBP: + Value = KernelStack[3]; + break; + case EDI: + Value = KernelStack[4]; + break; + case ESI: + Value = KernelStack[5]; + break; + case EBX: + Value = KernelStack[6]; + break; + case PC: + Value = KernelStack[7]; + break; + case ESP: + Value = (ULONG_PTR)(KernelStack + 8); + break; + case CS: + Value = KGDT_R0_CODE; + break; + case DS: + Value = KGDT_R0_DATA; + break; + default: + Value = 0; + break; + } + + Address = GspMem2Hex((PCHAR)&Value, Address, GspRegisters[i].Size, FALSE); + } + } + else + { + for (i = 0; i < sizeof(GspRegisters) / sizeof(GspRegisters[0]); i++) + { + if (TrapFrame) + { + if (ESP == i) + { + Value = GspGetEspFromTrapFrame(TrapFrame); + } + else + { + p = (PULONG)((ULONG_PTR)TrapFrame + GspRegisters[i].OffsetInTF); + Value = *p; + } + } + else if (i == PC) + { + /* + * This thread has not been sheduled yet so assume it + * is still in PsBeginThreadWithContextInternal(). + */ + Value = (ULONG)KiThreadStartup; + } + else + { Value = 0; - break; - } - Address = GspMem2Hex((PCHAR) &Value, Address, GspRegisters[i].Size, - FALSE); - } - } - else - { - for (i = 0; i < sizeof(GspRegisters) / sizeof(GspRegisters[0]); i++) - { - if (TrapFrame) - { - if (ESP == i) - { - Value = GspGetEspFromTrapFrame(TrapFrame); - } - else - { - p = (PULONG)((ULONG_PTR) TrapFrame + - GspRegisters[i].OffsetInTF); - Value = *p; - } - } - else if (i == PC) - { - /* - * This thread has not been sheduled yet so assume it - * is still in PsBeginThreadWithContextInternal(). - */ - Value = (ULONG)KiThreadStartup; - } - else - { - Value = 0; - } - Address = GspMem2Hex((PCHAR) &Value, Address, - GspRegisters[i].Size, FALSE); - } - } -} - + } + + Address = GspMem2Hex((PCHAR)&Value, Address, GspRegisters[i].Size, FALSE); + } + } +} VOID -GspSetRegistersInTrapFrame(PCHAR Address, - PCONTEXT Context, - PKTRAP_FRAME TrapFrame) -{ - ULONG Value; - PCHAR Buffer; - PULONG p; - ULONG i; - - if (!TrapFrame) - { - return; - } - - Buffer = Address; - for (i = 0; i < NUMREGS; i++) - { - if (GspRegisters[i].SetInContext) - { - p = (PULONG) ((ULONG_PTR) Context + GspRegisters[i].OffsetInContext); - } - else - { - p = (PULONG) ((ULONG_PTR) TrapFrame + GspRegisters[i].OffsetInTF); - } - Value = 0; - Buffer = GspHex2Mem(Buffer, (PCHAR) &Value, GspRegisters[i].Size, FALSE); - *p = Value; - } -} - +GspSetRegistersInTrapFrame(PCHAR Address, PCONTEXT Context, PKTRAP_FRAME TrapFrame) +{ + ULONG Value; + PCHAR Buffer; + PULONG p; + ULONG i; + + if (!TrapFrame) + return; + + Buffer = Address; + for (i = 0; i < NUMREGS; i++) + { + if (GspRegisters[i].SetInContext) + { + p = (PULONG)((ULONG_PTR)Context + GspRegisters[i].OffsetInContext); + } + else + { + p = (PULONG)((ULONG_PTR)TrapFrame + GspRegisters[i].OffsetInTF); + } + + Value = 0; + Buffer = GspHex2Mem(Buffer, (PCHAR)&Value, GspRegisters[i].Size, FALSE); + *p = Value; + } +} VOID -GspSetSingleRegisterInTrapFrame(PCHAR Address, - LONG Number, - PCONTEXT Context, - PKTRAP_FRAME TrapFrame) -{ - ULONG Value; - PULONG p; - - if (!TrapFrame) - { - return; - } - - if (GspRegisters[Number].SetInContext) - { - p = (PULONG) ((ULONG_PTR) Context + GspRegisters[Number].OffsetInContext); - } - else - { - p = (PULONG) ((ULONG_PTR) TrapFrame + GspRegisters[Number].OffsetInTF); - } - Value = 0; - GspHex2Mem(Address, (PCHAR) &Value, GspRegisters[Number].Size, FALSE); - *p = Value; -} - +GspSetSingleRegisterInTrapFrame(PCHAR Address, LONG Number, PCONTEXT Context, PKTRAP_FRAME TrapFrame) +{ + ULONG Value; + PULONG p; + + if (!TrapFrame) + return; + + if (GspRegisters[Number].SetInContext) + { + p = (PULONG)((ULONG_PTR)Context + GspRegisters[Number].OffsetInContext); + } + else + { + p = (PULONG)((ULONG_PTR)TrapFrame + GspRegisters[Number].OffsetInTF); + } + + Value = 0; + GspHex2Mem(Address, (PCHAR)&Value, GspRegisters[Number].Size, FALSE); + *p = Value; +} BOOLEAN -GspFindThread(PCHAR Data, - PETHREAD *Thread) -{ - PETHREAD ThreadInfo = NULL; - - if (strcmp (Data, "-1") == 0) - { - /* All threads */ - ThreadInfo = NULL; - } - else - { - ULONG uThreadId; - HANDLE ThreadId; - PCHAR ptr = &Data[0]; - - GspHex2Long(&ptr, (PLONG) &uThreadId); - ThreadId = (HANDLE)uThreadId; - - if (!NT_SUCCESS(PsLookupThreadByThreadId(ThreadId, &ThreadInfo))) - { - *Thread = NULL; - return FALSE; - } - } - *Thread = ThreadInfo; - return TRUE; -} - +GspFindThread(PCHAR Data, PETHREAD *Thread) +{ + PETHREAD ThreadInfo = NULL; + + if (strcmp(Data, "-1") == 0) + { + /* All threads */ + ThreadInfo = NULL; + } + else + { + ULONG uThreadId; + HANDLE ThreadId; + PCHAR ptr = &Data[0]; + + GspHex2Long(&ptr, (PLONG)&uThreadId); + ThreadId = (HANDLE)uThreadId; + + if (!NT_SUCCESS(PsLookupThreadByThreadId(ThreadId, &ThreadInfo))) + { + *Thread = NULL; + return FALSE; + } + } + + *Thread = ThreadInfo; + return TRUE; +} VOID GspSetThread(PCHAR Request) { - PETHREAD ThreadInfo; - PCHAR ptr = &Request[1]; - - switch (Request[0]) - { - case 'c': /* Run thread */ - if (GspFindThread(ptr, &ThreadInfo)) - { - GspOutBuffer[0] = 'O'; - GspOutBuffer[1] = 'K'; - - if (NULL != GspRunThread) - { - ObDereferenceObject(GspRunThread); - } - GspRunThread = ThreadInfo; - if (NULL != GspRunThread) - { - ObReferenceObject(GspRunThread); - } - } - else - { - GspOutBuffer[0] = 'E'; - } - break; - case 'g': /* Debug thread */ - if (GspFindThread(ptr, &ThreadInfo)) - { - GspOutBuffer[0] = 'O'; - GspOutBuffer[1] = 'K'; - - if (NULL != GspDbgThread) - { - ObDereferenceObject(GspDbgThread); - } - - if (ThreadInfo == PsGetCurrentThread()) - { - GspDbgThread = NULL; - ObDereferenceObject(ThreadInfo); - } - else - { - GspDbgThread = ThreadInfo; - } - } - else - { - GspOutBuffer[0] = 'E'; - } - break; - default: - break; - } -} - + PETHREAD ThreadInfo; + PCHAR ptr = &Request[1]; + + switch (Request[0]) + { + case 'c': /* Run thread */ + if (GspFindThread(ptr, &ThreadInfo)) + { + GspOutBuffer[0] = 'O'; + GspOutBuffer[1] = 'K'; + + if (NULL != GspRunThread) + ObDereferenceObject(GspRunThread); + + GspRunThread = ThreadInfo; + + if (NULL != GspRunThread) + ObReferenceObject(GspRunThread); + } + else + { + GspOutBuffer[0] = 'E'; + } + break; + + case 'g': /* Debug thread */ + if (GspFindThread(ptr, &ThreadInfo)) + { + GspOutBuffer[0] = 'O'; + GspOutBuffer[1] = 'K'; + + if (NULL != GspDbgThread) + ObDereferenceObject(GspDbgThread); + + if (ThreadInfo == PsGetCurrentThread()) + { + GspDbgThread = NULL; + ObDereferenceObject(ThreadInfo); + } + else + { + GspDbgThread = ThreadInfo; + } + } + else + { + GspOutBuffer[0] = 'E'; + } + break; + + default: + break; + } +} VOID GspQuery(PCHAR Request) { - ULONG Value; - - if (strncmp(Request, "C", 1) == 0) - { - PCHAR ptr = &GspOutBuffer[2]; - - /* Get current thread id */ - GspOutBuffer[0] = 'Q'; - GspOutBuffer[1] = 'C'; - if (NULL != GspDbgThread) - { - Value = (ULONG) GspDbgThread->Cid.UniqueThread; - } - else - { - Value = (ULONG) PsGetCurrentThread()->Cid.UniqueThread; - } - GspLong2Hex(&ptr, Value); - } - else if (strncmp(Request, "fThreadInfo", 11) == 0) - { - PEPROCESS Process; - PLIST_ENTRY AThread, AProcess; - PCHAR ptr = &GspOutBuffer[1]; - - /* Get first thread id */ - GspEnumThread = NULL; - AProcess = PsActiveProcessHead.Flink; - while(AProcess != &PsActiveProcessHead) - { - Process = CONTAINING_RECORD(AProcess, EPROCESS, ActiveProcessLinks); - AThread = Process->ThreadListHead.Flink; - if (AThread != &Process->ThreadListHead) - { - GspEnumThread = CONTAINING_RECORD(Process->ThreadListHead.Flink, - ETHREAD, ThreadListEntry); - break; - } - AProcess = AProcess->Flink; - } - if(GspEnumThread != NULL) - { - GspOutBuffer[0] = 'm'; - Value = (ULONG) GspEnumThread->Cid.UniqueThread; - GspLong2Hex(&ptr, Value); - } - else - { - /* FIXME - what to do here? This case should never happen though, there - should always be at least one thread on the system... */ - /* GspOutBuffer[0] = 'l'; */ - } - } - else if (strncmp(Request, "sThreadInfo", 11) == 0) - { - PEPROCESS Process; - PLIST_ENTRY AThread, AProcess; - PCHAR ptr = &GspOutBuffer[1]; - - /* Get next thread id */ - if (GspEnumThread != NULL) - { - /* find the next thread */ - Process = GspEnumThread->ThreadsProcess; - if(GspEnumThread->ThreadListEntry.Flink != &Process->ThreadListHead) - { - GspEnumThread = CONTAINING_RECORD(GspEnumThread->ThreadListEntry.Flink, - ETHREAD, ThreadListEntry); - } - else - { - PETHREAD Thread = NULL; - AProcess = Process->ActiveProcessLinks.Flink; - while(AProcess != &PsActiveProcessHead) + ULONG Value; + + if (strncmp(Request, "C", 1) == 0) + { + PCHAR ptr = &GspOutBuffer[2]; + + /* Get current thread id */ + GspOutBuffer[0] = 'Q'; + GspOutBuffer[1] = 'C'; + + if (NULL != GspDbgThread) + Value = (ULONG)GspDbgThread->Cid.UniqueThread; + else + Value = (ULONG)PsGetCurrentThread()->Cid.UniqueThread; + + GspLong2Hex(&ptr, Value); + } + else if (strncmp(Request, "fThreadInfo", 11) == 0) + { + PEPROCESS Process; + PLIST_ENTRY AThread, AProcess; + PCHAR ptr = &GspOutBuffer[1]; + + /* Get first thread id */ + GspEnumThread = NULL; + AProcess = PsActiveProcessHead.Flink; + while (AProcess != &PsActiveProcessHead) + { + Process = CONTAINING_RECORD(AProcess, EPROCESS, ActiveProcessLinks); + AThread = Process->ThreadListHead.Flink; + if (AThread != &Process->ThreadListHead) + { + GspEnumThread = CONTAINING_RECORD(Process->ThreadListHead.Flink, + ETHREAD, ThreadListEntry); + break; + } + AProcess = AProcess->Flink; + } + if (GspEnumThread != NULL) + { + GspOutBuffer[0] = 'm'; + Value = (ULONG)GspEnumThread->Cid.UniqueThread; + GspLong2Hex(&ptr, Value); + } + else + { + /* FIXME - what to do here? This case should never happen though, there + should always be at least one thread on the system... */ + /* GspOutBuffer[0] = 'l'; */ + } + } + else if (strncmp(Request, "sThreadInfo", 11) == 0) + { + PEPROCESS Process; + PLIST_ENTRY AThread, AProcess; + PCHAR ptr = &GspOutBuffer[1]; + + /* Get next thread id */ + if (GspEnumThread != NULL) + { + /* find the next thread */ + Process = GspEnumThread->ThreadsProcess; + if (GspEnumThread->ThreadListEntry.Flink != &Process->ThreadListHead) + { + GspEnumThread = CONTAINING_RECORD(GspEnumThread->ThreadListEntry.Flink, + ETHREAD, ThreadListEntry); + } + else + { + PETHREAD Thread = NULL; + AProcess = Process->ActiveProcessLinks.Flink; + while (AProcess != &PsActiveProcessHead) { - Process = CONTAINING_RECORD(AProcess, EPROCESS, ActiveProcessLinks); - AThread = Process->ThreadListHead.Flink; - if (AThread != &Process->ThreadListHead) + Process = CONTAINING_RECORD(AProcess, EPROCESS, ActiveProcessLinks); + AThread = Process->ThreadListHead.Flink; + if (AThread != &Process->ThreadListHead) { - Thread = CONTAINING_RECORD(Process->ThreadListHead.Flink, - ETHREAD, ThreadListEntry); - break; + Thread = CONTAINING_RECORD(Process->ThreadListHead.Flink, + ETHREAD, ThreadListEntry); + break; } - AProcess = AProcess->Flink; + AProcess = AProcess->Flink; } - GspEnumThread = Thread; - } - - if (GspEnumThread != NULL) - { - /* return the ID */ - GspOutBuffer[0] = 'm'; - Value = (ULONG) GspEnumThread->Cid.UniqueThread; - GspLong2Hex(&ptr, Value); - } - else - { - GspOutBuffer[0] = 'l'; - } - } - else - { - GspOutBuffer[0] = 'l'; - } - } - else if (strncmp(Request, "ThreadExtraInfo", 15) == 0) - { - PETHREAD ThreadInfo; - - /* Get thread information */ - if (GspFindThread(Request + 16, &ThreadInfo)) - { - char Buffer[64]; - PEPROCESS Proc; - - Proc = (PEPROCESS) ThreadInfo->ThreadsProcess; - - Buffer[0] = '\0'; - if (NULL != Proc ) - { - sprintf(Buffer, "%s [%d:0x%x], ", Proc->ImageFileName, - (int) Proc->UniqueProcessId, - (int) ThreadInfo->Cid.UniqueThread); - } - strcpy(Buffer + strlen(Buffer), - GspThreadStates[ThreadInfo->Tcb.State]); - - ObDereferenceObject(ThreadInfo); - - GspMem2Hex(Buffer, &GspOutBuffer[0], strlen(Buffer), FALSE); - } - } - else if (strncmp(Request, "Supported", 9) == 0) - { - /* tell maximum incoming packet size */ - sprintf(GspOutBuffer, "PacketSize=%u", sizeof(GspInBuffer) - 1); - } - else if (strncmp(Request, "Rcmd,", 5) == 0) - { - ; + GspEnumThread = Thread; + } + + if (GspEnumThread != NULL) + { + /* return the ID */ + GspOutBuffer[0] = 'm'; + Value = (ULONG)GspEnumThread->Cid.UniqueThread; + GspLong2Hex(&ptr, Value); + } + else + { + GspOutBuffer[0] = 'l'; + } + } + else + { + GspOutBuffer[0] = 'l'; + } + } + else if (strncmp(Request, "ThreadExtraInfo", 15) == 0) + { + PETHREAD ThreadInfo; + + /* Get thread information */ + if (GspFindThread(Request + 16, &ThreadInfo)) + { + char Buffer[64]; + PEPROCESS Proc; + + Proc = (PEPROCESS)ThreadInfo->ThreadsProcess; + + Buffer[0] = '\0'; + + if (NULL != Proc) + sprintf(Buffer, "%s [%d:0x%x], ", + Proc->ImageFileName, + (int)Proc->UniqueProcessId, + (int)ThreadInfo->Cid.UniqueThread); + + strcpy(Buffer + strlen(Buffer), GspThreadStates[ThreadInfo->Tcb.State]); + + ObDereferenceObject(ThreadInfo); + + GspMem2Hex(Buffer, &GspOutBuffer[0], strlen(Buffer), FALSE); + } + } + else if (strncmp(Request, "Supported", 9) == 0) + { + /* tell maximum incoming packet size */ + sprintf(GspOutBuffer, "PacketSize=%u", sizeof(GspInBuffer) - 1); + } + else if (strncmp(Request, "Rcmd,", 5) == 0) + { + ; } } VOID GspQueryThreadStatus(PCHAR Request) { - PETHREAD ThreadInfo; - PCHAR ptr = &Request[0]; - - if (GspFindThread(ptr, &ThreadInfo)) - { - ObDereferenceObject(ThreadInfo); - - GspOutBuffer[0] = 'O'; - GspOutBuffer[1] = 'K'; - GspOutBuffer[2] = '\0'; - } - else - { - GspOutBuffer[0] = 'E'; - GspOutBuffer[1] = '\0'; - } -} - -#define DR6_BS 0x00004000 /* Single step */ - -#define DR7_L0 0x00000001 /* Local breakpoint 0 enable */ -#define DR7_G0 0x00000002 /* Global breakpoint 0 enable */ -#define DR7_L1 0x00000004 /* Local breakpoint 1 enable */ -#define DR7_G1 0x00000008 /* Global breakpoint 1 enable */ -#define DR7_L2 0x00000010 /* Local breakpoint 2 enable */ -#define DR7_G2 0x00000020 /* Global breakpoint 2 enable */ -#define DR7_L3 0x00000040 /* Local breakpoint 3 enable */ -#define DR7_G3 0x00000080 /* Global breakpoint 3 enable */ -#define DR7_LE 0x00000100 /* Local exact breakpoint enable (old) */ -#define DR7_GE 0x00000200 /* Global exact breakpoint enable (old) */ -#define DR7_GD 0x00002000 /* General detect enable */ -#define DR7_TYPE0_MASK 0x00030000 /* Breakpoint 0 condition */ -#define DR7_LEN0_MASK 0x000c0000 /* Breakpoint 0 length */ -#define DR7_TYPE1_MASK 0x00300000 /* Breakpoint 1 condition */ -#define DR7_LEN1_MASK 0x00c00000 /* Breakpoint 1 length */ -#define DR7_TYPE2_MASK 0x03000000 /* Breakpoint 2 condition */ -#define DR7_LEN2_MASK 0x0c000000 /* Breakpoint 2 length */ -#define DR7_TYPE3_MASK 0x30000000 /* Breakpoint 3 condition */ -#define DR7_LEN3_MASK 0xc0000000 /* Breakpoint 3 length */ + PETHREAD ThreadInfo; + PCHAR ptr = &Request[0]; + + if (GspFindThread(ptr, &ThreadInfo)) + { + ObDereferenceObject(ThreadInfo); + + GspOutBuffer[0] = 'O'; + GspOutBuffer[1] = 'K'; + GspOutBuffer[2] = '\0'; + } + else + { + GspOutBuffer[0] = 'E'; + GspOutBuffer[1] = '\0'; + } +} + +#define DR6_BS 0x00004000 /* Single step */ + +#define DR7_L0 0x00000001 /* Local breakpoint 0 enable */ +#define DR7_G0 0x00000002 /* Global breakpoint 0 enable */ +#define DR7_L1 0x00000004 /* Local breakpoint 1 enable */ +#define DR7_G1 0x00000008 /* Global breakpoint 1 enable */ +#define DR7_L2 0x00000010 /* Local breakpoint 2 enable */ +#define DR7_G2 0x00000020 /* Global breakpoint 2 enable */ +#define DR7_L3 0x00000040 /* Local breakpoint 3 enable */ +#define DR7_G3 0x00000080 /* Global breakpoint 3 enable */ +#define DR7_LE 0x00000100 /* Local exact breakpoint enable (old) */ +#define DR7_GE 0x00000200 /* Global exact breakpoint enable (old) */ +#define DR7_GD 0x00002000 /* General detect enable */ +#define DR7_TYPE0_MASK 0x00030000 /* Breakpoint 0 condition */ +#define DR7_LEN0_MASK 0x000c0000 /* Breakpoint 0 length */ +#define DR7_TYPE1_MASK 0x00300000 /* Breakpoint 1 condition */ +#define DR7_LEN1_MASK 0x00c00000 /* Breakpoint 1 length */ +#define DR7_TYPE2_MASK 0x03000000 /* Breakpoint 2 condition */ +#define DR7_LEN2_MASK 0x0c000000 /* Breakpoint 2 length */ +#define DR7_TYPE3_MASK 0x30000000 /* Breakpoint 3 condition */ +#define DR7_LEN3_MASK 0xc0000000 /* Breakpoint 3 length */ #define DR7_GLOBAL_ENABLE(Bp) (2 << (2 * (Bp))) #define DR7_TYPE(Bp, Type) ((Type) << (16 + 4 * (Bp))) #define DR7_LEN(Bp, Len) ((Len) << (18 + 4 * (Bp))) @@ -897,9 +848,9 @@ typedef struct _GSPHWBREAKPOINT { - ULONG Type; - ULONG_PTR Address; - ULONG Length; + ULONG Type; + ULONG_PTR Address; + ULONG Length; } GSPHWBREAKPOINT; #define MAX_HW_BREAKPOINTS 4 @@ -908,9 +859,9 @@ typedef struct _GSPSWBREAKPOINT { - ULONG_PTR Address; - CHAR PrevContent; - BOOLEAN Active; + ULONG_PTR Address; + CHAR PrevContent; + BOOLEAN Active; } GSPSWBREAKPOINT; #define MAX_SW_BREAKPOINTS 64 @@ -920,280 +871,269 @@ static void GspSetHwBreakpoint(ULONG Type, ULONG_PTR Address, ULONG Length) { - DPRINT("GspSetHwBreakpoint(%lu, 0x%p, %lu)\n", Type, Address, Length); - - if (GDB_ZTYPE_READ_WATCHPOINT == Type) - { - DPRINT1("Read watchpoint not supported\n"); - strcpy(GspOutBuffer, "E22"); - } - else if (GDB_ZTYPE_HARDWARE_BREAKPOINT == Type && 1 != Length) - { - DPRINT1("Invalid length %lu for hardware breakpoint\n", Length); - strcpy(GspOutBuffer, "E22"); - } - else if (1 != Length && 2 != Length && 4 != Length) - { - DPRINT1("Invalid length %lu for GDB Z type %lu\n", Length, Type); - strcpy(GspOutBuffer, "E22"); - } - else if (0 != (Address & (Length - 1))) - { - DPRINT1("Invalid alignment for address 0x%p and length %d\n", - Address, Length); - strcpy(GspOutBuffer, "E22"); - } - else if (MAX_HW_BREAKPOINTS == GspHwBreakpointCount) - { - DPRINT1("Trying to set too many hardware breakpoints\n"); - strcpy(GspOutBuffer, "E22"); - } - else - { - DPRINT("Stored at index %u\n", GspHwBreakpointCount); - GspHwBreakpoints[GspHwBreakpointCount].Type = Type; - GspHwBreakpoints[GspHwBreakpointCount].Address = Address; - GspHwBreakpoints[GspHwBreakpointCount].Length = Length; - GspHwBreakpointCount++; - strcpy(GspOutBuffer, "OK"); + DPRINT("GspSetHwBreakpoint(%lu, 0x%p, %lu)\n", Type, Address, Length); + + if (GDB_ZTYPE_READ_WATCHPOINT == Type) + { + DPRINT1("Read watchpoint not supported\n"); + strcpy(GspOutBuffer, "E22"); + } + else if (GDB_ZTYPE_HARDWARE_BREAKPOINT == Type && 1 != Length) + { + DPRINT1("Invalid length %lu for hardware breakpoint\n", Length); + strcpy(GspOutBuffer, "E22"); + } + else if (1 != Length && 2 != Length && 4 != Length) + { + DPRINT1("Invalid length %lu for GDB Z type %lu\n", Length, Type); + strcpy(GspOutBuffer, "E22"); + } + else if (0 != (Address & (Length - 1))) + { + DPRINT1("Invalid alignment for address 0x%p and length %d\n", Address, Length); + strcpy(GspOutBuffer, "E22"); + } + else if (MAX_HW_BREAKPOINTS == GspHwBreakpointCount) + { + DPRINT1("Trying to set too many hardware breakpoints\n"); + strcpy(GspOutBuffer, "E22"); + } + else + { + DPRINT("Stored at index %u\n", GspHwBreakpointCount); + GspHwBreakpoints[GspHwBreakpointCount].Type = Type; + GspHwBreakpoints[GspHwBreakpointCount].Address = Address; + GspHwBreakpoints[GspHwBreakpointCount].Length = Length; + GspHwBreakpointCount++; + strcpy(GspOutBuffer, "OK"); } } static void GspRemoveHwBreakpoint(ULONG Type, ULONG_PTR Address, ULONG Length) { - unsigned Index; - - DPRINT("GspRemoveHwBreakpoint(%lu, 0x%p, %lu)\n", Type, Address, Length); - for (Index = 0; Index < GspHwBreakpointCount; Index++) - { - if (GspHwBreakpoints[Index].Type == Type && - GspHwBreakpoints[Index].Address == Address && - GspHwBreakpoints[Index].Length == Length) - { - DPRINT("Found match at index %u\n", Index); - if (Index + 1 < GspHwBreakpointCount) - { - memmove(GspHwBreakpoints + Index, - GspHwBreakpoints + (Index + 1), - (GspHwBreakpointCount - Index - 1) * - sizeof(GSPHWBREAKPOINT)); - } - GspHwBreakpointCount--; - strcpy(GspOutBuffer, "OK"); - return; - } - } - - DPRINT1("Not found\n"); - strcpy(GspOutBuffer, "E22"); + unsigned Index; + + DPRINT("GspRemoveHwBreakpoint(%lu, 0x%p, %lu)\n", Type, Address, Length); + for (Index = 0; Index < GspHwBreakpointCount; Index++) + { + if (GspHwBreakpoints[Index].Type == Type && + GspHwBreakpoints[Index].Address == Address && + GspHwBreakpoints[Index].Length == Length) + { + DPRINT("Found match at index %u\n", Index); + if (Index + 1 < GspHwBreakpointCount) + memmove(GspHwBreakpoints + Index, + GspHwBreakpoints + (Index + 1), + (GspHwBreakpointCount - Index - 1) * sizeof(GSPHWBREAKPOINT)); + + GspHwBreakpointCount--; + strcpy(GspOutBuffer, "OK"); + return; + } + } + + DPRINT1("Not found\n"); + strcpy(GspOutBuffer, "E22"); } static BOOLEAN GspFindSwBreakpoint(ULONG_PTR Address, PULONG PIndex) { - ULONG Index; - - for (Index = 0; Index < GspSwBreakpointCount; Index++) - if (GspSwBreakpoints[Index].Address == Address) - { - if (PIndex) *PIndex = Index; - return TRUE; - } - - return FALSE; + ULONG Index; + + for (Index = 0; Index < GspSwBreakpointCount; Index++) + if (GspSwBreakpoints[Index].Address == Address) + { + if (PIndex) + *PIndex = Index; + return TRUE; + } + + return FALSE; } static void GspSetSwBreakpoint(ULONG_PTR Address) { - DPRINT("GspSetSwBreakpoint(0x%p)\n", Address); - - if (MAX_SW_BREAKPOINTS == GspSwBreakpointCount) - { - DPRINT1("Trying to set too many software breakpoints\n"); - strcpy(GspOutBuffer, "E22"); - return; - } - - if (GspFindSwBreakpoint(Address, NULL)) - { - strcpy(GspOutBuffer, "E22"); - return; - } - - DPRINT("Stored at index %u\n", GspSwBreakpointCount); - GspSwBreakpoints[GspSwBreakpointCount].Address = Address; - GspSwBreakpoints[GspSwBreakpointCount].Active = FALSE; - GspSwBreakpointCount++; - strcpy(GspOutBuffer, "OK"); + DPRINT("GspSetSwBreakpoint(0x%p)\n", Address); + + if (MAX_SW_BREAKPOINTS == GspSwBreakpointCount) + { + DPRINT1("Trying to set too many software breakpoints\n"); + strcpy(GspOutBuffer, "E22"); + return; + } + + if (GspFindSwBreakpoint(Address, NULL)) + { + strcpy(GspOutBuffer, "E22"); + return; + } + + DPRINT("Stored at index %u\n", GspSwBreakpointCount); + GspSwBreakpoints[GspSwBreakpointCount].Address = Address; + GspSwBreakpoints[GspSwBreakpointCount].Active = FALSE; + GspSwBreakpointCount++; + strcpy(GspOutBuffer, "OK"); } static void GspRemoveSwBreakpoint(ULONG_PTR Address) { - ULONG Index; - - DPRINT("GspRemoveSwBreakpoint(0x%p)\n", Address); - - if (GspFindSwBreakpoint(Address, &Index)) - { - DPRINT("Found match at index %u\n", Index); - ASSERT(! GspSwBreakpoints[Index].Active); - - if (Index + 1 < GspSwBreakpointCount) - { - memmove(GspSwBreakpoints + Index, - GspSwBreakpoints + (Index + 1), - (GspSwBreakpointCount - Index - 1) * - sizeof(GSPSWBREAKPOINT)); - } - GspSwBreakpointCount--; - strcpy(GspOutBuffer, "OK"); - return; - } - - DPRINT1("Not found\n"); - strcpy(GspOutBuffer, "E22"); + ULONG Index; + + DPRINT("GspRemoveSwBreakpoint(0x%p)\n", Address); + + if (GspFindSwBreakpoint(Address, &Index)) + { + DPRINT("Found match at index %u\n", Index); + ASSERT(!GspSwBreakpoints[Index].Active); + + if (Index + 1 < GspSwBreakpointCount) + memmove(GspSwBreakpoints + Index, + GspSwBreakpoints + (Index + 1), + (GspSwBreakpointCount - Index - 1) * sizeof(GSPSWBREAKPOINT)); + + GspSwBreakpointCount--; + strcpy(GspOutBuffer, "OK"); + return; + } + + DPRINT1("Not found\n"); + strcpy(GspOutBuffer, "E22"); } static void -GspLoadHwBreakpoint(PKTRAP_FRAME TrapFrame, - unsigned BpIndex, - ULONG_PTR Address, - ULONG Length, - ULONG Type) -{ - DPRINT("GspLoadHwBreakpoint(0x%p, %d, 0x%p, %d)\n", TrapFrame, BpIndex, - Address, Type); - - /* Set the DR7_Gx bit to globally enable the breakpoint */ - TrapFrame->Dr7 |= DR7_GLOBAL_ENABLE(BpIndex) | - DR7_LEN(BpIndex, Length) | - DR7_TYPE(BpIndex, Type); - - switch (BpIndex) - { - case 0: - DPRINT("Setting DR0 to 0x%p\n", Address); - TrapFrame->Dr0 = Address; - break; - - case 1: - DPRINT("Setting DR1 to 0x%p\n", Address); - TrapFrame->Dr1 = Address; - break; - - case 2: - DPRINT("Setting DR2 to 0x%p\n", Address); - TrapFrame->Dr2 = Address; - break; - - case 3: - DPRINT("Setting DR3 to 0x%p\n", Address); - TrapFrame->Dr3 = Address; - break; +GspLoadHwBreakpoint(PKTRAP_FRAME TrapFrame, unsigned BpIndex, + ULONG_PTR Address, ULONG Length, ULONG Type) +{ + DPRINT("GspLoadHwBreakpoint(0x%p, %d, 0x%p, %d)\n", + TrapFrame, BpIndex, Address, Type); + + /* Set the DR7_Gx bit to globally enable the breakpoint */ + TrapFrame->Dr7 |= DR7_GLOBAL_ENABLE(BpIndex) | + DR7_LEN(BpIndex, Length) | + DR7_TYPE(BpIndex, Type); + + switch (BpIndex) + { + case 0: + DPRINT("Setting DR0 to 0x%p\n", Address); + TrapFrame->Dr0 = Address; + break; + + case 1: + DPRINT("Setting DR1 to 0x%p\n", Address); + TrapFrame->Dr1 = Address; + break; + + case 2: + DPRINT("Setting DR2 to 0x%p\n", Address); + TrapFrame->Dr2 = Address; + break; + + case 3: + DPRINT("Setting DR3 to 0x%p\n", Address); + TrapFrame->Dr3 = Address; + break; } } static void GspLoadSwBreakpoint(ULONG Index) { - GspMemoryError = FALSE; - GspSwBreakpoints[Index].PrevContent = GspReadMemSafe((PCHAR) GspSwBreakpoints[Index].Address); - if (! GspMemoryError) - { - GspWriteMemSafe((PCHAR) GspSwBreakpoints[Index].Address, I386_OPCODE_INT3); - } - GspSwBreakpoints[Index].Active = ! GspMemoryError; - if (GspMemoryError) - { - DPRINT1("Failed to set software breakpoint at 0x%p\n", - GspSwBreakpoints[Index].Address); - } - else - { - DPRINT("Successfully set software breakpoint at 0x%p\n", - GspSwBreakpoints[Index].Address); - } + GspMemoryError = FALSE; + + GspSwBreakpoints[Index].PrevContent = GspReadMemSafe((PCHAR)GspSwBreakpoints[Index].Address); + + if (!GspMemoryError) + GspWriteMemSafe((PCHAR)GspSwBreakpoints[Index].Address, I386_OPCODE_INT3); + + GspSwBreakpoints[Index].Active = !GspMemoryError; + + if (GspMemoryError) + DPRINT1("Failed to set software breakpoint at 0x%p\n", GspSwBreakpoints[Index].Address); + else + DPRINT("Successfully set software breakpoint at 0x%p\n", GspSwBreakpoints[Index].Address); } static void GspLoadBreakpoints(PKTRAP_FRAME TrapFrame) { - unsigned Index; - ULONG i386Type; - - DPRINT("GspLoadBreakpoints\n"); - DPRINT("DR7 on entry: 0x%08x\n", TrapFrame->Dr7); - - /* Remove all breakpoints */ - TrapFrame->Dr7 &= ~(DR7_L0 | DR7_L1 | DR7_L2 | DR7_L3 | - DR7_G0 | DR7_G1 | DR7_G2 | DR7_G3 | - DR7_TYPE0_MASK | DR7_LEN0_MASK | - DR7_TYPE1_MASK | DR7_LEN1_MASK | - DR7_TYPE2_MASK | DR7_LEN2_MASK | - DR7_TYPE3_MASK | DR7_LEN3_MASK); - - for (Index = 0; Index < GspHwBreakpointCount; Index++) - { - switch(GspHwBreakpoints[Index].Type) - { - case GDB_ZTYPE_HARDWARE_BREAKPOINT: - i386Type = I386_BP_TYPE_EXECUTE; - break; - case GDB_ZTYPE_WRITE_WATCHPOINT: - i386Type = I386_BP_TYPE_DATA_WRITE; - break; - case GDB_ZTYPE_ACCESS_WATCHPOINT: - i386Type = I386_BP_TYPE_DATA_READWRITE; - break; - default: - ASSERT(FALSE); - i386Type = I386_BP_TYPE_EXECUTE; - break; - } - - GspLoadHwBreakpoint(TrapFrame, Index, GspHwBreakpoints[Index].Address, - GspHwBreakpoints[Index].Length - 1, i386Type); - } - - for (Index = 0; Index < GspSwBreakpointCount; Index++) - { - DPRINT("Using real software breakpoint\n"); - GspLoadSwBreakpoint(Index); - } - - DPRINT("Final DR7 value 0x%08x\n", TrapFrame->Dr7); + unsigned Index; + ULONG i386Type; + + DPRINT("GspLoadBreakpoints\n"); + DPRINT("DR7 on entry: 0x%08x\n", TrapFrame->Dr7); + + /* Remove all breakpoints */ + TrapFrame->Dr7 &= ~(DR7_L0 | DR7_L1 | DR7_L2 | DR7_L3 | + DR7_G0 | DR7_G1 | DR7_G2 | DR7_G3 | + DR7_TYPE0_MASK | DR7_LEN0_MASK | + DR7_TYPE1_MASK | DR7_LEN1_MASK | + DR7_TYPE2_MASK | DR7_LEN2_MASK | + DR7_TYPE3_MASK | DR7_LEN3_MASK); + + for (Index = 0; Index < GspHwBreakpointCount; Index++) + { + switch (GspHwBreakpoints[Index].Type) + { + case GDB_ZTYPE_HARDWARE_BREAKPOINT: + i386Type = I386_BP_TYPE_EXECUTE; + break; + case GDB_ZTYPE_WRITE_WATCHPOINT: + i386Type = I386_BP_TYPE_DATA_WRITE; + break; + case GDB_ZTYPE_ACCESS_WATCHPOINT: + i386Type = I386_BP_TYPE_DATA_READWRITE; + break; + default: + ASSERT(FALSE); + i386Type = I386_BP_TYPE_EXECUTE; + break; + } + + GspLoadHwBreakpoint(TrapFrame, Index, GspHwBreakpoints[Index].Address, + GspHwBreakpoints[Index].Length - 1, i386Type); + } + + for (Index = 0; Index < GspSwBreakpointCount; Index++) + { + DPRINT("Using real software breakpoint\n"); + GspLoadSwBreakpoint(Index); + } + + DPRINT("Final DR7 value 0x%08x\n", TrapFrame->Dr7); } static void GspUnloadBreakpoints(void) { - unsigned Index; - - DPRINT("GspUnloadBreakpoints\n"); - - /* Disable hardware debugging while we are inside the stub */ - Ke386SetDr7(0); - - for (Index = 0; Index < GspSwBreakpointCount; Index++) - { - if (GspSwBreakpoints[Index].Active) - { - GspMemoryError = FALSE; - GspWriteMemSafe((PCHAR) GspSwBreakpoints[Index].Address, - GspSwBreakpoints[Index].PrevContent); - GspSwBreakpoints[Index].Active = FALSE; - if (GspMemoryError) - { - DPRINT1("Failed to remove software breakpoint from 0x%p\n", - GspSwBreakpoints[Index].Address); - } - else - { - DPRINT("Successfully removed software breakpoint from 0x%p\n", - GspSwBreakpoints[Index].Address); + unsigned Index; + + DPRINT("GspUnloadBreakpoints\n"); + + /* Disable hardware debugging while we are inside the stub */ + Ke386SetDr7(0); + + for (Index = 0; Index < GspSwBreakpointCount; Index++) + { + if (GspSwBreakpoints[Index].Active) + { + GspMemoryError = FALSE; + GspWriteMemSafe((PCHAR)GspSwBreakpoints[Index].Address, + GspSwBreakpoints[Index].PrevContent); + GspSwBreakpoints[Index].Active = FALSE; + if (GspMemoryError) + { + DPRINT1("Failed to remove software breakpoint from 0x%p\n", + GspSwBreakpoints[Index].Address); + } + else + { + DPRINT("Successfully removed software breakpoint from 0x%p\n", + GspSwBreakpoints[Index].Address); } } } @@ -1206,57 +1146,56 @@ ULONG SigVal; LONG Esp; - switch (ExceptionCode) - { - case STATUS_INTEGER_DIVIDE_BY_ZERO: - SigVal = 8; /* divide by zero */ - break; - case STATUS_SINGLE_STEP: - case STATUS_BREAKPOINT: - SigVal = 5; /* breakpoint */ - break; - case STATUS_INTEGER_OVERFLOW: - case STATUS_ARRAY_BOUNDS_EXCEEDED: - SigVal = 16; /* bound instruction */ - break; - case STATUS_ILLEGAL_INSTRUCTION: - SigVal = 4; /* Invalid opcode */ - break; - case STATUS_STACK_OVERFLOW: - case STATUS_DATATYPE_MISALIGNMENT: - case STATUS_ACCESS_VIOLATION: - SigVal = 11; /* access violation */ - break; - default: - SigVal = 7; /* "software generated" */ - } - - ptr = GspOutBuffer; - - *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ - *ptr++ = HexChars[(SigVal >> 4) & 0xf]; - *ptr++ = HexChars[SigVal & 0xf]; - - *ptr++ = HexChars[ESP]; - *ptr++ = ':'; - - Esp = GspGetEspFromTrapFrame(TrapFrame); /* SP */ - ptr = GspMem2Hex((PCHAR) &Esp, ptr, 4, 0); - *ptr++ = ';'; - - *ptr++ = HexChars[EBP]; - *ptr++ = ':'; - ptr = GspMem2Hex((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ - *ptr++ = ';'; - - *ptr++ = HexChars[PC]; - *ptr++ = ':'; - ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ - *ptr++ = ';'; - - *ptr = '\0'; -} - + switch (ExceptionCode) + { + case STATUS_INTEGER_DIVIDE_BY_ZERO: + SigVal = 8; /* divide by zero */ + break; + case STATUS_SINGLE_STEP: + case STATUS_BREAKPOINT: + SigVal = 5; /* breakpoint */ + break; + case STATUS_INTEGER_OVERFLOW: + case STATUS_ARRAY_BOUNDS_EXCEEDED: + SigVal = 16; /* bound instruction */ + break; + case STATUS_ILLEGAL_INSTRUCTION: + SigVal = 4; /* Invalid opcode */ + break; + case STATUS_STACK_OVERFLOW: + case STATUS_DATATYPE_MISALIGNMENT: + case STATUS_ACCESS_VIOLATION: + SigVal = 11; /* access violation */ + break; + default: + SigVal = 7; /* "software generated" */ + } + + ptr = GspOutBuffer; + + *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ + *ptr++ = HexChars[(SigVal >> 4) & 0xf]; + *ptr++ = HexChars[SigVal & 0xf]; + + *ptr++ = HexChars[ESP]; + *ptr++ = ':'; + + Esp = GspGetEspFromTrapFrame(TrapFrame); /* SP */ + ptr = GspMem2Hex((PCHAR)&Esp, ptr, 4, 0); + *ptr++ = ';'; + + *ptr++ = HexChars[EBP]; + *ptr++ = ':'; + ptr = GspMem2Hex((PCHAR)&TrapFrame->Ebp, ptr, 4, 0); /* FP */ + *ptr++ = ';'; + + *ptr++ = HexChars[PC]; + *ptr++ = ':'; + ptr = GspMem2Hex((PCHAR)&TrapFrame->Eip, ptr, 4, 0); /* PC */ + *ptr++ = ';'; + + *ptr = '\0'; +} /* * This function does all command procesing for interfacing to GDB. @@ -1277,224 +1216,219 @@ /* FIXME: Stop on other CPUs too */ DPRINT("Thread %p entering stub\n", PsGetCurrentThread()); - ExceptionCode = (NTSTATUS) ExceptionRecord->ExceptionCode; - - /* Can only debug 1 thread at a time... */ - ExAcquireFastMutex(&GspLock); - DPRINT("Thread %p acquired mutex\n", PsGetCurrentThread()); - - GspUnloadBreakpoints(); - - /* Make sure we're debugging the current thread. */ - if (NULL != GspDbgThread) - { - DPRINT1("Internal error: entering stub with non-NULL GspDbgThread\n"); - ObDereferenceObject(GspDbgThread); - GspDbgThread = NULL; - } - - if (GdbAttached) - { - GspStopReply(ExceptionCode, TrapFrame); - GspPutPacket(GspOutBuffer); - // DbgPrint(">>> (%s) >>>\n", GspOutBuffer); - } - else - { - GdbAttached = TRUE; - } - - while (TRUE) - { - /* Zero the buffer now so we don't have to worry about the terminating zero character */ - memset(GspOutBuffer, 0, sizeof(GspOutBuffer)); - ptr = GspGetPacket(); - // DbgPrint("<<< (%s) <<<\n", ptr); - - switch(*ptr++) - { + ExceptionCode = (NTSTATUS)ExceptionRecord->ExceptionCode; + + /* Can only debug 1 thread at a time... */ + ExAcquireFastMutex(&GspLock); + DPRINT("Thread %p acquired mutex\n", PsGetCurrentThread()); + + GspUnloadBreakpoints(); + + /* Make sure we're debugging the current thread. */ + if (NULL != GspDbgThread) + { + DPRINT1("Internal error: entering stub with non-NULL GspDbgThread\n"); + ObDereferenceObject(GspDbgThread); + GspDbgThread = NULL; + } + + if (GdbAttached) + { + GspStopReply(ExceptionCode, TrapFrame); + GspPutPacket(GspOutBuffer); + // DbgPrint(">>> (%s) >>>\n", GspOutBuffer); + } + else + { + GdbAttached = TRUE; + } + + while (TRUE) + { + /* Zero the buffer now so we don't have to worry about the terminating zero character */ + memset(GspOutBuffer, 0, sizeof(GspOutBuffer)); + ptr = GspGetPacket(); + // DbgPrint("<<< (%s) <<<\n", ptr); + + switch (*ptr++) + { case '?': - /* a little hack to send more complete status information */ - GspStopReply(ExceptionCode, TrapFrame); - break; + /* a little hack to send more complete status information */ + GspStopReply(ExceptionCode, TrapFrame); + break; + case 'd': - GspRemoteDebug = !GspRemoteDebug; /* toggle debug flag */ - break; + GspRemoteDebug = !GspRemoteDebug; /* toggle debug flag */ + break; + case 'g': /* return the value of the CPU Registers */ - GspGetRegisters(GspOutBuffer, TrapFrame); - break; + GspGetRegisters(GspOutBuffer, TrapFrame); + break; + case 'G': /* set the value of the CPU Registers - return OK */ - if (NULL != GspDbgThread) + if (NULL != GspDbgThread) + GspSetRegistersInTrapFrame(ptr, Context, GspDbgThread->Tcb.TrapFrame); + else + GspSetRegistersInTrapFrame(ptr, Context, TrapFrame); + + strcpy(GspOutBuffer, "OK"); + break; + + case 'P': /* set the value of a single CPU register - return OK */ + { + LONG Register; + + if ((GspHex2Long(&ptr, &Register)) && (*ptr++ == '=')) { - GspSetRegistersInTrapFrame(ptr, Context, GspDbgThread->Tcb.TrapFrame); - } - else - { - GspSetRegistersInTrapFrame(ptr, Context, TrapFrame); - } - strcpy(GspOutBuffer, "OK"); - break; - case 'P': /* set the value of a single CPU register - return OK */ - { - LONG Register; - - if ((GspHex2Long(&ptr, &Register)) && (*ptr++ == '=')) - { if ((Register >= 0) && (Register < NUMREGS)) - { + { if (GspDbgThread) - { - GspSetSingleRegisterInTrapFrame(ptr, Register, - Context, + { + GspSetSingleRegisterInTrapFrame(ptr, Register, Context, GspDbgThread->Tcb.TrapFrame); - } + } else - { - GspSetSingleRegisterInTrapFrame(ptr, Register, - Context, TrapFrame); - } + { + GspSetSingleRegisterInTrapFrame(ptr, Register, Context, TrapFrame); + } strcpy(GspOutBuffer, "OK"); break; - } - } + } + } strcpy(GspOutBuffer, "E01"); break; - } + } /* mAA..AA,LLLL Read LLLL bytes at address AA..AA */ case 'm': - /* TRY TO READ %x,%x. IF SUCCEED, SET PTR = 0 */ - if (GspHex2Long(&ptr, &Address) && - *(ptr++) == ',' && - GspHex2Long(&ptr, &Length)) + { + /* TRY TO READ %x,%x. IF SUCCEED, SET PTR = 0 */ + if (GspHex2Long(&ptr, &Address) && *(ptr++) == ',' && GspHex2Long(&ptr, &Length)) { - PEPROCESS DbgProcess = NULL; - - ptr = NULL; - if (NULL != GspDbgThread && - PsGetCurrentProcess() != GspDbgThread->ThreadsProcess) + PEPROCESS DbgProcess = NULL; + + ptr = NULL; + if (NULL != GspDbgThread && + PsGetCurrentProcess() != GspDbgThread->ThreadsProcess) { - DbgProcess = GspDbgThread->ThreadsProcess; - KeAttachProcess(&DbgProcess->Pcb); + DbgProcess = GspDbgThread->ThreadsProcess; + KeAttachProcess(&DbgProcess->Pcb); } - GspMemoryError = FALSE; - GspMem2Hex((PCHAR) Address, GspOutBuffer, Length, 1); - if (NULL != DbgProcess) + + GspMemoryError = FALSE; + GspMem2Hex((PCHAR)Address, GspOutBuffer, Length, 1); + + if (NULL != DbgProcess) + KeDetachProcess(); + + if (GspMemoryError) { - KeDetachProcess(); - } - if (GspMemoryError) - { - strcpy(GspOutBuffer, "E03"); - DPRINT1("Fault during memory read\n"); + strcpy(GspOutBuffer, "E03"); + DPRINT1("Fault during memory read\n"); } } - if (NULL != ptr) - { - strcpy(GspOutBuffer, "E01"); - } - break; + if (NULL != ptr) + strcpy(GspOutBuffer, "E01"); + + break; + } /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK */ case 'M': - /* TRY TO READ '%x,%x:'. IF SUCCEED, SET PTR = 0 */ - if (GspHex2Long(&ptr, &Address)) + { + /* TRY TO READ '%x,%x:'. IF SUCCEED, SET PTR = 0 */ + if (GspHex2Long(&ptr, &Address)) { - if (*(ptr++) == ',' && - GspHex2Long(&ptr, &Length) && - *(ptr++) == ':') + if (*(ptr++) == ',' && GspHex2Long(&ptr, &Length) && *(ptr++) == ':') { - PEPROCESS DbgProcess = NULL; - - if (NULL != GspDbgThread && - PsGetCurrentProcess() != GspDbgThread->ThreadsProcess) + PEPROCESS DbgProcess = NULL; + + if (NULL != GspDbgThread && + PsGetCurrentProcess() != GspDbgThread->ThreadsProcess) { - DbgProcess = GspDbgThread->ThreadsProcess; - KeAttachProcess(&DbgProcess->Pcb); + DbgProcess = GspDbgThread->ThreadsProcess; + KeAttachProcess(&DbgProcess->Pcb); } - GspMemoryError = FALSE; - GspHex2Mem(ptr, (PCHAR) Address, Length, TRUE); - if (NULL != DbgProcess) + GspMemoryError = FALSE; + GspHex2Mem(ptr, (PCHAR)Address, Length, TRUE); + if (NULL != DbgProcess) + KeDetachProcess(); + + if (GspMemoryError) { - KeDetachProcess(); + strcpy(GspOutBuffer, "E03"); + DPRINT1("Fault during memory write\n"); } - if (GspMemoryError) + else { - strcpy(GspOutBuffer, "E03"); - DPRINT1("Fault during memory write\n"); + strcpy(GspOutBuffer, "OK"); } - else - { - strcpy(GspOutBuffer, "OK"); - } - ptr = NULL; + ptr = NULL; } } - if (NULL != ptr) - { - strcpy(GspOutBuffer, "E02"); - } - break; - - /* cAA..AA Continue at address AA..AA(optional) */ - /* sAA..AA Step one instruction from AA..AA(optional) */ + if (NULL != ptr) + strcpy(GspOutBuffer, "E02"); + + break; + } + + /* cAA..AA Continue at address AA..AA */ + /* sAA..AA Step one instruction from AA..AA */ case 's': - Stepping = TRUE; + Stepping = TRUE; case 'c': - { + { ULONG BreakpointNumber; ULONG Dr6; /* try to read optional parameter, pc changed if param */ - if (GspHex2Long (&ptr, &Address)) - { + if (GspHex2Long(&ptr, &Address)) + { Context->Eip = Address; - } + } else if (ExceptionCode == STATUS_BREAKPOINT) - { - if (GspReadMemSafe((PCHAR) Context->Eip) == (CHAR) I386_OPCODE_INT3) - { + { + if (GspReadMemSafe((PCHAR)Context->Eip) == (CHAR)I386_OPCODE_INT3) Context->Eip++; - } - } + } /* clear the trace bit */ Context->EFlags &= ~EFLAGS_TF; /* set the trace bit if we're Stepping */ if (Stepping) - { Context->EFlags |= EFLAGS_TF; - } Dr6 = Ke386GetDr6(); if (!(Dr6 & DR6_BS)) - { - for (BreakpointNumber = 0; BreakpointNumber < MAX_HW_BREAKPOINTS; ++BreakpointNumber) - { + { + for (BreakpointNumber = 0; + BreakpointNumber < MAX_HW_BREAKPOINTS; + BreakpointNumber++) + { if (Dr6 & (1 << BreakpointNumber)) - { + { if (GspHwBreakpoints[BreakpointNumber].Type == I386_BP_TYPE_EXECUTE) - { + { /* Set restore flag */ Context->EFlags |= EFLAGS_RF; break; - } - } - } - } + } + } + } + } GspLoadBreakpoints(TrapFrame); Ke386SetDr6(0); if (NULL != GspDbgThread) - { + { ObDereferenceObject(GspDbgThread); GspDbgThread = NULL; - } + } DPRINT("Thread %p releasing mutex\n", PsGetCurrentThread()); ExReleaseFastMutex(&GspLock); @@ -1502,31 +1436,29 @@ if (ExceptionCode == STATUS_BREAKPOINT || ExceptionCode == STATUS_SINGLE_STEP) - { return kdContinue; - } return kdHandleException; - } - - case 'k': /* kill the program */ - strcpy(GspOutBuffer, "OK"); - break; + } + + case 'k': /* kill the program */ + strcpy(GspOutBuffer, "OK"); + break; case 'H': /* Set thread */ - GspSetThread(ptr); - break; + GspSetThread(ptr); + break; case 'q': /* Query */ - GspQuery(ptr); - break; + GspQuery(ptr); + break; case 'T': /* Query thread status */ - GspQueryThreadStatus(ptr); - break; + GspQueryThreadStatus(ptr); + break; case 'Z': - { + { LONG Type; LONG Address; LONG Length; @@ -1536,19 +1468,17 @@ GspHex2Long(&ptr, &Address); ptr++; GspHex2Long(&ptr, &Length); + if (0 == Type) - { - GspSetSwBreakpoint((ULONG_PTR) Address); - } + GspSetSwBreakpoint((ULONG_PTR)Address); else - { - GspSetHwBreakpoint(Type, (ULONG_PTR) Address, Length); - } - break; - } + GspSetHwBreakpoint(Type, (ULONG_PTR)Address, Length); + + break; + } case 'z': - { + { LONG Type; LONG Address; LONG Length; @@ -1558,68 +1488,60 @@ GspHex2Long(&ptr, &Address); ptr++; GspHex2Long(&ptr, &Length); + if (0 == Type) - { - GspRemoveSwBreakpoint((ULONG_PTR) Address); - } + GspRemoveSwBreakpoint((ULONG_PTR)Address); else - { - GspRemoveHwBreakpoint(Type, (ULONG_PTR) Address, Length); - } - break; - } + GspRemoveHwBreakpoint(Type, (ULONG_PTR)Address, Length); + + break; + } default: - break; - } - - /* reply to the request */ - GspPutPacket(GspOutBuffer); - // DbgPrint(">>> (%s) >>>\n", GspOutBuffer); - } -} - + break; + } + + /* reply to the request */ + GspPutPacket(GspOutBuffer); + // DbgPrint(">>> (%s) >>>\n", GspOutBuffer); + } +} BOOLEAN NTAPI -GspBreakIn(PKINTERRUPT Interrupt, - PVOID ServiceContext) -{ - PKTRAP_FRAME TrapFrame; - BOOLEAN DoBreakIn; - CONTEXT Context; - KIRQL OldIrql; - UCHAR Value; - - DPRINT("Break In\n"); - - DoBreakIn = FALSE; - while (KdPortGetByteEx(&GdbPortInfo, &Value)) - { - if (Value == 0x03) - { - DoBreakIn = TRUE; - } - } - - if (!DoBreakIn) - { - return TRUE; - } - - KeRaiseIrql(HIGH_LEVEL, &OldIrql); - - TrapFrame = PsGetCurrentThread()->Tcb.TrapFrame; - - KeTrapFrameToContext(TrapFrame, NULL, &Context); - - KdpGdbEnterDebuggerException(NULL, &Context, TrapFrame); - - KeContextToTrapFrame(&Context, NULL, TrapFrame, Context.ContextFlags, KernelMode); - - KeLowerIrql(OldIrql); - - return TRUE; +GspBreakIn(PKINTERRUPT Interrupt, PVOID ServiceContext) +{ + PKTRAP_FRAME TrapFrame; + BOOLEAN DoBreakIn; + CONTEXT Context; + KIRQL OldIrql; + UCHAR Value; + + DPRINT("Break In\n"); + + DoBreakIn = FALSE; + while (KdPortGetByteEx(&GdbPortInfo, &Value)) + { + if (Value == 0x03) + DoBreakIn = TRUE; + } + + if (!DoBreakIn) + return TRUE; + + KeRaiseIrql(HIGH_LEVEL, &OldIrql); + + TrapFrame = PsGetCurrentThread()->Tcb.TrapFrame; + + KeTrapFrameToContext(TrapFrame, NULL, &Context); + + KdpGdbEnterDebuggerException(NULL, &Context, TrapFrame); + + KeContextToTrapFrame(&Context, NULL, TrapFrame, Context.ContextFlags, KernelMode); + + KeLowerIrql(OldIrql); + + return TRUE; } VOID @@ -1631,40 +1553,37 @@ /* Initialize the GDB stub */ VOID NTAPI -KdpGdbStubInit(PKD_DISPATCH_TABLE WrapperTable, - ULONG BootPhase) -{ - if (!KdDebuggerEnabled || !KdpDebugMode.Gdb) - { - return; - } - - if (BootPhase == 0) - { - ExInitializeFastMutex(&GspLock); - - /* Write out the functions that we support for now */ - WrapperTable->KdpInitRoutine = KdpGdbStubInit; - WrapperTable->KdpPrintRoutine = KdpGdbDebugPrint; - WrapperTable->KdpExceptionRoutine = KdpGdbEnterDebuggerException; - - /* Initialize the Port */ - KdPortInitializeEx(&GdbPortInfo, 0, 0); - } - else if (BootPhase == 1) - { - GspInitialized = TRUE; - - GspRunThread = NULL; - GspDbgThread = NULL; - GspEnumThread = NULL; - - HalDisplayString("Waiting for GDB to attach\n"); - DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); - } - else if (BootPhase == 2) - { - HalDisplayString("\n GDB debugging enabled\n\n"); +KdpGdbStubInit(PKD_DISPATCH_TABLE WrapperTable, ULONG BootPhase) +{ + if (!KdDebuggerEnabled || !KdpDebugMode.Gdb) + return; + + if (BootPhase == 0) + { + ExInitializeFastMutex(&GspLock); + + /* Write out the functions that we support for now */ + WrapperTable->KdpInitRoutine = KdpGdbStubInit; + WrapperTable->KdpPrintRoutine = KdpGdbDebugPrint; + WrapperTable->KdpExceptionRoutine = KdpGdbEnterDebuggerException; + + /* Initialize the Port */ + KdPortInitializeEx(&GdbPortInfo, 0, 0); + } + else if (BootPhase == 1) + { + GspInitialized = TRUE; + + GspRunThread = NULL; + GspDbgThread = NULL; + GspEnumThread = NULL; + + HalDisplayString("Waiting for GDB to attach\n"); + DbgBreakPointWithStatus(DBG_STATUS_CONTROL_C); + } + else if (BootPhase == 2) + { + HalDisplayString("\n GDB debugging enabled\n\n"); } }

15 years, 4 months

[tkreuzer] 41536: win32csr: convert to spec

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 22 15:39:43 2009 New Revision: 41536 URL: http://svn.reactos.org/svn/reactos?rev=41536&view=rev Log: win32csr: convert to spec Added: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.spec (with props) Removed: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.def Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild Removed: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.def URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.def [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.def (removed) @@ -1,8 +1,0 @@ -; $Id$ -; - -LIBRARY win32csr.dll - -EXPORTS - -Win32CsrInitialization@24 Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.rbuild [iso-8859-1] Mon Jun 22 15:39:43 2009 @@ -1,7 +1,7 @@ <?xml version="1.0"?> <!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> <module name="win32csr" type="win32dll" installbase="system32" installname="win32csr.dll"> - <importlibrary definition="win32csr.def" /> + <importlibrary definition="win32csr.spec" /> <include base="win32csr">.</include> <include base="csrss">include</include> <include base="ReactOS">include/reactos/subsys</include> Added: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.spec URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.spec (added) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.spec [iso-8859-1] Mon Jun 22 15:39:43 2009 @@ -1,0 +1,1 @@ +@ stdcall Win32CsrInitialization(ptr ptr ptr ptr ptr ptr) Propchange: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/win32csr.spec ------------------------------------------------------------------------------ svn:eol-style = native

15 years, 4 months

[dgorbachev] 41535: Remove unused functions.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Jun 22 15:33:19 2009 New Revision: 41535 URL: http://svn.reactos.org/svn/reactos?rev=41535&view=rev Log: Remove unused functions. Modified: trunk/reactos/base/system/smss/smapi.c trunk/reactos/subsystems/win32/csrss/api/wapi.c Modified: trunk/reactos/base/system/smss/smapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/smss/smapi.c?r… ============================================================================== --- trunk/reactos/base/system/smss/smapi.c [iso-8859-1] (original) +++ trunk/reactos/base/system/smss/smapi.c [iso-8859-1] Mon Jun 22 15:33:19 2009 @@ -285,49 +285,6 @@ return Status; } -/********************************************************************** - * NAME - * SmpApiThread/1 - * - * DECRIPTION - * Due to differences in LPC implementation between NT and ROS, - * we need a thread to listen to for connection request that - * creates a new thread for each connected port. This is not - * necessary in NT LPC, because server side connected ports are - * never used to receive requests. - */ -#if 0 -VOID NTAPI -SmpApiThread (HANDLE ListeningPort) -{ - NTSTATUS Status = STATUS_SUCCESS; - SM_PORT_MESSAGE Request; - - DPRINT("SM: %s called\n", __FUNCTION__); - RtlZeroMemory(&Request, sizeof(PORT_MESSAGE)); - - while (TRUE) - { - Status = NtListenPort (ListeningPort, & Request.Header); - if (!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: NtListenPort() failed! (Status==x%08lx)\n", __FUNCTION__, Status); - break; - } - Status = SmpHandleConnectionRequest (& Request); - if(!NT_SUCCESS(Status)) - { - DPRINT1("SM: %s: SmpHandleConnectionRequest failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - break; - } - } - /* Cleanup */ - NtClose(ListeningPort); - /* DIE */ - NtTerminateThread(NtCurrentThread(), Status); -} -#endif /* LPC PORT INITIALIZATION **************************************************/ @@ -360,6 +317,7 @@ { return(Status); } + /* * Create one thread for the named LPC * port \SmApiPort Modified: trunk/reactos/subsystems/win32/csrss/api/wapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/api/wapi.c [iso-8859-1] Mon Jun 22 15:33:19 2009 @@ -299,51 +299,6 @@ DPRINT("CSR: %s done\n", __FUNCTION__); RtlExitUserThread(STATUS_SUCCESS); } - -/********************************************************************** - * NAME - * ServerApiPortThread/1 - * - * DESCRIPTION - * Handle connection requests from clients to the port - * "\Windows\ApiPort". - */ -#if 0 -DWORD WINAPI -ServerApiPortThread (HANDLE hApiListenPort) -{ - NTSTATUS Status = STATUS_SUCCESS; - BYTE RawRequest[sizeof(PORT_MESSAGE) + sizeof(CSR_CONNECTION_INFO)]; - PPORT_MESSAGE Request = (PPORT_MESSAGE)RawRequest; - - DPRINT("CSR: %s called", __FUNCTION__); - - for (;;) - { - REMOTE_PORT_VIEW LpcRead; - LpcRead.Length = sizeof(LpcRead); - - Status = NtListenPort (hApiListenPort, Request); - if (!NT_SUCCESS(Status)) - { - DPRINT1("CSR: NtListenPort() failed, status=%x\n", Status); - break; - } - - Status = CsrpHandleConnectionRequest(Request, hApiListenPort); - if(!NT_SUCCESS(Status)) - { - DPRINT1("CSR: %s: SmpHandleConnectionRequest failed (Status=0x%08lx)\n", - __FUNCTION__, Status); - break; - } - } - - NtClose(hApiListenPort); - NtTerminateThread(NtCurrentThread(), Status); - return 0; -} -#endif /********************************************************************** * NAME

15 years, 4 months

[dgorbachev] 41534: - If KDBG is not compiled in, try to use GDB instead. - Check WrapperTable.KdpPrintRoutine. - Allow to use GDB (/DEBUGPORT=GDB) and have debug output (/DEBUGPORT=COM1) at the same time.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Jun 22 15:32:58 2009 New Revision: 41534 URL: http://svn.reactos.org/svn/reactos?rev=41534&view=rev Log: - If KDBG is not compiled in, try to use GDB instead. - Check WrapperTable.KdpPrintRoutine. - Allow to use GDB (/DEBUGPORT=GDB) and have debug output (/DEBUGPORT=COM1) at the same time. Modified: trunk/reactos/ntoskrnl/kd/kdinit.c trunk/reactos/ntoskrnl/kd/kdio.c trunk/reactos/ntoskrnl/kd/kdmain.c Modified: trunk/reactos/ntoskrnl/kd/kdinit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdinit.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdinit.c [iso-8859-1] Mon Jun 22 15:32:58 2009 @@ -44,13 +44,52 @@ PCHAR NTAPI -KdpGetWrapperDebugMode(PCHAR Currentp2, - PLOADER_PARAMETER_BLOCK LoaderBlock) +KdpGetDebugMode(PCHAR Currentp2) { PCHAR p2 = Currentp2; + ULONG Value; + + /* Check for Screen Debugging */ + if (!_strnicmp(p2, "SCREEN", 6)) + { + /* Enable It */ + p2 += 6; + KdpDebugMode.Screen = TRUE; + } + /* Check for Serial Debugging */ + else if (!_strnicmp(p2, "COM", 3)) + { + /* Gheck for a valid Serial Port */ + p2 += 3; + Value = (ULONG)atol(p2); + if (Value > 0 && Value < 5) + { + /* Valid port found, enable Serial Debugging */ + KdpDebugMode.Serial = TRUE; + + /* Set the port to use */ + SerialPortInfo.ComPort = Value; + KdpPort = Value; + } + } + /* Check for Debug Log Debugging */ + else if (!_strnicmp(p2, "FILE", 4)) + { + /* Enable It */ + p2 += 4; + KdpDebugMode.File = TRUE; + } + + /* Check for BOCHS Debugging */ + else if (!_strnicmp(p2, "BOCHS", 5)) + { + /* Enable It */ + p2 += 5; + KdpDebugMode.Bochs = TRUE; + } /* Check for GDB Debugging */ - if (!_strnicmp(p2, "GDB", 3)) + else if (!_strnicmp(p2, "GDB", 3)) { /* Enable it */ p2 += 3; @@ -72,61 +111,6 @@ /* Enable Debugging */ KdDebuggerEnabled = TRUE; KdDebuggerNotPresent = FALSE; - } - -#ifdef KDBG - /* Get the KDBG Settings and enable it */ - KdDebuggerEnabled = TRUE; - KdDebuggerNotPresent = FALSE; - KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); -#endif - return p2; -} - -PCHAR -NTAPI -KdpGetDebugMode(PCHAR Currentp2) -{ - PCHAR p2 = Currentp2; - ULONG Value; - - /* Check for Screen Debugging */ - if (!_strnicmp(p2, "SCREEN", 6)) - { - /* Enable It */ - p2 += 6; - KdpDebugMode.Screen = TRUE; - } - /* Check for Serial Debugging */ - else if (!_strnicmp(p2, "COM", 3)) - { - /* Gheck for a valid Serial Port */ - p2 += 3; - Value = (ULONG)atol(p2); - if (Value > 0 && Value < 5) - { - /* Valid port found, enable Serial Debugging */ - KdpDebugMode.Serial = TRUE; - - /* Set the port to use */ - SerialPortInfo.ComPort = Value; - KdpPort = Value; - } - } - /* Check for Debug Log Debugging */ - else if (!_strnicmp(p2, "FILE", 4)) - { - /* Enable It */ - p2 += 4; - KdpDebugMode.File = TRUE; - } - - /* Check for BOCHS Debugging */ - else if (!_strnicmp(p2, "BOCHS", 5)) - { - /* Enable It */ - p2 += 5; - KdpDebugMode.Bochs = TRUE; } return p2; @@ -179,7 +163,7 @@ /* Upcase it */ _strupr(CommandLine); - /* Check for settings that we support */ + /* XXX Check for settings that we support */ if (strstr(CommandLine, "BREAK")) KdpEarlyBreak = TRUE; if (strstr(CommandLine, "NODEBUG")) KdDebuggerEnabled = FALSE; if (strstr(CommandLine, "CRASHDEBUG")) KdDebuggerEnabled = FALSE; @@ -190,16 +174,23 @@ KdpDebugMode.Serial = TRUE; } +#ifdef KDBG + /* Get the KDBG Settings and enable it */ + KdDebuggerEnabled = TRUE; + KdDebuggerNotPresent = FALSE; + KdbpGetCommandLineSettings(LoaderBlock->LoadOptions); +#endif + /* Get the port and baud rate */ Port = strstr(CommandLine, "DEBUGPORT"); BaudRate = strstr(CommandLine, "BAUDRATE"); Irq = strstr(CommandLine, "IRQ"); - /* Check if we got the /DEBUGPORT parameter */ - if (Port) + /* Check if we got the /DEBUGPORT parameter(s) */ + while (Port) { /* Move past the actual string, to reach the port*/ - Port += strlen("DEBUGPORT"); + Port += sizeof("DEBUGPORT") - 1; /* Now get past any spaces and skip the equal sign */ while (*Port == ' ') Port++; @@ -207,15 +198,14 @@ /* Get the debug mode and wrapper */ Port = KdpGetDebugMode(Port); - Port = KdpGetWrapperDebugMode(Port, LoaderBlock); - KdDebuggerEnabled = TRUE; + Port = strstr(Port, "DEBUGPORT"); } /* Check if we got a baud rate */ if (BaudRate) { /* Move past the actual string, to reach the rate */ - BaudRate += strlen("BAUDRATE"); + BaudRate += sizeof("BAUDRATE") - 1; /* Now get past any spaces */ while (*BaudRate == ' ') BaudRate++; @@ -233,7 +223,7 @@ if (Irq) { /* Move past the actual string, to reach the rate */ - Irq += strlen("IRQ"); + Irq += sizeof("IRQ") - 1; /* Now get past any spaces */ while (*Irq == ' ') Irq++; @@ -257,7 +247,7 @@ if (WrapperInitRoutine) WrapperInitRoutine(&WrapperTable, 0); return TRUE; } - else + else /* BootPhase > 0 */ { #ifdef _M_IX86 KdpEnableSafeMem(); @@ -271,4 +261,4 @@ return TRUE; } - /* EOF */ +/* EOF */ Modified: trunk/reactos/ntoskrnl/kd/kdio.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdio.c?rev=415… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdio.c [iso-8859-1] Mon Jun 22 15:32:58 2009 @@ -293,11 +293,11 @@ } /* Call the Wrapper Routine */ - if (WrapperInitRoutine) WrapperTable.KdpPrintRoutine(String, Length); + if (WrapperTable.KdpPrintRoutine) + WrapperTable.KdpPrintRoutine(String, Length); /* Return the Length */ return Length; } /* EOF */ - Modified: trunk/reactos/ntoskrnl/kd/kdmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/kdmain.c?rev=4… ============================================================================== --- trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/kdmain.c [iso-8859-1] Mon Jun 22 15:32:58 2009 @@ -163,12 +163,22 @@ EipOld = Context->Eip; #endif +#ifdef KDBG /* Call KDBG if available */ Return = KdbEnterDebuggerException(ExceptionRecord, PreviousMode, Context, TrapFrame, !SecondChance); +#else /* not KDBG */ + if (WrapperInitRoutine) + { + /* Call GDB */ + Return = WrapperTable.KdpExceptionRoutine(ExceptionRecord, + Context, + TrapFrame); + } +#endif /* not KDBG */ /* Bump EIP over int 3 if debugger did not already change it */ if (ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT)

15 years, 4 months

[dgorbachev] 41533: Change GDB stub.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Jun 22 15:32:25 2009 New Revision: 41533 URL: http://svn.reactos.org/svn/reactos?rev=41533&view=rev Log: Change GDB stub. Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c Modified: trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/wrappers/gdbst… ============================================================================== --- trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/wrappers/gdbstub.c [iso-8859-1] Mon Jun 22 15:32:25 2009 @@ -11,76 +11,17 @@ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. ****************************************************************************/ - /**************************************************************************** - * Header: remcom.c,v 1.34 91/03/09 12:29:49 glenne Exp $ - * - * Module name: remcom.c $ - * Revision: 1.34 $ - * Date: 91/03/09 12:29:49 $ * Contributor: Lake Stevens Instrument Division$ * * Description: low level support for gdb debugger. $ * - * Considerations: only works on target hardware $ - * * Written by: Glenn Engel $ * ModuleState: Experimental $ - * - * NOTES: See Below $ * * Modified for 386 by Jim Kingdon, Cygnus Support. * Modified for ReactOS by Casper S. Hornstrup <chorns(a)users.sourceforge.net> * - * To enable debugger support, two things need to happen. One, setting - * up a routine so that it is in the exception path, is necessary in order - * to allow any breakpoints or error conditions to be properly intercepted - * and reported to gdb. - * Two, a breakpoint needs to be generated to begin communication. - * - * Because gdb will sometimes write to the stack area to execute function - * calls, this program cannot rely on using the supervisor stack so it - * uses it's own stack area. - * - ************* - * - * The following gdb commands are supported: - * - * command function Return value - * - * g return the value of the CPU Registers hex data or ENN - * G set the value of the CPU Registers OK or ENN - * - * mAA..AA,LLLL Read LLLL bytes at address AA..AA hex data or ENN - * MAA..AA,LLLL: Write LLLL bytes at address AA.AA OK or ENN - * - * c Resume at current address SNN ( signal NN) - * cAA..AA Continue at address AA..AA SNN - * - * s Step one instruction SNN - * sAA..AA Step one instruction from AA..AA SNN - * - * k kill - * - * ? What was the last sigval ? SNN (signal NN) - * - * All commands and responses are sent with a packet which includes a - * Checksum. A packet consists of - * - * $<packet info>#<Checksum>. - * - * where - * <packet info> :: <characters representing the command or response> - * <Checksum> :: < two hex digits computed as modulo 256 sum of <packetinfo>> - * - * When a packet is received, it is first acknowledged with either '+' or '-'. - * '+' indicates a successful transfer. '-' indicates a failed transfer. - * - * Example: - * - * Host: Reply: - * $m0,10#2a +$00010203040506070809101112131415#42 - * ****************************************************************************/ #include <ntoskrnl.h> @@ -88,12 +29,8 @@ #include <debug.h> /************************************************************************/ -/* BUFMAX defines the maximum number of characters in inbound/outbound buffers*/ -/* at least NUMREGBYTES*2 are needed for register packets */ -#define BUFMAX 1000 static BOOLEAN GspInitialized; - static BOOLEAN GspRemoteDebug; static CONST CHAR HexChars[]="0123456789abcdef"; @@ -105,7 +42,12 @@ static FAST_MUTEX GspLock; extern LIST_ENTRY PsActiveProcessHead; -KD_PORT_INFORMATION GdbPortInfo = { 2, 115200, 0 }; /* FIXME hardcoded for COM2, 115200 baud */ + +/* FIXME hardcoded for COM2, 115200 baud */ +KD_PORT_INFORMATION GdbPortInfo = { 2, 115200, 0 }; + +static CHAR GspInBuffer[1000]; +static CHAR GspOutBuffer[1000]; /* Number of Registers. */ #define NUMREGS 16 @@ -178,8 +120,6 @@ return -1; } -static CHAR GspInBuffer[BUFMAX]; -static CHAR GspOutBuffer[BUFMAX]; VOID GdbPutChar(UCHAR Value) @@ -199,7 +139,6 @@ } /* scan for the sequence $<data>#<Checksum> */ - PCHAR GspGetPacket() { @@ -221,7 +160,7 @@ Count = 0; /* now, read until a # or end of Buffer is found */ - while (Count < BUFMAX) + while (Count < sizeof(GspInBuffer) - 1) { ch = GdbGetChar(); if (ch == '$') @@ -260,7 +199,6 @@ } /* send the packet in Buffer. */ - VOID GspPutPacket(PCHAR Buffer) { @@ -314,17 +252,23 @@ GdbPutChar(HexChars[Checksum & 0xf]); } -/* Indicate to caller of GspMem2Hex or GspHex2Mem that there has been an - error. */ +/* Indicate to caller of GspMem2Hex or GspHex2Mem that there has been an error. */ static volatile BOOLEAN GspMemoryError = FALSE; -static volatile void *GspAccessLocation = NULL; static CHAR GspReadMemSafe(PCHAR Address) { - CHAR ch; - KdpSafeReadMemory((ULONG_PTR)Address, 1, &ch); + CHAR ch = 0; + if (!KdpSafeReadMemory((ULONG_PTR)Address, 1, &ch)) + GspMemoryError = TRUE; return ch; +} + +static void +GspWriteMemSafe(PCHAR Address, CHAR Ch) +{ + if (!KdpSafeWriteMemory((ULONG_PTR)Address, 1, Ch)) + GspMemoryError = TRUE; } /* Convert the memory pointed to by Address into hex, placing result in Buffer */ @@ -375,7 +319,6 @@ ULONG CountInPage; ULONG i; CHAR ch; - ULONG OldProt = 0; Current = Address; while (Current < Address + Count) @@ -391,30 +334,24 @@ /* Flows into next page, handle only current page in this iteration */ CountInPage = PAGE_SIZE - (Address - Page); } + + for (i = 0; i < CountInPage && ! GspMemoryError; i++) + { + ch = (*GetContent)(Context, Current - Address); + + if (MayFault) + { + GspWriteMemSafe(Current, ch); + } + else + { + *Current = ch; + } + + Current++; + } if (MayFault) { - OldProt = MmGetPageProtect(NULL, Address); - MmSetPageProtect(NULL, Address, PAGE_EXECUTE_READWRITE); - } - - for (i = 0; i < CountInPage && ! GspMemoryError; i++) - { - ch = (*GetContent)(Context, Current - Address); - - if (MayFault) - { - GspAccessLocation = Current; - } - *Current = ch; - if (MayFault) - { - GspAccessLocation = NULL; - } - Current++; - } - if (MayFault) - { - MmSetPageProtect(NULL, Page, OldProt); if (GspMemoryError) { return Current - Address; @@ -432,8 +369,8 @@ HexValue(*((PCHAR) Context + 2 * Offset + 1))); } -/* Convert the hex array pointed to by Buffer into binary to be placed at Address */ -/* Return a pointer to the character AFTER the last byte read from Buffer */ +/* Convert the hex array pointed to by Buffer into binary to be placed at Address + * Return a pointer to the character AFTER the last byte read from Buffer */ static PCHAR GspHex2Mem(PCHAR Buffer, PCHAR Address, @@ -444,49 +381,6 @@ return Buffer + 2 * Count; } - -static void -GspWriteMemSafe(PCHAR Address, - CHAR Ch) -{ - KdpSafeWriteMemory((ULONG_PTR)Address, 1, Ch); -} - - -/* This function takes the 386 exception vector and attempts to - translate this number into a unix compatible signal value */ -ULONG -GspComputeSignal(NTSTATUS ExceptionCode) -{ - ULONG SigVal; - - switch (ExceptionCode) - { - case STATUS_INTEGER_DIVIDE_BY_ZERO: - SigVal = 8; /* divide by zero */ - break; - case STATUS_SINGLE_STEP: - case STATUS_BREAKPOINT: - SigVal = 5; /* breakpoint */ - break; - case STATUS_INTEGER_OVERFLOW: - case STATUS_ARRAY_BOUNDS_EXCEEDED: - SigVal = 16; /* bound instruction */ - break; - case STATUS_ILLEGAL_INSTRUCTION: - SigVal = 4; /* Invalid opcode */ - break; - case STATUS_STACK_OVERFLOW: - case STATUS_DATATYPE_MISALIGNMENT: - case STATUS_ACCESS_VIOLATION: - SigVal = 11; /* access violation */ - break; - default: - SigVal = 7; /* "software generated" */ - } - return SigVal; -} - /**********************************************/ /* WHILE WE FIND NICE HEX CHARS, BUILD A LONG */ @@ -932,6 +826,15 @@ GspMem2Hex(Buffer, &GspOutBuffer[0], strlen(Buffer), FALSE); } } + else if (strncmp(Request, "Supported", 9) == 0) + { + /* tell maximum incoming packet size */ + sprintf(GspOutBuffer, "PacketSize=%u", sizeof(GspInBuffer) - 1); + } + else if (strncmp(Request, "Rcmd,", 5) == 0) + { + ; + } } VOID @@ -954,6 +857,8 @@ GspOutBuffer[1] = '\0'; } } + +#define DR6_BS 0x00004000 /* Single step */ #define DR7_L0 0x00000001 /* Local breakpoint 0 enable */ #define DR7_G0 0x00000002 /* Global breakpoint 0 enable */ @@ -1011,7 +916,6 @@ #define MAX_SW_BREAKPOINTS 64 static unsigned GspSwBreakpointCount = 0; static GSPSWBREAKPOINT GspSwBreakpoints[MAX_SW_BREAKPOINTS]; -static CHAR GspSwBreakpointsInstructions[MAX_SW_BREAKPOINTS]; static void GspSetHwBreakpoint(ULONG Type, ULONG_PTR Address, ULONG Length) @@ -1085,6 +989,21 @@ strcpy(GspOutBuffer, "E22"); } +static BOOLEAN +GspFindSwBreakpoint(ULONG_PTR Address, PULONG PIndex) +{ + ULONG Index; + + for (Index = 0; Index < GspSwBreakpointCount; Index++) + if (GspSwBreakpoints[Index].Address == Address) + { + if (PIndex) *PIndex = Index; + return TRUE; + } + + return FALSE; +} + static void GspSetSwBreakpoint(ULONG_PTR Address) { @@ -1094,61 +1013,44 @@ { DPRINT1("Trying to set too many software breakpoints\n"); strcpy(GspOutBuffer, "E22"); - } - else - { - unsigned Index; - - for (Index = 0; Index < GspSwBreakpointCount; Index++) - { - if (GspSwBreakpoints[Index].Address == Address) - { - strcpy(GspOutBuffer, "E22"); - return; - } - } - - DPRINT("Stored at index %u\n", GspSwBreakpointCount); - GspSwBreakpoints[GspSwBreakpointCount].Address = Address; - GspSwBreakpoints[GspSwBreakpointCount].Active = FALSE; - GspSwBreakpointsInstructions[GspSwBreakpointCount] = - GspReadMemSafe((PCHAR )Address); - GspWriteMemSafe((PCHAR )Address, 0xCC); - GspSwBreakpointCount++; - strcpy(GspOutBuffer, "OK"); - } + return; + } + + if (GspFindSwBreakpoint(Address, NULL)) + { + strcpy(GspOutBuffer, "E22"); + return; + } + + DPRINT("Stored at index %u\n", GspSwBreakpointCount); + GspSwBreakpoints[GspSwBreakpointCount].Address = Address; + GspSwBreakpoints[GspSwBreakpointCount].Active = FALSE; + GspSwBreakpointCount++; + strcpy(GspOutBuffer, "OK"); } static void GspRemoveSwBreakpoint(ULONG_PTR Address) { - unsigned Index; + ULONG Index; DPRINT("GspRemoveSwBreakpoint(0x%p)\n", Address); - for (Index = 0; Index < GspSwBreakpointCount; Index++) - { - if (GspSwBreakpoints[Index].Address == Address) - { - DPRINT("Found match at index %u\n", Index); - ASSERT(! GspSwBreakpoints[Index].Active); - - GspWriteMemSafe((PCHAR )Address, - GspSwBreakpointsInstructions[Index]); - - if (Index + 1 < GspSwBreakpointCount) - { - memmove(GspSwBreakpoints + Index, - GspSwBreakpoints + (Index + 1), - (GspSwBreakpointCount - Index - 1) * - sizeof(GSPSWBREAKPOINT)); - memmove(GspSwBreakpointsInstructions + Index, - GspSwBreakpointsInstructions + (Index + 1), - (GspSwBreakpointCount - Index - 1) * sizeof(CHAR)); - } - GspSwBreakpointCount--; - strcpy(GspOutBuffer, "OK"); - return; - } + + if (GspFindSwBreakpoint(Address, &Index)) + { + DPRINT("Found match at index %u\n", Index); + ASSERT(! GspSwBreakpoints[Index].Active); + + if (Index + 1 < GspSwBreakpointCount) + { + memmove(GspSwBreakpoints + Index, + GspSwBreakpoints + (Index + 1), + (GspSwBreakpointCount - Index - 1) * + sizeof(GSPSWBREAKPOINT)); + } + GspSwBreakpointCount--; + strcpy(GspOutBuffer, "OK"); + return; } DPRINT1("Not found\n"); @@ -1195,6 +1097,28 @@ } static void +GspLoadSwBreakpoint(ULONG Index) +{ + GspMemoryError = FALSE; + GspSwBreakpoints[Index].PrevContent = GspReadMemSafe((PCHAR) GspSwBreakpoints[Index].Address); + if (! GspMemoryError) + { + GspWriteMemSafe((PCHAR) GspSwBreakpoints[Index].Address, I386_OPCODE_INT3); + } + GspSwBreakpoints[Index].Active = ! GspMemoryError; + if (GspMemoryError) + { + DPRINT1("Failed to set software breakpoint at 0x%p\n", + GspSwBreakpoints[Index].Address); + } + else + { + DPRINT("Successfully set software breakpoint at 0x%p\n", + GspSwBreakpoints[Index].Address); + } +} + +static void GspLoadBreakpoints(PKTRAP_FRAME TrapFrame) { unsigned Index; @@ -1202,6 +1126,7 @@ DPRINT("GspLoadBreakpoints\n"); DPRINT("DR7 on entry: 0x%08x\n", TrapFrame->Dr7); + /* Remove all breakpoints */ TrapFrame->Dr7 &= ~(DR7_L0 | DR7_L1 | DR7_L2 | DR7_L3 | DR7_G0 | DR7_G1 | DR7_G2 | DR7_G3 | @@ -1235,47 +1160,22 @@ for (Index = 0; Index < GspSwBreakpointCount; Index++) { - if (GspHwBreakpointCount + Index < MAX_HW_BREAKPOINTS) - { - DPRINT("Implementing software interrupt using hardware register\n"); - GspLoadHwBreakpoint(TrapFrame, GspHwBreakpointCount + Index, - GspSwBreakpoints[Index].Address, 0, - I386_BP_TYPE_EXECUTE); - GspSwBreakpoints[Index].Active = FALSE; - } - else - { - DPRINT("Using real software breakpoint\n"); - GspMemoryError = FALSE; - GspSwBreakpoints[Index].PrevContent = GspReadMemSafe((PCHAR) GspSwBreakpoints[Index].Address); - if (! GspMemoryError) - { - GspWriteMemSafe((PCHAR) GspSwBreakpoints[Index].Address, I386_OPCODE_INT3); - } - GspSwBreakpoints[Index].Active = ! GspMemoryError; - if (GspMemoryError) - { - DPRINT1("Failed to set software breakpoint at 0x%p\n", - GspSwBreakpoints[Index].Address); - } - else - { - DPRINT("Successfully set software breakpoint at 0x%p\n", - GspSwBreakpoints[Index].Address); - DPRINT1("Successfully set software breakpoint at 0x%p\n", GspSwBreakpoints[Index].Address); - } - } + DPRINT("Using real software breakpoint\n"); + GspLoadSwBreakpoint(Index); } DPRINT("Final DR7 value 0x%08x\n", TrapFrame->Dr7); } static void -GspUnloadBreakpoints(PKTRAP_FRAME TrapFrame) +GspUnloadBreakpoints(void) { unsigned Index; - DPRINT("GspUnloadHwBreakpoints\n"); + DPRINT("GspUnloadBreakpoints\n"); + + /* Disable hardware debugging while we are inside the stub */ + Ke386SetDr7(0); for (Index = 0; Index < GspSwBreakpointCount; Index++) { @@ -1299,9 +1199,67 @@ } } -static BOOLEAN gdb_attached_yet = FALSE; +static void +GspStopReply(NTSTATUS ExceptionCode, PKTRAP_FRAME TrapFrame) +{ + PCHAR ptr = GspOutBuffer; + ULONG SigVal; + LONG Esp; + + switch (ExceptionCode) + { + case STATUS_INTEGER_DIVIDE_BY_ZERO: + SigVal = 8; /* divide by zero */ + break; + case STATUS_SINGLE_STEP: + case STATUS_BREAKPOINT: + SigVal = 5; /* breakpoint */ + break; + case STATUS_INTEGER_OVERFLOW: + case STATUS_ARRAY_BOUNDS_EXCEEDED: + SigVal = 16; /* bound instruction */ + break; + case STATUS_ILLEGAL_INSTRUCTION: + SigVal = 4; /* Invalid opcode */ + break; + case STATUS_STACK_OVERFLOW: + case STATUS_DATATYPE_MISALIGNMENT: + case STATUS_ACCESS_VIOLATION: + SigVal = 11; /* access violation */ + break; + default: + SigVal = 7; /* "software generated" */ + } + + ptr = GspOutBuffer; + + *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ + *ptr++ = HexChars[(SigVal >> 4) & 0xf]; + *ptr++ = HexChars[SigVal & 0xf]; + + *ptr++ = HexChars[ESP]; + *ptr++ = ':'; + + Esp = GspGetEspFromTrapFrame(TrapFrame); /* SP */ + ptr = GspMem2Hex((PCHAR) &Esp, ptr, 4, 0); + *ptr++ = ';'; + + *ptr++ = HexChars[EBP]; + *ptr++ = ':'; + ptr = GspMem2Hex((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ + *ptr++ = ';'; + + *ptr++ = HexChars[PC]; + *ptr++ = ':'; + ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ + *ptr++ = ';'; + + *ptr = '\0'; +} + + /* - * This function does all command procesing for interfacing to gdb. + * This function does all command procesing for interfacing to GDB. */ KD_CONTINUE_TYPE NTAPI @@ -1309,34 +1267,23 @@ PCONTEXT Context, PKTRAP_FRAME TrapFrame) { - BOOLEAN Stepping; - LONG Address; - LONG Length; - LONG SigVal = 0; - LONG NewPC; - PCHAR ptr; - - /* FIXME: Stop on other CPUs too */ - - if (STATUS_ACCESS_VIOLATION == (NTSTATUS) ExceptionRecord->ExceptionCode && - NULL != GspAccessLocation && - (ULONG_PTR) GspAccessLocation == - (ULONG_PTR) ExceptionRecord->ExceptionInformation[1]) - { - GspAccessLocation = NULL; - GspMemoryError = TRUE; - Context->Eip += 3; - } - else - { - DPRINT("Thread %p entering stub\n", PsGetCurrentThread()); + static BOOLEAN GdbAttached = FALSE; + BOOLEAN Stepping = FALSE; + NTSTATUS ExceptionCode; + LONG Address; + LONG Length; + PCHAR ptr; + + /* FIXME: Stop on other CPUs too */ + + DPRINT("Thread %p entering stub\n", PsGetCurrentThread()); + ExceptionCode = (NTSTATUS) ExceptionRecord->ExceptionCode; + /* Can only debug 1 thread at a time... */ ExAcquireFastMutex(&GspLock); DPRINT("Thread %p acquired mutex\n", PsGetCurrentThread()); - /* Disable hardware debugging while we are inside the stub */ - Ke386SetDr7(0); - GspUnloadBreakpoints(TrapFrame); + GspUnloadBreakpoints(); /* Make sure we're debugging the current thread. */ if (NULL != GspDbgThread) @@ -1346,67 +1293,29 @@ GspDbgThread = NULL; } - /* ugly hack to avoid attempting to send status at the very - * beginning, right when GDB is trying to query the stub */ - if (gdb_attached_yet) - { - LONG Esp; - - stop_reply: - /* reply to host that an exception has occurred */ - SigVal = GspComputeSignal(ExceptionRecord->ExceptionCode); - - ptr = GspOutBuffer; - - *ptr++ = 'T'; /* notify gdb with signo, PC, FP and SP */ - *ptr++ = HexChars[(SigVal >> 4) & 0xf]; - *ptr++ = HexChars[SigVal & 0xf]; - - *ptr++ = HexChars[ESP]; - *ptr++ = ':'; - - Esp = GspGetEspFromTrapFrame(TrapFrame); /* SP */ - ptr = GspMem2Hex((PCHAR) &Esp, ptr, 4, 0); - *ptr++ = ';'; - - *ptr++ = HexChars[EBP]; - *ptr++ = ':'; - ptr = GspMem2Hex((PCHAR) &TrapFrame->Ebp, ptr, 4, 0); /* FP */ - *ptr++ = ';'; - - *ptr++ = HexChars[PC]; - *ptr++ = ':'; - ptr = GspMem2Hex((PCHAR) &TrapFrame->Eip, ptr, 4, 0); /* PC */ - *ptr++ = ';'; - - *ptr = '\0'; - - GspPutPacket(&GspOutBuffer[0]); - /* DPRINT("------- replied status: (%s) -------\n", GspOutBuffer); */ + if (GdbAttached) + { + GspStopReply(ExceptionCode, TrapFrame); + GspPutPacket(GspOutBuffer); + // DbgPrint(">>> (%s) >>>\n", GspOutBuffer); } else { - gdb_attached_yet = 1; - } - - Stepping = FALSE; + GdbAttached = TRUE; + } while (TRUE) { /* Zero the buffer now so we don't have to worry about the terminating zero character */ - memset(GspOutBuffer, 0, sizeof(GspInBuffer)); + memset(GspOutBuffer, 0, sizeof(GspOutBuffer)); ptr = GspGetPacket(); - /* DPRINT("------- Get (%s) command -------\n", ptr); */ + // DbgPrint("<<< (%s) <<<\n", ptr); switch(*ptr++) { case '?': /* a little hack to send more complete status information */ - goto stop_reply; - GspOutBuffer[0] = 'S'; - GspOutBuffer[1] = HexChars[SigVal >> 4]; - GspOutBuffer[2] = HexChars[SigVal % 16]; - GspOutBuffer[3] = 0; + GspStopReply(ExceptionCode, TrapFrame); break; case 'd': GspRemoteDebug = !GspRemoteDebug; /* toggle debug flag */ @@ -1478,7 +1387,7 @@ if (GspMemoryError) { strcpy(GspOutBuffer, "E03"); - DPRINT("Fault during memory read\n"); + DPRINT1("Fault during memory read\n"); } } @@ -1514,7 +1423,7 @@ if (GspMemoryError) { strcpy(GspOutBuffer, "E03"); - DPRINT("Fault during memory write\n"); + DPRINT1("Fault during memory write\n"); } else { @@ -1537,55 +1446,49 @@ case 'c': { ULONG BreakpointNumber; - ULONG dr6_; - - /* try to read optional parameter, pc unchanged if no parm */ + ULONG Dr6; + + /* try to read optional parameter, pc changed if param */ if (GspHex2Long (&ptr, &Address)) { Context->Eip = Address; } - - NewPC = Context->Eip; + else if (ExceptionCode == STATUS_BREAKPOINT) + { + if (GspReadMemSafe((PCHAR) Context->Eip) == (CHAR) I386_OPCODE_INT3) + { + Context->Eip++; + } + } /* clear the trace bit */ - Context->EFlags &= 0xfffffeff; + Context->EFlags &= ~EFLAGS_TF; /* set the trace bit if we're Stepping */ if (Stepping) { - Context->EFlags |= 0x100; + Context->EFlags |= EFLAGS_TF; } -#if defined(__GNUC__) - asm volatile ("movl %%db6, %0\n" : "=r" (dr6_) : ); -#elif defined(_MSC_VER) - __asm mov eax, dr6 __asm mov dr6_, eax; -#else -#error Unknown compiler for inline assembler -#endif - if (!(dr6_ & 0x4000)) + Dr6 = Ke386GetDr6(); + if (!(Dr6 & DR6_BS)) { - for (BreakpointNumber = 0; BreakpointNumber < 4; ++BreakpointNumber) + for (BreakpointNumber = 0; BreakpointNumber < MAX_HW_BREAKPOINTS; ++BreakpointNumber) { - if (dr6_ & (1 << BreakpointNumber)) + if (Dr6 & (1 << BreakpointNumber)) { - if (GspHwBreakpoints[BreakpointNumber].Type == 0) + if (GspHwBreakpoints[BreakpointNumber].Type == I386_BP_TYPE_EXECUTE) { /* Set restore flag */ - Context->EFlags |= 0x10000; + Context->EFlags |= EFLAGS_RF; break; } } } } + GspLoadBreakpoints(TrapFrame); -#if defined(__GNUC__) - asm volatile ("movl %0, %%db6\n" : : "r" (0)); -#elif defined(_MSC_VER) - __asm mov eax, 0 __asm mov dr6, eax; -#else -#error Unknown compiler for inline assembler -#endif + Ke386SetDr6(0); if (NULL != GspDbgThread) { @@ -1596,14 +1499,19 @@ DPRINT("Thread %p releasing mutex\n", PsGetCurrentThread()); ExReleaseFastMutex(&GspLock); DPRINT("Thread %p leaving stub\n", PsGetCurrentThread()); - return kdContinue; - break; + + if (ExceptionCode == STATUS_BREAKPOINT || + ExceptionCode == STATUS_SINGLE_STEP) + { + return kdContinue; + } + + return kdHandleException; } case 'k': /* kill the program */ strcpy(GspOutBuffer, "OK"); break; - /* kill the program */ case 'H': /* Set thread */ GspSetThread(ptr); @@ -1630,11 +1538,11 @@ GspHex2Long(&ptr, &Length); if (0 == Type) { - GspSetSwBreakpoint((ULONG_PTR) Address); + GspSetSwBreakpoint((ULONG_PTR) Address); } else { - GspSetHwBreakpoint(Type, (ULONG_PTR) Address, Length); + GspSetHwBreakpoint(Type, (ULONG_PTR) Address, Length); } break; } @@ -1652,11 +1560,11 @@ GspHex2Long(&ptr, &Length); if (0 == Type) { - GspRemoveSwBreakpoint((ULONG_PTR) Address); + GspRemoveSwBreakpoint((ULONG_PTR) Address); } else { - GspRemoveHwBreakpoint(Type, (ULONG_PTR) Address, Length); + GspRemoveHwBreakpoint(Type, (ULONG_PTR) Address, Length); } break; } @@ -1667,20 +1575,8 @@ /* reply to the request */ GspPutPacket(GspOutBuffer); - /* DPRINT("------- reply command (%s) -------\n", GspOutBuffer); */ - } - - /* not reached */ - ASSERT(0); - } - - if (NULL != GspDbgThread) - { - ObDereferenceObject(GspDbgThread); - GspDbgThread = NULL; - } - - return kdContinue; + // DbgPrint(">>> (%s) >>>\n", GspOutBuffer); + } } @@ -1754,8 +1650,6 @@ /* Initialize the Port */ KdPortInitializeEx(&GdbPortInfo, 0, 0); - - KdpPort = GdbPortInfo.ComPort; } else if (BootPhase == 1) {

15 years, 4 months

[dgorbachev] 41532: Remove unused stuff.

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Mon Jun 22 15:31:57 2009 New Revision: 41532 URL: http://svn.reactos.org/svn/reactos?rev=41532&view=rev Log: Remove unused stuff. Modified: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c Modified: trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kd/i386/kdmemsup.… ============================================================================== --- trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kd/i386/kdmemsup.c [iso-8859-1] Mon Jun 22 15:31:57 2009 @@ -30,89 +30,6 @@ static BOOLEAN KdpPhysAccess = FALSE; -#if 0 -extern ULONG MmGlobalKernelPageDirectory[1024]; -ULONG_PTR IdentityMapAddrHigh, IdentityMapAddrLow; - -ULONGLONG -FASTCALL -KdpPhysRead(ULONG_PTR Addr, LONG Len) -{ - ULONGLONG Result = 0; - ULONG_PTR OldCR3 = __readcr3(), OldCR4 = __readcr4(); - - if (Addr & HIGH_PHYS_MASK) - { - Addr &= ~HIGH_PHYS_MASK; - __writecr3(IdentityMapAddrHigh); - } - else - __writecr3(IdentityMapAddrLow); - - __writecr4(OldCR4|CR4_PAGE_SIZE_BIT); // Turn on large page translation - __invlpg((PVOID)Addr); - - switch (Len) - { - case 8: - Result = *((PULONGLONG)Addr); - break; - case 4: - Result = *((PULONG)Addr); - break; - case 2: - Result = *((PUSHORT)Addr); - break; - case 1: - Result = *((PUCHAR)Addr); - break; - } - __writecr4(OldCR4); // Turn off large page translation - __writecr3(OldCR3); - __invlpg((PVOID)Addr); - - return Result; -} - -VOID -NTAPI -KdpPhysWrite(ULONG_PTR Addr, LONG Len, ULONGLONG Value) -{ - ULONG_PTR OldCR3 = __readcr3(), OldCR4 = __readcr4(); - - if (Addr & HIGH_PHYS_MASK) - { - Addr &= ~HIGH_PHYS_MASK; - __writecr3(IdentityMapAddrHigh); - } - else - __writecr3(IdentityMapAddrLow); - - __writecr4(OldCR4|CR4_PAGE_SIZE_BIT); // Turn on large page translation - __invlpg((PVOID)Addr); - - switch (Len) - { - case 8: - *((PULONGLONG)Addr) = Value; - break; - case 4: - *((PULONG)Addr) = Value; - break; - case 2: - *((PUSHORT)Addr) = Value; - break; - case 1: - *((PUCHAR)Addr) = Value; - break; - } - __writecr4(OldCR4); // Turn off large page translation - __writecr3(OldCR3); - __invlpg((PVOID)Addr); -} - -#else - static ULONG_PTR KdpPhysMap(ULONG_PTR PhysAddr, LONG Len) @@ -194,7 +111,6 @@ break; } } -#endif BOOLEAN NTAPI @@ -291,60 +207,11 @@ return TRUE; } -#if 0 VOID NTAPI -KdpEnableSafeMem() -{ - int i; - PULONG IdentityMapVirt; - PHYSICAL_ADDRESS IdentityMapPhys, Highest = { }; - - if (KdpPhysAccess) - return; - - Highest.LowPart = (ULONG)-1; - /* Allocate a physical page and map it to copy the phys copy code onto */ - IdentityMapVirt = (PULONG)MmAllocateContiguousMemory(2 * PAGE_SIZE, Highest); - IdentityMapPhys = MmGetPhysicalAddress(IdentityMapVirt); - IdentityMapAddrHigh = IdentityMapPhys.LowPart; - - /* Copy the kernel space */ - memcpy(IdentityMapVirt, - MmGlobalKernelPageDirectory, - PAGE_SIZE); - - /* Set up 512 4Mb pages (high 2Gig identity mapped) */ - for (i = 0; i < 512; i++) - { - IdentityMapVirt[i] = - HIGH_PHYS_MASK | (i << 22) | PDE_PS_BIT | PDE_W_BIT | PDE_PRESENT_BIT; - } - - /* Allocate a physical page and map it to copy the phys copy code onto */ - IdentityMapAddrLow = IdentityMapAddrHigh + PAGE_SIZE; - IdentityMapVirt += PAGE_SIZE / sizeof(ULONG); - - /* Copy the kernel space */ - memcpy(IdentityMapVirt, - MmGlobalKernelPageDirectory, - PAGE_SIZE); - - /* Set up 512 4Mb pages (low 2Gig identity mapped) */ - for (i = 0; i < 512; i++) - { - IdentityMapVirt[i] = (i << 22) | PDE_PS_BIT | PDE_W_BIT | PDE_PRESENT_BIT; - } - +KdpEnableSafeMem(VOID) +{ KdpPhysAccess = TRUE; } -#else - -VOID -NTAPI -KdpEnableSafeMem(VOID) -{ - KdpPhysAccess = TRUE; -} -#endif +/* EOF */ Modified: trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_keyboard… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_keyboard.c [iso-8859-1] Mon Jun 22 15:31:57 2009 @@ -14,7 +14,6 @@ #define NDEBUG #include <debug.h> -#if 1 #define KBD_STATUS_REG 0x64 #define KBD_CNTL_REG 0x64 @@ -137,258 +136,4 @@ return -1; } -#endif - -#if 0 - -/* GLOBALS *******************************************************************/ - -/* - * Keyboard I/O ports. - */ -#define K_RDWR 0x60 /* keyboard data & cmds (read/write) */ -#define K_STATUS 0x64 /* keybd status (read-only) */ -#define K_CMD 0x64 /* keybd ctlr command (write-only) */ - -/* - * Bit definitions for K_STATUS port. - */ -#define K_OBUF_FUL 0x01 /* output (from keybd) buffer full */ -#define K_IBUF_FUL 0x02 /* input (to keybd) buffer full */ -#define K_SYSFLAG 0x04 /* "System Flag" */ -#define K_CMD_DATA 0x08 /* 1 = input buf has cmd, 0 = data */ -#define K_KBD_INHIBIT 0x10 /* 0 if keyboard inhibited */ -#define K_AUX_OBUF_FUL 0x20 /* 1 = obuf holds aux device data */ -#define K_TIMEOUT 0x40 /* timout error flag */ -#define K_PARITY_ERROR 0x80 /* parity error flag */ - -/* - * Keyboard controller commands (sent to K_CMD port). - */ -#define KC_CMD_READ 0x20 /* read controller command byte */ -#define KC_CMD_WRITE 0x60 /* write controller command byte */ -#define KC_CMD_DIS_AUX 0xa7 /* disable auxiliary device */ -#define KC_CMD_ENB_AUX 0xa8 /* enable auxiliary device */ -#define KC_CMD_TEST_AUX 0xa9 /* test auxiliary device interface */ -#define KC_CMD_SELFTEST 0xaa /* keyboard controller self-test */ -#define KC_CMD_TEST 0xab /* test keyboard interface */ -#define KC_CMD_DUMP 0xac /* diagnostic dump */ -#define KC_CMD_DISABLE 0xad /* disable keyboard */ -#define KC_CMD_ENABLE 0xae /* enable keyboard */ -#define KC_CMD_RDKBD 0xc4 /* read keyboard ID */ -#define KC_CMD_WIN 0xd0 /* read output port */ -#define KC_CMD_WOUT 0xd1 /* write output port */ -#define KC_CMD_ECHO 0xee /* used for diagnostic testing */ -#define KC_CMD_PULSE 0xff /* pulse bits 3-0 based on low nybble */ - -/* - * Keyboard commands (send to K_RDWR). - */ -#define K_CMD_LEDS 0xed /* set status LEDs (caps lock, etc.) */ -#define K_CMD_TYPEMATIC 0xf3 /* set key repeat and delay */ - -/* - * Bit definitions for controller command byte (sent following - * KC_CMD_WRITE command). - * - * Bits 0x02 and 0x80 unused, always set to 0. - */ -#define K_CB_ENBLIRQ 0x01 /* enable data-ready intrpt */ -#define K_CB_SETSYSF 0x04 /* Set System Flag */ -#define K_CB_INHBOVR 0x08 /* Inhibit Override */ -#define K_CB_DISBLE 0x10 /* disable keyboard */ -#define K_CB_IGNPARITY 0x20 /* ignore parity from keyboard */ -#define K_CB_SCAN 0x40 /* standard scan conversion */ - -/* - * Bit definitions for "Indicator Status Byte" (sent after a - * K_CMD_LEDS command). If the bit is on, the LED is on. Undefined - * bit positions must be 0. - */ -#define K_LED_SCRLLK 0x1 /* scroll lock */ -#define K_LED_NUMLK 0x2 /* num lock */ -#define K_LED_CAPSLK 0x4 /* caps lock */ - -/* - * Bit definitions for "Miscellaneous port B" (K_PORTB). - */ -/* read/write */ -#define K_ENABLETMR2 0x01 /* enable output from timer 2 */ -#define K_SPKRDATA 0x02 /* direct input to speaker */ -#define K_ENABLEPRTB 0x04 /* "enable" port B */ -#define K_EIOPRTB 0x08 /* enable NMI on parity error */ -/* read-only */ -#define K_REFRESHB 0x10 /* refresh flag from INLTCONT PAL */ -#define K_OUT2B 0x20 /* timer 2 output */ -#define K_ICKB 0x40 /* I/O channel check (parity error) */ - -/* - * Bit definitions for the keyboard controller's output port. - */ -#define KO_SYSRESET 0x01 /* processor reset */ -#define KO_GATE20 0x02 /* A20 address line enable */ -#define KO_AUX_DATA_OUT 0x04 /* output data to auxiliary device */ -#define KO_AUX_CLOCK 0x08 /* auxiliary device clock */ -#define KO_OBUF_FUL 0x10 /* keyboard output buffer full */ -#define KO_AUX_OBUF_FUL 0x20 /* aux device output buffer full */ -#define KO_CLOCK 0x40 /* keyboard clock */ -#define KO_DATA_OUT 0x80 /* output data to keyboard */ - -/* - * Keyboard return codes. - */ -#define K_RET_RESET_DONE 0xaa /* BAT complete */ -#define K_RET_ECHO 0xee /* echo after echo command */ -#define K_RET_ACK 0xfa /* ack */ -#define K_RET_RESET_FAIL 0xfc /* BAT error */ -#define K_RET_RESEND 0xfe /* resend request */ - -#define SHIFT -1 -#define CTRL -2 -#define META -3 - -static char keymap[128][2] = { - {0}, /* 0 */ - {27, 27}, /* 1 - ESC */ - {'1', '!'}, /* 2 */ - {'2', '@'}, - {'3', '#'}, - {'4', '$'}, - {'5', '%'}, - {'6', '^'}, - {'7', '&'}, - {'8', '*'}, - {'9', '('}, - {'0', ')'}, - {'-', '_'}, - {'=', '+'}, - {8, 8}, /* 14 - Backspace */ - {'\t', '\t'}, /* 15 */ - {'q', 'Q'}, - {'w', 'W'}, - {'e', 'E'}, - {'r', 'R'}, - {'t', 'T'}, - {'y', 'Y'}, - {'u', 'U'}, - {'i', 'I'}, - {'o', 'O'}, - {'p', 'P'}, - {'[', '{'}, - {']', '}'}, /* 27 */ - {'\r', '\r'}, /* 28 - Enter */ - {CTRL, CTRL}, /* 29 - Ctrl */ - {'a', 'A'}, /* 30 */ - {'s', 'S'}, - {'d', 'D'}, - {'f', 'F'}, - {'g', 'G'}, - {'h', 'H'}, - {'j', 'J'}, - {'k', 'K'}, - {'l', 'L'}, - {';', ':'}, - {'\'', '"'}, /* 40 */ - {'`', '~'}, /* 41 */ - {SHIFT, SHIFT}, /* 42 - Left Shift */ - {'\\', '|'}, /* 43 */ - {'z', 'Z'}, /* 44 */ - {'x', 'X'}, - {'c', 'C'}, - {'v', 'V'}, - {'b', 'B'}, - {'n', 'N'}, - {'m', 'M'}, - {',', '<'}, - {'.', '>'}, - {'/', '?'}, /* 53 */ - {SHIFT, SHIFT}, /* 54 - Right Shift */ - {0, 0}, /* 55 - Print Screen */ - {META, META}, /* 56 - Alt */ - {' ', ' '}, /* 57 - Space bar */ - {0, 0}, /* 58 - Caps Lock */ - {0, 0}, /* 59 - F1 */ - {0, 0}, /* 60 - F2 */ - {0, 0}, /* 61 - F3 */ - {0, 0}, /* 62 - F4 */ - {0, 0}, /* 63 - F5 */ - {0, 0}, /* 64 - F6 */ - {0, 0}, /* 65 - F7 */ - {0, 0}, /* 66 - F8 */ - {0, 0}, /* 67 - F9 */ - {0, 0}, /* 68 - F10 */ - {0, 0}, /* 69 - Num Lock */ - {0, 0}, /* 70 - Scroll Lock */ - {'7', '7'}, /* 71 - Numeric keypad 7 */ - {'8', '8'}, /* 72 - Numeric keypad 8 */ - {'9', '9'}, /* 73 - Numeric keypad 9 */ - {'-', '-'}, /* 74 - Numeric keypad '-' */ - {'4', '4'}, /* 75 - Numeric keypad 4 */ - {'5', '5'}, /* 76 - Numeric keypad 5 */ - {'6', '6'}, /* 77 - Numeric keypad 6 */ - {'+', '+'}, /* 78 - Numeric keypad '+' */ - {'1', '1'}, /* 79 - Numeric keypad 1 */ - {'2', '2'}, /* 80 - Numeric keypad 2 */ - {'3', '3'}, /* 81 - Numeric keypad 3 */ - {'0', '0'}, /* 82 - Numeric keypad 0 */ - {'.', '.'}, /* 83 - Numeric keypad '.' */ -}; - -/* FUNCTIONS *****************************************************************/ - -/* - * Quick poll for a pending input character. - * Returns a character if available, -1 otherwise. This routine can return - * false negatives in the following cases: - * - * - a valid character is in transit from the keyboard when called - * - a key release is received (from a previous key press) - * - a SHIFT key press is received (shift state is recorded however) - * - a key press for a multi-character sequence is received - * - * Yes, this is horrible. - */ -ULONG -KdbpTryGetCharKeyboard(VOID) -{ - static unsigned shift_state, ctrl_state, meta_state; - unsigned scan_code, ch; - - /* See if a scan code is ready, returning if none. */ - if ((READ_PORT_UCHAR((PUCHAR)K_STATUS) & K_OBUF_FUL) == 0) { - return -1; - } - scan_code = READ_PORT_UCHAR((PUCHAR)K_RDWR); - - /* Handle key releases - only release of SHIFT is important. */ - if (scan_code & 0x80) { - scan_code &= 0x7f; - if (keymap[scan_code][0] == SHIFT) - shift_state = 0; - else if (keymap[scan_code][0] == CTRL) - ctrl_state = 0; - else if (keymap[scan_code][0] == META) - meta_state = 0; - ch = -1; - } else { - /* Translate the character through the keymap. */ - ch = keymap[scan_code][shift_state] | meta_state; - if (ch == SHIFT) { - shift_state = 1; - ch = -1; - } else if (ch == CTRL) { - ctrl_state = 1; - ch = -1; - } else if (ch == META) { - meta_state = 0200; - ch = -1; - } else if (ch == 0) - ch = -1; - else if (ctrl_state) - ch = (keymap[scan_code][1] - '@') | meta_state; - } - - return ch; -} - -#endif +/* EOF */

15 years, 4 months

[tkreuzer] 41531: fix pointer <-> DWORD casts

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Mon Jun 22 15:15:14 2009 New Revision: 41531 URL: http://svn.reactos.org/svn/reactos?rev=41531&view=rev Log: fix pointer <-> DWORD casts Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/exitros.c Modified: branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/exitros.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/subsy… ============================================================================== --- branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/subsystems/win32/csrss/win32csr/exitros.c [iso-8859-1] Mon Jun 22 15:15:14 2009 @@ -57,7 +57,7 @@ DPRINT1("Can't get window creator\n"); return STATUS_INVALID_HANDLE; } - if (WindowCreator != (DWORD)LogonProcess) + if (WindowCreator != (DWORD_PTR)LogonProcess) { DPRINT1("Trying to register window not created by winlogon as notify window\n"); return STATUS_ACCESS_DENIED; @@ -481,7 +481,7 @@ } else { - Context.ProcessId = (DWORD) ProcessData->ProcessId; + Context.ProcessId = (DWORD_PTR) ProcessData->ProcessId; Context.wParam = 0; Context.lParam = (0 != (Flags & EWX_INTERNAL_FLAG_LOGOFF) ? ENDSESSION_LOGOFF : 0); @@ -527,7 +527,7 @@ /* Terminate this process */ Process = OpenProcess(PROCESS_TERMINATE, FALSE, - (DWORD) ProcessData->ProcessId); + (DWORD_PTR) ProcessData->ProcessId); if (NULL == Process) { DPRINT1("Unable to open process %d, error %d\n", ProcessData->ProcessId, @@ -560,7 +560,7 @@ PCSRSS_PROCESS_DATA *NewData; /* Do not kill winlogon or csrss */ - if ((DWORD) ProcessData->ProcessId == Context->CsrssProcess || + if ((DWORD_PTR) ProcessData->ProcessId == Context->CsrssProcess || ProcessData->ProcessId == LogonProcess) { return STATUS_SUCCESS; @@ -568,7 +568,7 @@ /* Get the login session of this process */ Process = OpenProcess(PROCESS_QUERY_INFORMATION, FALSE, - (DWORD) ProcessData->ProcessId); + (DWORD_PTR) ProcessData->ProcessId); if (NULL == Process) { DPRINT1("Unable to open process %d, error %d\n", ProcessData->ProcessId, @@ -600,7 +600,7 @@ &(Origin.OriginatingLogonSession))) { /* Kill the shell process last */ - if ((DWORD) ProcessData->ProcessId == Context->ShellProcess) + if ((DWORD_PTR) ProcessData->ProcessId == Context->ShellProcess) { ProcessData->ShutdownLevel = 0; } @@ -767,7 +767,7 @@ TOKEN_USER *UserInfo; SHUTDOWN_SETTINGS ShutdownSettings; - if (ProcessId != (DWORD) LogonProcess) + if (ProcessId != (DWORD_PTR) LogonProcess) { DPRINT1("Internal ExitWindowsEx call not from winlogon\n"); return STATUS_ACCESS_DENIED; @@ -928,13 +928,13 @@ if (0 == (Request->Data.ExitReactosRequest.Flags & EWX_INTERNAL_FLAG)) { - return UserExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, + return UserExitReactos((DWORD_PTR) Request->Header.ClientId.UniqueProcess, Request->Data.ExitReactosRequest.Flags); } else { - return InternalExitReactos((DWORD) Request->Header.ClientId.UniqueProcess, - (DWORD) Request->Header.ClientId.UniqueThread, + return InternalExitReactos((DWORD_PTR) Request->Header.ClientId.UniqueProcess, + (DWORD_PTR) Request->Header.ClientId.UniqueThread, Request->Data.ExitReactosRequest.Flags); } }

15 years, 4 months

[ros-arm-bringup] 41530: - Initialize system PTE space.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 22 14:22:19 2009 New Revision: 41530 URL: http://svn.reactos.org/svn/reactos?rev=41530&view=rev Log: - Initialize system PTE space. Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/syspte.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Mon Jun 22 14:22:19 2009 @@ -443,6 +443,11 @@ ASSERT((MmNumberOfSystemPtes - OldCount) <= 1000); DPRINT1("Final System PTE count: %d (%d bytes)\n", MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); + + // + // Create the system PTE space + // + MiInitializeSystemPtes(PointerPte, MmNumberOfSystemPtes, SystemPteSpace); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Mon Jun 22 14:22:19 2009 @@ -23,6 +23,7 @@ PMMPTE MmSystemPtesEnd[MaximumPtePoolTypes]; MMPTE MmFirstFreeSystemPte[MaximumPtePoolTypes]; ULONG MmTotalFreeSystemPtes[MaximumPtePoolTypes]; +ULONG MmTotalSystemPtes; /* PRIVATE FUNCTIONS **********************************************************/ @@ -36,7 +37,6 @@ // Sanity checks // ASSERT(NumberOfPtes >= 1); - ASSERT(PoolType == NonPagedPoolExpansion); // // Set the starting and ending PTE addresses for this space @@ -71,6 +71,17 @@ // We also keep a global for it // MmTotalFreeSystemPtes[PoolType] = NumberOfPtes; + + // + // Check if this is the system PTE space + // + if (PoolType == SystemPteSpace) + { + // + // Remember how many PTEs we have + // + MmTotalSystemPtes = NumberOfPtes; + } } /* EOF */

15 years, 4 months

[ros-arm-bringup] 41529: - Initialize count of System PTEs: - Use 7000 for systems with 19MB of RAM or less, 11000 for systems between 19 and 32MB of RAM, and 22000 for systems with more than that. - Windows will go up to 50000 on server machines, but this is likely not needed now (22000 system PTEs is roughly 100 MB). - This now affects the calculation of MmNonPagedSystemStart, which is now correct and reflects the nonpaged address space of the system. - System PTEs are not yet initialized (but

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 22 13:34:24 2009 New Revision: 41529 URL: http://svn.reactos.org/svn/reactos?rev=41529&view=rev Log: - Initialize count of System PTEs: - Use 7000 for systems with 19MB of RAM or less, 11000 for systems between 19 and 32MB of RAM, and 22000 for systems with more than that. - Windows will go up to 50000 on server machines, but this is likely not needed now (22000 system PTEs is roughly 100 MB). - This now affects the calculation of MmNonPagedSystemStart, which is now correct and reflects the nonpaged address space of the system. - System PTEs are not yet initialized (but their page tables are mapped by the same code which maps nonpaged pool expansion VA page tables). Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Mon Jun 22 13:34:24 2009 @@ -94,6 +94,13 @@ PVOID MmNonPagedPoolStart; PVOID MmNonPagedPoolExpansionStart; PVOID MmNonPagedPoolEnd = (PVOID)0xFFBE0000; + +// +// Windows NT seems to choose between 7000, 11000 and 50000 +// On systems with more than 32MB, this number is then doubled, and further +// aligned up to a PDE boundary (4MB). +// +ULONG MmNumberOfSystemPtes; /* PRIVATE FUNCTIONS **********************************************************/ @@ -109,11 +116,40 @@ MMPTE TempPde = HyperTemplatePte, TempPte = HyperTemplatePte; PVOID NonPagedPoolExpansionVa, BaseAddress; NTSTATUS Status; + ULONG OldCount; BoundaryAddressMultiple.QuadPart = Low.QuadPart = 0; High.QuadPart = -1; if (Phase == 0) { + // + // Check if this is a machine with less than 19MB of RAM + // + if (MmNumberOfPhysicalPages < MI_MIN_PAGES_FOR_SYSPTE_TUNING) + { + // + // Use the very minimum of system PTEs + // + MmNumberOfSystemPtes = 7000; + } + else + { + // + // Use the default, but check if we have more than 32MB of RAM + // + MmNumberOfSystemPtes = 11000; + if (MmNumberOfPhysicalPages > MI_MIN_PAGES_FOR_SYSPTE_BOOST) + { + // + // Double the amount of system PTEs + // + MmNumberOfSystemPtes <<= 1; + } + } + + DPRINT1("System PTE count has been tuned to %d (%d bytes)\n", + MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); + // // Check if this is a machine with less than 256MB of RAM, and no overide // @@ -212,28 +248,47 @@ NonPagedPoolExpansionVa = MmNonPagedPoolStart; DPRINT1("NP Pool has been tuned to: %d bytes and %d bytes\n", MmSizeOfNonPagedPoolInBytes, MmMaximumNonPagedPoolInBytes); - DPRINT1("NP Expansion VA begins at: %p and ends at: %p\n", - MmNonPagedPoolStart, MmNonPagedPoolEnd); - - // - // Now calculate the nonpaged system VA region - // This includes nonpaged pool expansion (above) and the system PTEs - // Since there are no system PTEs yet, this is (for now) the same - // - MmNonPagedSystemStart = MmNonPagedPoolStart; - DPRINT1("NP System VA (later will be System PTEs) start at: %p\n", - MmNonPagedSystemStart); - + + // + // Now calculate the nonpaged system VA region, which includes the + // nonpaged pool expansion (above) and the system PTEs. Note that it is + // then aligned to a PDE boundary (4MB). + // + MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedPoolStart - + (MmNumberOfSystemPtes + 1) * PAGE_SIZE); + MmNonPagedSystemStart = (PVOID)((ULONG_PTR)MmNonPagedSystemStart & + ~((4 * 1024 * 1024) - 1)); + + // + // Don't let it go below the minimum + // + if (MmNonPagedSystemStart < (PVOID)0xEB000000) + { + // + // This is a hard-coded limit in the Windows NT address space + // + MmNonPagedSystemStart = (PVOID)0xEB000000; + + // + // Reduce the amount of system PTEs to reach this point + // + MmNumberOfSystemPtes = ((ULONG_PTR)MmNonPagedPoolStart - + (ULONG_PTR)MmNonPagedSystemStart) >> + PAGE_SHIFT; + MmNumberOfSystemPtes--; + ASSERT(MmNumberOfSystemPtes > 1000); + } + // // Non paged pool should come after the PFN database, but since we are // co-existing with the ReactOS NP pool, our "ARM Pool" will instead // start at this arbitrarly chosen base address. // When ARM pool becomes non paged pool, this needs to be changed. // + DPRINT1("System PTE VA starts at: %p\n", MmNonPagedSystemStart); + DPRINT1("NP Expansion VA begins at: %p and ends at: %p\n", + MmNonPagedPoolStart, MmNonPagedPoolEnd); MmNonPagedPoolStart = (PVOID)0xA0000000; - DPRINT1("NP VA begins at: %p and ends at: %p\n", - MmNonPagedPoolStart, - (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes); // // Now we actually need to get these many physical pages. Nonpaged pool @@ -244,11 +299,14 @@ High, BoundaryAddressMultiple); ASSERT(PageFrameIndex != 0); + DPRINT1("NP VA begins at: %p and ends at: %p\n", + MmNonPagedPoolStart, + (ULONG_PTR)MmNonPagedPoolStart + MmSizeOfNonPagedPoolInBytes); DPRINT1("NP PA PFN begins at: %lx\n", PageFrameIndex); // // Now we need some pages to create the page tables for the NP system VA - // which would normally include system PTEs and expansion NP + // which includes system PTEs and expansion NP // StartPde = MiAddressToPde(MmNonPagedSystemStart); EndPde = MiAddressToPde((PVOID)((ULONG_PTR)MmNonPagedPoolEnd - 1)); @@ -311,7 +369,7 @@ } // - // Now rememeber where the expansion starts + // Now remember where the expansion starts // MmNonPagedPoolExpansionStart = NonPagedPoolExpansionVa; @@ -348,7 +406,7 @@ ASSERT(Status == STATUS_SUCCESS); // - // And we need one more for the system NP (expansion NP only for now) + // And we need one more for the system NP // BaseAddress = MmNonPagedSystemStart; Status = MmCreateMemoryArea(MmGetKernelAddressSpace(), @@ -364,9 +422,27 @@ ASSERT(Status == STATUS_SUCCESS); // + // Sanity check: make sure we have properly defined the system PTE space + // + ASSERT(MiAddressToPte(MmNonPagedSystemStart) < + MiAddressToPte(MmNonPagedPoolExpansionStart)); + + // // Now go ahead and initialize the ARM pool // MiInitializeArmPool(); + + // + // We PDE-aligned the nonpaged system start VA, so haul some extra PTEs! + // + PointerPte = MiAddressToPte(MmNonPagedSystemStart); + OldCount = MmNumberOfSystemPtes; + MmNumberOfSystemPtes = MiAddressToPte(MmNonPagedPoolExpansionStart) - + PointerPte; + MmNumberOfSystemPtes--; + ASSERT((MmNumberOfSystemPtes - OldCount) <= 1000); + DPRINT1("Final System PTE count: %d (%d bytes)\n", + MmNumberOfSystemPtes, MmNumberOfSystemPtes * PAGE_SIZE); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Jun 22 13:34:24 2009 @@ -7,6 +7,8 @@ */ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_TUNING ((19*1024*1024) >> PAGE_SHIFT) +#define MI_MIN_PAGES_FOR_SYSPTE_BOOST ((32*1024*1024) >> PAGE_SHIFT) #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_FREE_PAGE_LISTS 4

15 years, 4 months

← Newer
1
...
16
17
18
19
20
21
22
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009