Ros-diffs December 2008

ros-diffs@reactos.org

31 participants
710 discussions

[dreimer] 37994: Bug 3942: "Translate update norwegian" by Lars Martin Hambro Small sidenote: I accidently commited a patch for XBox Support from Martin_sW in r31325 ~1 year ago... It adds handover XBox HDD information to ROS Kernel into freeldr and is needed for new ROS Versions to start on XBox. This + xbox hal + xbox vbe driver + moddded bootvid driver (not commited yet (/me looks at Fireball)) makes ROS boot on XBox.
by dreimer＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: dreimer Date: Wed Dec 10 01:08:31 2008 New Revision: 37994 URL: http://svn.reactos.org/svn/reactos?rev=37994&view=rev Log: Bug 3942: "Translate update norwegian" by Lars Martin Hambro Small sidenote: I accidently commited a patch for XBox Support from Martin_sW in r31325 ~1 year ago... It adds handover XBox HDD information to ROS Kernel into freeldr and is needed for new ROS Versions to start on XBox. This + xbox hal + xbox vbe driver + moddded bootvid driver (not commited yet (/me looks at Fireball)) makes ROS boot on XBox. Modified: trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/dll/win32/netshell/lang/no-NO.rc Modified: trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… ============================================================================== --- trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/applications/games/solitaire/lang/no-NO.rc [iso-8859-1] Wed Dec 10 01:08:31 2008 @@ -51,7 +51,7 @@ IDS_SOL_ABOUT "Kabal av J Brown\n\nCardLib versjon 1.0." IDS_SOL_QUIT "Slutt nåværende spill?" IDS_SOL_WIN "Gratulerer, du vant!!" - IDS_SOL_DEAL "Deal again?" + IDS_SOL_DEAL "Del ut igjen?" END Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… ============================================================================== --- trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/base/setup/reactos/lang/no-NO.rc [iso-8859-1] Wed Dec 10 01:08:31 2008 @@ -60,12 +60,29 @@ LISTBOX IDC_PARTITION, 20,12,278,142,LBS_HASSTRINGS | WS_VSCROLL PUSHBUTTON "&Opprett", IDC_PARTCREATE, 20,155,50,15 PUSHBUTTON "&Slett", IDC_PARTDELETE, 76,155,50,15 + PUSHBUTTON "S&tasjon", IDC_DEVICEDRIVER, 162,155,50,15, WS_DISABLED PUSHBUTTON "&Avansert valg...", IDC_PARTMOREOPTS, 218,155,80,15 LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 10, 180 ,277, 20 END +IDD_PARTITION DIALOGEX DISCARDABLE 0, 0, 145, 90 +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME +CAPTION "Opprett partisjon" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "",IDC_UPDOWN1,"msctls_updown32", WS_VISIBLE,104,22,9,13 + CONTROL "Opprett og formater partisjon",IDC_STATIC,"Button",BS_GROUPBOX,7,5,129,57 + LTEXT "Størrelse:",IDC_STATIC, 13,24,27,9 + EDITTEXT IDC_PARTSIZE,52,23,53,13, WS_VISIBLE|WS_TABSTOP + LTEXT "GB",IDC_UNIT, 117,24,14,9 + LTEXT "Filsystem:",IDC_STATIC,13,46,35,9 + CONTROL "",IDC_FSTYPE,"ComboBox",WS_VISIBLE|WS_TABSTOP|CBS_DROPDOWNLIST,52,42,79,50 + PUSHBUTTON "&OK",IDOK,35,68,47,15, WS_VISIBLE|WS_TABSTOP + PUSHBUTTON "&Avbryt",IDCANCEL,87,68,47,15, WS_VISIBLE|WS_TABSTOP +END + IDD_BOOTOPTIONS DIALOGEX DISCARDABLE 0, 0, 305, 105 -STYLE WS_VISIBLE|WS_CAPTION|WS_SYSMENU|WS_THICKFRAME +STYLE WS_VISIBLE|WS_CAPTION|WS_THICKFRAME CAPTION "Avansert partisjon innstillinger" FONT 8, "MS Shell Dlg" BEGIN @@ -77,7 +94,16 @@ CONTROL "Installer oppstartslaster på harddiskens (MBR)", IDC_INSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP, 10,46,278,11 CONTROL "Ikke installer oppstartslaster", IDC_NOINSTFREELDR, "Button", BS_AUTORADIOBUTTON | WS_TABSTOP | WS_DISABLED , 10,57,278,11 PUSHBUTTON "&OK", IDOK, 180,83,50,15, WS_TABSTOP | WS_VISIBLE - PUSHBUTTON "&Cancel", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE + PUSHBUTTON "&Avbryt", IDCANCEL, 240,83,50,15, WS_TABSTOP | WS_VISIBLE +END + +IDD_SUMMARYPAGE DIALOGEX 0, 0, 317, 193 +STYLE DS_SHELLFONT | DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "ReactOS installering" +FONT 8, "MS Shell Dlg" +BEGIN + CONTROL "Installasjon oppsumering", IDC_ACTION, "Button", BS_GROUPBOX, 10,0,297,172 + LTEXT "Trykk på Neste for å starte installasjon prosessen.", IDC_STATIC, 10, 180 ,277, 20 END IDD_PROCESSPAGE DIALOGEX 0, 0, 317, 193 @@ -103,13 +129,13 @@ LTEXT "Når du trykker Fullført, vil din datamaskin starte på nytt.", IDC_STATIC, 20, 80, 277, 10 CONTROL "", IDC_RESTART_PROGRESS, "msctls_progress32", PBS_SMOOTH | WS_CHILD | WS_VISIBLE | WS_BORDER, 20, 120, 277, 8 - LTEXT "Hvis du fortsatt har CD platen i stasjon, fjern denne. Også, for å starte din datamaskin på nytt, trykk på Fullført.", IDC_STATIC, 10, 180, 297, 20 + LTEXT "Hvis du fortsatt har CD platen i stasjon, fjern denne. For å starte din datamaskin på nytt, trykk på Fullført.", IDC_STATIC, 10, 180, 297, 20 END STRINGTABLE BEGIN - IDS_LANGTITLE "Språk valg" + IDS_LANGTITLE "Språkvalg" IDS_LANGSUBTITLE "Velg språk for installering og til ferdig system." IDS_TYPETITLE "Velkommen til ReactOS installering" IDS_TYPESUBTITLE "Velg installering type." @@ -121,6 +147,8 @@ IDS_PROCESSSUBTITLE "Opprett og formater partisjon, kopier filer, installere og sett opp oppstartlaster" IDS_RESTARTTITLE "Første steget av installering er fullført" IDS_RESTARTSUBTITLE "Første steget av installering har blitt fullført, start på nytt for å fortsette til andre steget" + IDS_SUMMARYTITLE "Installasjon oppsumering" + IDS_SUMMARYSUBTITLE "Sjekk listen av installasjon egenskapene før du fortsetter installasjon av enhetene" IDS_ABORTSETUP "ReactOS er ikke fullstendig installert på datamaskinen. Hvis du avslutter nå, trenger du å kjøre installeringen på nytt for å installere Reactos. Vil du virkelig avslutte?" IDS_ABORTSETUP2 "Avbryt installasjonen?" END Modified: trunk/reactos/dll/win32/netshell/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netshell/lang/no… ============================================================================== --- trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netshell/lang/no-NO.rc [iso-8859-1] Wed Dec 10 01:08:31 2008 @@ -73,18 +73,18 @@ IDD_LAN_NETSTATUSDETAILS DIALOGEX DISCARDABLE 0, 0, 200,200 STYLE DS_SHELLFONT | WS_POPUP | WS_CAPTION -CAPTION "Network Connection Details" +CAPTION "Nettverk tilkobling detaljer" FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Network Connection &Details:", -1, 15, 9, 170, 12 + LTEXT "Nettverk tilkobling &detaljer:", -1, 15, 9, 170, 12 CONTROL "", IDC_DETAILS, "SysListView32", LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP, 15, 25, 170, 130 - PUSHBUTTON "&Close", IDC_CLOSE, 125, 165, 62, 14 + PUSHBUTTON "&Lukk", IDC_CLOSE, 125, 165, 62, 14 END STRINGTABLE DISCARDABLE BEGIN IDS_PHYSICAL_ADDRESS "Physical Address" - IDS_IP_ADDRESS "IP Address" + IDS_IP_ADDRESS "IP addresse" IDS_SUBNET_MASK "Subnet Mask" IDS_DEF_GATEWAY "Default Gateway" IDS_DHCP_SERVER "DHCP Server"

1 0

[cgutman] 37993: - Unregister the interface before destroying it
by cgutman＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: cgutman Date: Tue Dec 9 19:51:32 2008 New Revision: 37993 URL: http://svn.reactos.org/svn/reactos?rev=37993&view=rev Log: - Unregister the interface before destroying it Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c Modified: branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/tcpip/datalink/lan.c [iso-8859-1] Tue Dec 9 19:51:32 2008 @@ -991,6 +991,7 @@ if (NdisStatus != NDIS_STATUS_SUCCESS) { TI_DbgPrint(DEBUG_DATALINK, ("Could not set packet filter (0x%X).\n", NdisStatus)); + IPUnregisterInterface(IF); IPDestroyInterface(IF); return FALSE; }

1 0

[tkreuzer] 37992: Goodbye kdbg, hello WINKD
by tkreuzer＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: tkreuzer Date: Tue Dec 9 19:27:58 2008 New Revision: 37992 URL: http://svn.reactos.org/svn/reactos?rev=37992&view=rev Log: Goodbye kdbg, hello WINKD Modified: branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild Modified: branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/confi… ============================================================================== --- branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/config-amd64.template.rbuild [iso-8859-1] Tue Dec 9 19:27:58 2008 @@ -43,7 +43,7 @@  -<property name="KDBG" value="1" /> +<property name="KDBG" value="0" />  -<property name="_WINKD_" value="0" /> +<property name="_WINKD_" value="1" /> <!-- Whether to compile support for ELF files. Do not enable unless you know what

1 0

[tkreuzer] 37991: Fix hal build
by tkreuzer＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: tkreuzer Date: Tue Dec 9 19:26:44 2008 New Revision: 37991 URL: http://svn.reactos.org/svn/reactos?rev=37991&view=rev Log: Fix hal build Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h Modified: branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halx86/include/apic.h [iso-8859-1] Tue Dec 9 19:26:44 2008 @@ -186,7 +186,7 @@ { PULONG p; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); return *p; } @@ -196,7 +196,7 @@ { PULONG p; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); *p = Value; } @@ -210,7 +210,7 @@ lastregw[CPU] = Offset; lastvalw[CPU] = Value; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); *p = Value; } @@ -221,7 +221,7 @@ { PULONG p; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); return *p; } #else @@ -233,7 +233,7 @@ lastregr[CPU] = Offset; lastvalr[CPU] = 0; - p = (PULONG)((ULONG)APICBase + Offset); + p = (PULONG)((ULONG_PTR)APICBase + Offset); lastvalr[CPU] = *p; return lastvalr[CPU];

1 0

[tkreuzer] 37990: add CBSTACK constants, need to check for correctness
by tkreuzer＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: tkreuzer Date: Tue Dec 9 19:26:10 2008 New Revision: 37990 URL: http://svn.reactos.org/svn/reactos?rev=37990&view=rev Log: add CBSTACK constants, need to check for correctness Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h Modified: branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/inclu… ============================================================================== --- branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/include/ndk/amd64/asm.h [iso-8859-1] Tue Dec 9 19:26:10 2008 @@ -235,6 +235,16 @@ #define PRIMARY_VECTOR_BASE 0x30 #define MAXIMUM_IDTVECTOR 0xFF +// +// Usermode callout frame definitions +// +#define CBSTACK_STACK 0x0 +#define CBSTACK_TRAP_FRAME 0x8 +#define CBSTACK_CALLBACK_STACK 0x10 +#define CBSTACK_RBP 0x18 +#define CBSTACK_RESULT 0x20 +#define CBSTACK_RESULT_LENGTH 0x28 + /* Following ones are ASM only! ***********************************************/

1 0

[tkreuzer] 37989: Make winkd somewhat portable.
by tkreuzer＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: tkreuzer Date: Tue Dec 9 19:25:09 2008 New Revision: 37989 URL: http://svn.reactos.org/svn/reactos?rev=37989&view=rev Log: Make winkd somewhat portable. Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/ (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/ (with props) branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kd-i386.c (with props) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kddata.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdtrap.c branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/kd64.h [iso-8859-1] Tue Dec 9 19:25:09 2008 @@ -243,6 +243,20 @@ KdpAddBreakpoint( IN PVOID Address ); + +VOID +NTAPI +KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, + IN PCONTEXT Context); + +BOOLEAN +NTAPI +KdpReport(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException); // // Global KD Data Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Dec 9 19:25:09 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c [iso-8859-1] Tue Dec 9 19:25:09 2008 @@ -1,0 +1,155 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/i386/kdapi-i386.c + * PURPOSE: KD64 i386 Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, + IN PCONTEXT Context) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Copy i386 specific debug registers */ + WaitStateChange->ControlReport.Dr6 = Prcb->ProcessorState.SpecialRegisters. + KernelDr6; + WaitStateChange->ControlReport.Dr7 = Prcb->ProcessorState.SpecialRegisters. + KernelDr7; + + /* Copy i386 specific segments */ + WaitStateChange->ControlReport.SegCs = (USHORT)Context->SegCs; + WaitStateChange->ControlReport.SegDs = (USHORT)Context->SegDs; + WaitStateChange->ControlReport.SegEs = (USHORT)Context->SegEs; + WaitStateChange->ControlReport.SegFs = (USHORT)Context->SegFs; + + /* Copy EFlags */ + WaitStateChange->ControlReport.EFlags = Context->EFlags; + + /* Set Report Flags */ + WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; + if (WaitStateChange->ControlReport.SegCs == KGDT_64_R0_CODE) + { + WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_CS; + } +} + +BOOLEAN +NTAPI +KdpTrap(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException) +{ + BOOLEAN Unload = FALSE; + ULONG64 Rip, Rax; + BOOLEAN Status = FALSE; + + /* + * Check if we got a STATUS_BREAKPOINT with a SubID for Print, Prompt or + * Load/Unload symbols. + */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && + (ExceptionRecord->ExceptionInformation[0] != BREAKPOINT_BREAK)) + { + /* Save EIP */ + Rip = ContextRecord->Rip; + + /* Check what kind of operation was requested from us */ + switch (ExceptionRecord->ExceptionInformation[0]) + { + /* DbgPrint */ + case BREAKPOINT_PRINT: + + /* Call the worker routine */ + Rax = KdpPrint(ContextRecord->R8, // ComponentId + ContextRecord->R9, // ComponentMask + (LPSTR)ExceptionRecord->ExceptionInformation[1], // String + (ULONG)ExceptionRecord->ExceptionInformation[2], // Length + PreviousMode, + TrapFrame, + ExceptionFrame, + &Status); + + /* Update the return value for the caller */ + ContextRecord->Rax = Rax; + break; + + /* DbgPrompt */ + case BREAKPOINT_PROMPT: + + /* Call the worker routine */ + while (TRUE); + Rax = 0; + Status = TRUE; + + /* Update the return value for the caller */ + ContextRecord->Rax = Rax; + break; + + /* DbgUnloadSymbols */ + case BREAKPOINT_UNLOAD_SYMBOLS: + + /* Drop into the load case below, with the unload parameter */ + Unload = TRUE; + + /* DbgLoadSymbols */ + case BREAKPOINT_LOAD_SYMBOLS: + + /* Call the worker routine */ + KdpSymbol((PVOID)ExceptionRecord->ExceptionInformation[1], + (PVOID)ExceptionRecord->ExceptionInformation[2], + Unload, + PreviousMode, + ContextRecord, + TrapFrame, + ExceptionFrame); + Status = TRUE; + break; + + /* DbgCommandString*/ + case BREAKPOINT_COMMAND_STRING: + + /* Call the worker routine */ + while (TRUE); + Status = TRUE; + + /* Anything else, do nothing */ + default: + + /* Get out */ + break; + } + + /* + * If EIP was not updated, we'll increment it ourselves so execution + * continues past the breakpoint. + */ + if (ContextRecord->Rip == Rip) ContextRecord->Rip++; + } + else + { + /* Call the worker routine */ + Status = KdpReport(TrapFrame, + ExceptionFrame, + ExceptionRecord, + ContextRecord, + PreviousMode, + SecondChanceException); + } + + /* Return TRUE or FALSE to caller */ + return Status; +} Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/amd64/kd-amd64.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Tue Dec 9 19:25:09 2008 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kd-i386.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kd-i386.c (added) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kd-i386.c [iso-8859-1] Tue Dec 9 19:25:09 2008 @@ -1,0 +1,155 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: GPL - See COPYING in the top level directory + * FILE: ntoskrnl/kd64/i386/kdapi-i386.c + * PURPOSE: KD64 i386 Support + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + */ + +/* INCLUDES ******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +/* PRIVATE FUNCTIONS *********************************************************/ + +VOID +NTAPI +KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, + IN PCONTEXT Context) +{ + PKPRCB Prcb = KeGetCurrentPrcb(); + + /* Copy i386 specific debug registers */ + WaitStateChange->ControlReport.Dr6 = Prcb->ProcessorState.SpecialRegisters. + KernelDr6; + WaitStateChange->ControlReport.Dr7 = Prcb->ProcessorState.SpecialRegisters. + KernelDr7; + + /* Copy i386 specific segments */ + WaitStateChange->ControlReport.SegCs = (USHORT)Context->SegCs; + WaitStateChange->ControlReport.SegDs = (USHORT)Context->SegDs; + WaitStateChange->ControlReport.SegEs = (USHORT)Context->SegEs; + WaitStateChange->ControlReport.SegFs = (USHORT)Context->SegFs; + + /* Copy EFlags */ + WaitStateChange->ControlReport.EFlags = Context->EFlags; + + /* Set Report Flags */ + WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; + if (WaitStateChange->ControlReport.SegCs == KGDT_R0_CODE) + { + WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_CS; + } +} + +BOOLEAN +NTAPI +KdpTrap(IN PKTRAP_FRAME TrapFrame, + IN PKEXCEPTION_FRAME ExceptionFrame, + IN PEXCEPTION_RECORD ExceptionRecord, + IN PCONTEXT ContextRecord, + IN KPROCESSOR_MODE PreviousMode, + IN BOOLEAN SecondChanceException) +{ + BOOLEAN Unload = FALSE; + ULONG Eip, Eax; + BOOLEAN Status = FALSE; + + /* + * Check if we got a STATUS_BREAKPOINT with a SubID for Print, Prompt or + * Load/Unload symbols. + */ + if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && + (ExceptionRecord->ExceptionInformation[0] != BREAKPOINT_BREAK)) + { + /* Save EIP */ + Eip = ContextRecord->Eip; + + /* Check what kind of operation was requested from us */ + switch (ExceptionRecord->ExceptionInformation[0]) + { + /* DbgPrint */ + case BREAKPOINT_PRINT: + + /* Call the worker routine */ + Eax = KdpPrint(ContextRecord->Ebx, + ContextRecord->Edi, + (LPSTR)ExceptionRecord->ExceptionInformation[1], + (ULONG)ExceptionRecord->ExceptionInformation[2], + PreviousMode, + TrapFrame, + ExceptionFrame, + &Status); + + /* Update the return value for the caller */ + ContextRecord->Eax = Eax; + break; + + /* DbgPrompt */ + case BREAKPOINT_PROMPT: + + /* Call the worker routine */ + while (TRUE); + Eax = 0; + Status = TRUE; + + /* Update the return value for the caller */ + ContextRecord->Eax = Eax; + break; + + /* DbgUnloadSymbols */ + case BREAKPOINT_UNLOAD_SYMBOLS: + + /* Drop into the load case below, with the unload parameter */ + Unload = TRUE; + + /* DbgLoadSymbols */ + case BREAKPOINT_LOAD_SYMBOLS: + + /* Call the worker routine */ + KdpSymbol((PVOID)ExceptionRecord->ExceptionInformation[1], + (PVOID)ExceptionRecord->ExceptionInformation[2], + Unload, + PreviousMode, + ContextRecord, + TrapFrame, + ExceptionFrame); + Status = TRUE; + break; + + /* DbgCommandString*/ + case BREAKPOINT_COMMAND_STRING: + + /* Call the worker routine */ + while (TRUE); + Status = TRUE; + + /* Anything else, do nothing */ + default: + + /* Get out */ + break; + } + + /* + * If EIP was not updated, we'll increment it ourselves so execution + * continues past the breakpoint. + */ + if (ContextRecord->Eip == Eip) ContextRecord->Eip++; + } + else + { + /* Call the worker routine */ + Status = KdpReport(TrapFrame, + ExceptionFrame, + ExceptionRecord, + ContextRecord, + PreviousMode, + SecondChanceException); + } + + /* Return TRUE or FALSE to caller */ + return Status; +} Propchange: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/i386/kd-i386.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdapi.c [iso-8859-1] Tue Dec 9 19:25:09 2008 @@ -173,7 +173,13 @@ WaitStateChange->Processor = (USHORT)KeGetCurrentPrcb()->Number; WaitStateChange->NumberProcessors = (ULONG)KeNumberProcessors; WaitStateChange->Thread = (ULONG)(LONG_PTR)KeGetCurrentThread(); +#if defined(_M_X86_) WaitStateChange->ProgramCounter = (ULONG)(LONG_PTR)Context->Eip; +#elif defined(_AMD64) + WaitStateChange->ProgramCounter = (ULONG)(LONG_PTR)Context->Rip; +#else +#error Unknown platform +#endif /* Zero out the Control Report */ RtlZeroMemory(&WaitStateChange->ControlReport, @@ -189,7 +195,7 @@ /* Clear all the breakpoints in this region */ HadBreakpoints = KdpDeleteBreakpointRange((PVOID)(LONG_PTR)WaitStateChange->ProgramCounter, - (PVOID)((ULONG)WaitStateChange->ProgramCounter + + (PVOID)((ULONG_PTR)WaitStateChange->ProgramCounter + WaitStateChange->ControlReport.InstructionCount - 1)); if (HadBreakpoints) { @@ -197,36 +203,6 @@ RtlCopyMemory(&WaitStateChange->ControlReport.InstructionStream[0], (PVOID)(ULONG_PTR)WaitStateChange->ProgramCounter, WaitStateChange->ControlReport.InstructionCount); - } -} - -VOID -NTAPI -KdpSetContextState(IN PDBGKD_WAIT_STATE_CHANGE64 WaitStateChange, - IN PCONTEXT Context) -{ - PKPRCB Prcb = KeGetCurrentPrcb(); - - /* Copy i386 specific debug registers */ - WaitStateChange->ControlReport.Dr6 = Prcb->ProcessorState.SpecialRegisters. - KernelDr6; - WaitStateChange->ControlReport.Dr7 = Prcb->ProcessorState.SpecialRegisters. - KernelDr7; - - /* Copy i386 specific segments */ - WaitStateChange->ControlReport.SegCs = (USHORT)Context->SegCs; - WaitStateChange->ControlReport.SegDs = (USHORT)Context->SegDs; - WaitStateChange->ControlReport.SegEs = (USHORT)Context->SegEs; - WaitStateChange->ControlReport.SegFs = (USHORT)Context->SegFs; - - /* Copy EFlags */ - WaitStateChange->ControlReport.EFlags = Context->EFlags; - - /* Set Report Flags */ - WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_SEGS; - if (WaitStateChange->ControlReport.SegCs == KGDT_R0_CODE) - { - WaitStateChange->ControlReport.ReportFlags = REPORT_INCLUDES_CS; } } Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kddata.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kddata.c [iso-8859-1] Tue Dec 9 19:25:09 2008 @@ -328,6 +328,8 @@ DBGKD_VERS_FLAG_DATA, #if defined(_M_IX86) IMAGE_FILE_MACHINE_I386, +#elif defined (_M_AMD64) + IMAGE_FILE_MACHINE_AMD64, #elif defined(_M_PPC) IMAGE_FILE_MACHINE_POWERPC, #elif defined(_M_MIPS) @@ -348,26 +350,32 @@ { {{0}}, 0, - {PtrToUlong(RtlpBreakWithStatusInstruction)}, + {(ULONG_PTR)RtlpBreakWithStatusInstruction}, 0, FIELD_OFFSET(KTHREAD, CallbackStack), CBSTACK_CALLBACK_STACK, +#if defined(_M_X86) CBSTACK_EBP, - 0, - {PtrToUlong(KiCallUserMode)}, +#elif defined (_M_AMD64) + CBSTACK_RBP, +#else +#error Invalid architecture +#endif + 0, + {(ULONG_PTR)KiCallUserMode}, {0}, - {PtrToUlong(&PsLoadedModuleList)}, - {PtrToUlong(&PsActiveProcessHead)}, - {PtrToUlong(&PspCidTable)}, - {PtrToUlong(&ExpSystemResourcesList)}, + {(ULONG_PTR)&PsLoadedModuleList}, + {(ULONG_PTR)&PsActiveProcessHead}, + {(ULONG_PTR)&PspCidTable}, + {(ULONG_PTR)&ExpSystemResourcesList}, {0}, // ExpPagedPoolDescriptor {0}, // ExpNumberOfPagedPools - {PtrToUlong(&KeTimeIncrement)}, - {PtrToUlong(&KeBugcheckCallbackListHead)}, - {PtrToUlong(KiBugCheckData)}, - {PtrToUlong(&IopErrorLogListHead)}, - {PtrToUlong(&ObpRootDirectoryObject)}, - {PtrToUlong(&ObpTypeObjectType)}, + {(ULONG_PTR)&KeTimeIncrement}, + {(ULONG_PTR)&KeBugcheckCallbackListHead}, + {(ULONG_PTR)KiBugCheckData}, + {(ULONG_PTR)&IopErrorLogListHead}, + {(ULONG_PTR)&ObpRootDirectoryObject}, + {(ULONG_PTR)&ObpTypeObjectType}, {0}, // MmSystemCacheStart {0}, // MmSystemCacheEnd {0}, // MmSystemCacheWs @@ -404,17 +412,17 @@ {0}, // MmResidentAvailablePages {0}, // PoolTrackTable {0}, // NonPagedPoolDescriptor - {PtrToUlong(&MmHighestUserAddress)}, - {PtrToUlong(&MmSystemRangeStart)}, - {PtrToUlong(&MmUserProbeAddress)}, - {PtrToUlong(KdPrintDefaultCircularBuffer)}, - {PtrToUlong(KdPrintDefaultCircularBuffer + 1)}, - {PtrToUlong(&KdPrintWritePointer)}, - {PtrToUlong(&KdPrintRolloverCount)}, + {(ULONG_PTR)&MmHighestUserAddress}, + {(ULONG_PTR)&MmSystemRangeStart}, + {(ULONG_PTR)&MmUserProbeAddress}, + {(ULONG_PTR)KdPrintDefaultCircularBuffer}, + {(ULONG_PTR)(KdPrintDefaultCircularBuffer + 1)}, + {(ULONG_PTR)&KdPrintWritePointer}, + {(ULONG_PTR)&KdPrintRolloverCount}, {0}, // MmLoadedUserImageList - {PtrToUlong(&NtBuildLab)}, + {(ULONG_PTR)&NtBuildLab}, {0}, - {PtrToUlong(KiProcessorBlock)}, + {(ULONG_PTR)KiProcessorBlock}, {0}, // MmUnloadedDrivers {0}, // MmLastUnloadedDrivers {0}, // MmTriageActionTaken @@ -424,7 +432,7 @@ {0}, // MmAllocatedNonPagedPool {0}, // MmPeakCommitment {0}, // MmtotalCommitLimitMaximum - {PtrToUlong(&CmNtCSDVersion)}, + {(ULONG_PTR)&CmNtCSDVersion}, {0}, // MmPhysicalMemoryBlock {0}, // MmSessionBase {0}, // MmSessionSize @@ -451,18 +459,31 @@ FIELD_OFFSET(KPRCB, ProcessorState.ContextFrame), FIELD_OFFSET(KPRCB, Number), sizeof(ETHREAD), - {PtrToUlong(KdPrintDefaultCircularBuffer)}, - {PtrToUlong(&KdPrintBufferSize)}, - {PtrToUlong(&KeLoaderBlock)}, + {(ULONG_PTR)KdPrintDefaultCircularBuffer}, + {(ULONG_PTR)&KdPrintBufferSize}, + {(ULONG_PTR)&KeLoaderBlock}, sizeof(KIPCR) + sizeof(KPRCB), FIELD_OFFSET(KIPCR, Self), +#if defined(_M_X86) FIELD_OFFSET(KPCR, Prcb), +#elif defined(_M_AMD64) + FIELD_OFFSET(KPCR, CurrentPrcb), +#else + #error Invalid architecture +#endif +#if defined(_M_X86) FIELD_OFFSET(KIPCR, PrcbData), - 0, - 0, - 0, - 0, - 0, +#elif defined(_M_AMD64) + FIELD_OFFSET(KIPCR, Prcb), +#else + #error Invalid architecture +#endif + 0, + 0, + 0, + 0, + 0, +#if defined(_M_X86) FIELD_OFFSET(KIPCR, PrcbData) + FIELD_OFFSET(KPRCB, ProcessorState.SpecialRegisters), KGDT_R0_CODE, @@ -473,6 +494,20 @@ KGDT_R3_TEB, KGDT_LDT, KGDT_TSS, +#elif defined(_M_AMD64) + FIELD_OFFSET(KIPCR, Prcb) + + FIELD_OFFSET(KPRCB, ProcessorState.SpecialRegisters), + KGDT_64_R0_CODE, + KGDT_64_DATA, + KGDT_64_DATA, + KGDT_64_R3_CODE, + KGDT_64_DATA, + KGDT_64_DATA, + 0, + KGDT_TSS, +#else + #error Invalid architecture +#endif 0, 0, {0}, // IopNumTriagDumpDataBlocks Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdinit.c [iso-8859-1] Tue Dec 9 19:25:09 2008 @@ -133,7 +133,7 @@ InLoadOrderLinks); /* Save the Kernel Base */ - PsNtosImageBase = (ULONG)LdrEntry->DllBase; + PsNtosImageBase = (ULONG_PTR)LdrEntry->DllBase; KdVersionBlock.KernBase = (ULONGLONG)(LONG_PTR)LdrEntry->DllBase; /* Check if we have a command line */ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdlock.c [iso-8859-1] Tue Dec 9 19:25:09 2008 @@ -75,7 +75,7 @@ KdPollBreakIn(VOID) { BOOLEAN DoBreak = FALSE; - ULONG Flags = 0; + ULONG_PTR Flags = 0; /* First make sure that KD is enabled */ if (KdDebuggerEnabled) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdtrap.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/kd64/kdtrap.c [iso-8859-1] Tue Dec 9 19:25:09 2008 @@ -81,116 +81,6 @@ BOOLEAN NTAPI -KdpTrap(IN PKTRAP_FRAME TrapFrame, - IN PKEXCEPTION_FRAME ExceptionFrame, - IN PEXCEPTION_RECORD ExceptionRecord, - IN PCONTEXT ContextRecord, - IN KPROCESSOR_MODE PreviousMode, - IN BOOLEAN SecondChanceException) -{ - BOOLEAN Unload = FALSE; - ULONG Eip, Eax; - BOOLEAN Status = FALSE; - - /* - * Check if we got a STATUS_BREAKPOINT with a SubID for Print, Prompt or - * Load/Unload symbols. - */ - if ((ExceptionRecord->ExceptionCode == STATUS_BREAKPOINT) && - (ExceptionRecord->ExceptionInformation[0] != BREAKPOINT_BREAK)) - { - /* Save EIP */ - Eip = ContextRecord->Eip; - - /* Check what kind of operation was requested from us */ - switch (ExceptionRecord->ExceptionInformation[0]) - { - /* DbgPrint */ - case BREAKPOINT_PRINT: - - /* Call the worker routine */ - Eax = KdpPrint(ContextRecord->Ebx, - ContextRecord->Edi, - (LPSTR)ExceptionRecord->ExceptionInformation[1], - (ULONG)ExceptionRecord->ExceptionInformation[2], - PreviousMode, - TrapFrame, - ExceptionFrame, - &Status); - - /* Update the return value for the caller */ - ContextRecord->Eax = Eax; - break; - - /* DbgPrompt */ - case BREAKPOINT_PROMPT: - - /* Call the worker routine */ - while (TRUE); - Eax = 0; - Status = TRUE; - - /* Update the return value for the caller */ - ContextRecord->Eax = Eax; - break; - - /* DbgUnloadSymbols */ - case BREAKPOINT_UNLOAD_SYMBOLS: - - /* Drop into the load case below, with the unload parameter */ - Unload = TRUE; - - /* DbgLoadSymbols */ - case BREAKPOINT_LOAD_SYMBOLS: - - /* Call the worker routine */ - KdpSymbol((PVOID)ExceptionRecord->ExceptionInformation[1], - (PVOID)ExceptionRecord->ExceptionInformation[2], - Unload, - PreviousMode, - ContextRecord, - TrapFrame, - ExceptionFrame); - Status = TRUE; - break; - - /* DbgCommandString*/ - case BREAKPOINT_COMMAND_STRING: - - /* Call the worker routine */ - while (TRUE); - Status = TRUE; - - /* Anything else, do nothing */ - default: - - /* Get out */ - break; - } - - /* - * If EIP was not updated, we'll increment it ourselves so execution - * continues past the breakpoint. - */ - if (ContextRecord->Eip == Eip) ContextRecord->Eip++; - } - else - { - /* Call the worker routine */ - Status = KdpReport(TrapFrame, - ExceptionFrame, - ExceptionRecord, - ContextRecord, - PreviousMode, - SecondChanceException); - } - - /* Return TRUE or FALSE to caller */ - return Status; -} - -BOOLEAN -NTAPI KdpStub(IN PKTRAP_FRAME TrapFrame, IN PKEXCEPTION_FRAME ExceptionFrame, IN PEXCEPTION_RECORD ExceptionRecord, @@ -209,7 +99,13 @@ (ExceptionCommand == BREAKPOINT_PRINT))) { /* This we can handle: simply bump EIP */ +#if defined (_M_X86) ContextRecord->Eip++; +#elif defined (_M_AMD64) + ContextRecord->Rip++; +#else +#error Unknown platform +#endif return TRUE; } else if (KdPitchDebugger) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Tue Dec 9 19:25:09 2008 @@ -364,6 +364,16 @@ <file>kdlock.c</file> <file>kdprint.c</file> <file>kdtrap.c</file> + <if property="ARCH" value="i386"> + <directory name="i386"> + <file>kd-i386.c</file> + </directory> + </if> + <if property="ARCH" value="amd64"> + <directory name="amd64"> + <file>kd-amd64.c</file> + </directory> + </if> </directory> </if> <directory name="lpc">

1 0

[tkreuzer] 37988: Fix KiDebugServiceTrap, so that it calls KiDispatchException with the right parameters. Disable saving of xmm registers for now, as it causes breakpoint traps (emulation still active?)
by tkreuzer＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: tkreuzer Date: Tue Dec 9 19:15:46 2008 New Revision: 37988 URL: http://svn.reactos.org/svn/reactos?rev=37988&view=rev Log: Fix KiDebugServiceTrap, so that it calls KiDispatchException with the right parameters. Disable saving of xmm registers for now, as it causes breakpoint traps (emulation still active?) Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S [iso-8859-1] Tue Dec 9 19:15:46 2008 @@ -73,12 +73,12 @@ mov [rbp + KTRAP_FRAME_R11], r11 /* Save xmm registers */ - movdqa [rbp + KTRAP_FRAME_Xmm0], xmm0 - movdqa [rbp + KTRAP_FRAME_Xmm1], xmm1 - movdqa [rbp + KTRAP_FRAME_Xmm2], xmm2 - movdqa [rbp + KTRAP_FRAME_Xmm3], xmm3 - movdqa [rbp + KTRAP_FRAME_Xmm4], xmm4 - movdqa [rbp + KTRAP_FRAME_Xmm5], xmm5 +// movdqa [rbp + KTRAP_FRAME_Xmm0], xmm0 +// movdqa [rbp + KTRAP_FRAME_Xmm1], xmm1 +// movdqa [rbp + KTRAP_FRAME_Xmm2], xmm2 +// movdqa [rbp + KTRAP_FRAME_Xmm3], xmm3 +// movdqa [rbp + KTRAP_FRAME_Xmm4], xmm4 +// movdqa [rbp + KTRAP_FRAME_Xmm5], xmm5 .endif /* Save segment selectors */ @@ -163,12 +163,12 @@ mov r11, [rbp + KTRAP_FRAME_R11] /* Restore xmm registers */ - movdqa xmm0, [rbp + KTRAP_FRAME_Xmm0] - movdqa xmm1, [rbp + KTRAP_FRAME_Xmm1] - movdqa xmm2, [rbp + KTRAP_FRAME_Xmm2] - movdqa xmm3, [rbp + KTRAP_FRAME_Xmm3] - movdqa xmm4, [rbp + KTRAP_FRAME_Xmm4] - movdqa xmm5, [rbp + KTRAP_FRAME_Xmm5] +// movdqa xmm0, [rbp + KTRAP_FRAME_Xmm0] +// movdqa xmm1, [rbp + KTRAP_FRAME_Xmm1] +// movdqa xmm2, [rbp + KTRAP_FRAME_Xmm2] +// movdqa xmm3, [rbp + KTRAP_FRAME_Xmm3] +// movdqa xmm4, [rbp + KTRAP_FRAME_Xmm4] +// movdqa xmm5, [rbp + KTRAP_FRAME_Xmm5] .endif /* Restore rbp */ @@ -257,8 +257,7 @@ lea rax, _FrLdrDbgPrint[rip] call [rax] - mov rcx, gs:[KPCR_PRCB + KPRCB_CurrentThread] - DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, rcx, 0 + DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, 0, 0, 0 /* Return */ LEAVE_TRAP_FRAME @@ -469,37 +468,18 @@ push 0 .allocstack 0x08 - push rax - .pushreg rax - push rcx - .pushreg rcx - push rdx - .pushreg rdx - push r8 - .pushreg r8 - push r9 - .pushreg r9 - - /* Create stack space for parameters */ - sub rsp, 0x18 - .allocstack 0x18 - - /* just forward first 3 parameters */ - call _KdpServiceDispatcher - - /* Skip the int 3, increment return rip */ - inc qword ptr [rsp + 0x18 + 48] - - /* Cleanup */ - add rsp, 0x18 - - pop r9 - pop r8 - pop rdx - pop rcx - pop rax - - add rsp, 8 + ENTER_TRAP_FRAME (SIZE_EXCEPTION_RECORD + 0x28), 0 + + /* Increase Rip to skip the int3 */ + inc qword ptr [rbp + KTRAP_FRAME_Rip] + + /* Call KiDispatchException */ + mov r8, [ebp+KTRAP_FRAME_Rax] // Service + mov rcx, [ebp+KTRAP_FRAME_Rcx] // Buffer + mov rdx, [ebp+KTRAP_FRAME_Rdx] // Length + DISPATCH_EXCEPTION STATUS_BREAKPOINT, 3, r8, rcx, rdx + + LEAVE_TRAP_FRAME; iretq .endproc

1 0

[tkreuzer] 37987: Fix DebugService
by tkreuzer＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: tkreuzer Date: Tue Dec 9 19:08:40 2008 New Revision: 37987 URL: http://svn.reactos.org/svn/reactos?rev=37987&view=rev Log: Fix DebugService Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S Modified: branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/r… ============================================================================== --- branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/rtl/amd64/debug_asm.S [iso-8859-1] Tue Dec 9 19:08:40 2008 @@ -44,10 +44,11 @@ .func DebugService2 _DebugService2: + ret /* Call the interrupt */ // mov eax, [rbp+8] // int 0x2D - int 3 +// int 3 .endfunc @@ -62,27 +63,17 @@ .func DebugService _DebugService: - /* Save the registers */ - push rbx - push rcx - push rdx - push rsi - push rdi - - /* Load Argument 2 in rax */ - mov rax, [rsp + 48 + 40] + /* Prepare registers for interrupt */ + mov eax, ecx // Service + mov rcx, rdx // Buffer + mov edx, r8d // Length + mov r8, r9 // Argument1 + mov r9, [rsp + 40] // Argument2 /* Call the Interrupt */ int 0x2D int 3 - /* Restore registers */ - pop rdi - pop rsi - pop rdx - pop rcx - pop rbx - - /* Return */ + /* Return */ ret .endfunc

1 0

[tkreuzer] 37986: Implement KdDebuggerInitialize0 and stubplement KdSendPacket, enough to get DebugOutput with WINKD work
by tkreuzer＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: tkreuzer Date: Tue Dec 9 19:07:03 2008 New Revision: 37986 URL: http://svn.reactos.org/svn/reactos?rev=37986&view=rev Log: Implement KdDebuggerInitialize0 and stubplement KdSendPacket, enough to get DebugOutput with WINKD work Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c Modified: branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive… ============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/base/kdcom/i386/kdbg.c [iso-8859-1] Tue Dec 9 19:07:03 2008 @@ -14,6 +14,7 @@ #define NDEBUG #include <halfuncs.h> #include <stdio.h> +#include <stdlib.h> #include <debug.h> #include "arc/arc.h" #include "windbgkd.h" @@ -51,6 +52,12 @@ KdPortPutByteEx( IN PKD_PORT_INFORMATION PortInformation, IN UCHAR ByteToSend); + +/* serial debug connection */ +#define DEFAULT_DEBUG_PORT 2 /* COM2 */ +#define DEFAULT_DEBUG_COM1_IRQ 4 /* COM1 IRQ */ +#define DEFAULT_DEBUG_COM2_IRQ 3 /* COM2 IRQ */ +#define DEFAULT_DEBUG_BAUD_RATE 115200 /* 115200 Baud */ #define DEFAULT_BAUD_RATE 19200 @@ -123,6 +130,8 @@ /* The com port must only be initialized once! */ static BOOLEAN PortInitialized = FALSE; +ULONG KdpPort; +ULONG KdpPortIrq; /* STATIC FUNCTIONS *********************************************************/ @@ -477,15 +486,113 @@ } /* - * @unimplemented + * @implemented */ NTSTATUS NTAPI KdDebuggerInitialize0( IN PLOADER_PARAMETER_BLOCK LoaderBlock OPTIONAL) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + ULONG Value; + PCHAR CommandLine, Port, BaudRate, Irq; + + /* Apply default values */ + KdpPortIrq = 0; + DefaultPort.ComPort = DEFAULT_DEBUG_PORT; + DefaultPort.BaudRate = DEFAULT_DEBUG_BAUD_RATE; + + /* Check if e have a LoaderBlock */ + if (LoaderBlock) + { + /* Get the Command Line */ + CommandLine = LoaderBlock->LoadOptions; + + /* Upcase it */ + _strupr(CommandLine); + + /* 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) + { + /* Move past the actual string, to reach the port*/ + Port += strlen("DEBUGPORT"); + + /* Now get past any spaces and skip the equal sign */ + while (*Port == ' ') Port++; + Port++; + + /* Do we have a serial port? */ + if (strncmp(Port, "COM", 3) != 0) + { + return STATUS_INVALID_PARAMETER; + } + + /* Gheck for a valid Serial Port */ + Port += 3; + Value = atol(Port); + if (Value > 4) + { + return STATUS_INVALID_PARAMETER; + } + + /* Set the port to use */ + DefaultPort.ComPort = Value; + } + + /* Check if we got a baud rate */ + if (BaudRate) + { + /* Move past the actual string, to reach the rate */ + BaudRate += strlen("BAUDRATE"); + + /* Now get past any spaces */ + while (*BaudRate == ' ') BaudRate++; + + /* And make sure we have a rate */ + if (*BaudRate) + { + /* Read and set it */ + Value = atol(BaudRate + 1); + if (Value) DefaultPort.BaudRate = Value; + } + } + + /* Check Serial Port Settings [IRQ] */ + if (Irq) + { + /* Move past the actual string, to reach the rate */ + Irq += strlen("IRQ"); + + /* Now get past any spaces */ + while (*Irq == ' ') Irq++; + + /* And make sure we have an IRQ */ + if (*Irq) + { + /* Read and set it */ + Value = atol(Irq + 1); + if (Value) KdpPortIrq = Value; + } + } + } + + /* Get base address */ + DefaultPort.BaseAddress = BaseArray[DefaultPort.ComPort]; + + /* Check if the COM port does exist */ + if (!KdpDoesComPortExist(DefaultPort.BaseAddress)) + { + return STATUS_INVALID_PARAMETER; + } + + /* Initialize the port */ + KdPortInitializeEx(&DefaultPort, 0, 0); + + return STATUS_SUCCESS; } /* @@ -535,7 +642,31 @@ IN PSTRING MessageData, IN OUT PKD_CONTEXT Context) { - UNIMPLEMENTED; + ULONG i; + + switch (PacketType) + { + case PACKET_TYPE_KD_DEBUG_IO: + /* Copy Message to COM port */ + for (i = 0; i < MessageData->Length; i++) + { + char c = MessageData->Buffer[i]; + if ( c == 10 ) + { + KdPortPutByteEx(&DefaultPort, 13); + KdPortPutByteEx(&DefaultPort, 10); + } + else + { + KdPortPutByteEx(&DefaultPort, c); + } + } + break; + + default: + break; + } + return; } @@ -551,7 +682,7 @@ OUT PULONG DataLength, IN OUT PKD_CONTEXT Context) { - UNIMPLEMENTED; +// UNIMPLEMENTED; return 0; }

1 0

[tkreuzer] 37985: Add KiCallUserMode stub
by tkreuzer＠svn.reactos.org 10 Dec '08

10 Dec '08

Author: tkreuzer Date: Tue Dec 9 18:58:18 2008 New Revision: 37985 URL: http://svn.reactos.org/svn/reactos?rev=37985&view=rev Log: Add KiCallUserMode stub Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c [iso-8859-1] Tue Dec 9 18:58:18 2008 @@ -168,3 +168,14 @@ UNIMPLEMENTED; return NULL; } + +NTSTATUS +NTAPI +KiCallUserMode( + IN PVOID *OutputBuffer, + IN PULONG OutputLength) +{ + UNIMPLEMENTED; + return STATUS_UNSUCCESSFUL; +} +

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
71
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2008