Ros-diffs August 2008

ros-diffs@reactos.org

27 participants
853 discussions

[tkreuzer] 35524: revert my last change, yes it IS a stupid idea to mess with the stack in the middle of a C function....
by tkreuzer＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: tkreuzer Date: Fri Aug 22 05:07:57 2008 New Revision: 35524 URL: http://svn.reactos.org/svn/reactos?rev=35524&view=rev Log: revert my last change, yes it IS a stupid idea to mess with the stack in the middle of a C function.... Added: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S - copied unchanged from r35517, branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Fri Aug 22 05:07:57 2008 @@ -10,17 +10,6 @@ #define KeSetCurrentIrql(x) __writecr8(x) #if defined(__GNUC__) - -ULONG64 -FORCEINLINE -KiSwapStack(ULONG64 NewStack) -{ - ULONG64 OldStack; - asm volatile ("movq %%rsp, %[oldstack]\n movq %[newstack], %%rsp\n" - : [oldstack] "=rm" (OldStack) - : [newstack] "rm" (NewStack)); - return OldStack; -} #define Ke386SetInterruptDescriptorTable(X) \ __asm__("lidt %0\n\t" \ Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Fri Aug 22 05:07:57 2008 @@ -366,7 +366,6 @@ /* Start us out at PASSIVE_LEVEL */ // Pcr->Irql = PASSIVE_LEVEL; - KeSetCurrentIrql(PASSIVE_LEVEL); /* Set the GDI, IDT, TSS and DPC Stack */ Pcr->GdtBase = (PVOID)Gdt; @@ -387,7 +386,6 @@ IN CCHAR Number, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { - FrLdrDbgPrint("Enter KiInitializeKernel\n"); #if 0 BOOLEAN NpxPresent; ULONG FeatureBits; @@ -644,17 +642,6 @@ (ULONG64)TssSelector.BaseUpper << 32); } -// Hack -VOID KiRosPrepareForSystemStartup(ULONG, PROS_LOADER_PARAMETER_BLOCK); - -VOID -NTAPI -KiSystemStartup(IN ULONG_PTR Dummy, - IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) -{ - KiRosPrepareForSystemStartup(Dummy, LoaderBlock); -} - VOID NTAPI KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -753,15 +740,13 @@ // RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); } -#if 0 // FIXME: InterlockedBitTestAndSet64 is broken! It needs to be specified - // that it should reference an absolute address! + /* Loop until we can release the freeze lock */ do { /* Loop until execution can continue */ while (*(volatile PKSPIN_LOCK*)&KiFreezeExecutionLock == (PVOID)1); - } while(InterlockedBitTestAndSet64((PLONG64)&KiFreezeExecutionLock, 0)); -#endif + } while(InterlockedBitTestAndSet((PLONG)&KiFreezeExecutionLock, 0)); /* Setup CPU-related fields */ Pcr->Prcb.Number = Cpu; @@ -788,29 +773,16 @@ KfRaiseIrql(HIGH_LEVEL); /* Align stack and make space for the trap frame and NPX frame */ - InitialStack &= ~(16 - 1); - - /* Switch to new kernel Stack */ - KiSwapStack(InitialStack); - - /* Initialize kernel */ - KiInitializeKernel(&KiInitialProcess.Pcb, - InitialThread, - (PVOID)InitialStack, - &Pcr->Prcb, - (CCHAR)Cpu, - KeLoaderBlock); - - /* Set the priority of this thread to 0 */ - InitialThread->Priority = 0; - - /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ - _enable(); - KeLowerIrql(DISPATCH_LEVEL); - - /* Set the right wait IRQL */ - InitialThread->WaitIrql = DISPATCH_LEVEL; - - /* Jump into the idle loop */ - KiIdleLoop(); + InitialStack &= ~(KTRAP_FRAME_ALIGN - 1); + +FrLdrDbgPrint("Before KiSetupStackAndInitializeKernel\n"); +for(;;); + + /* Switch to new kernel stack and start kernel bootstrapping */ + KiSetupStackAndInitializeKernel(&KiInitialProcess.Pcb, + InitialThread, + (PVOID)InitialStack, + &Pcr->Prcb, + (CCHAR)Cpu, + KeLoaderBlock); } 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] Fri Aug 22 05:07:57 2008 @@ -13,22 +13,7 @@ .intel_syntax noprefix .code64 -#define KERNEL_STACK_SIZE 0x6000 - /* GLOBALS *******************************************************************/ - -.bss -.align 16 - -/* Kernel Boot Stack */ -.globl _P0BootStack -.space KERNEL_STACK_SIZE -_P0BootStack: - -/* Kernel Double-Fault and Temporary DPC Stack */ -.globl _KiDoubleFaultStack -.space KERNEL_STACK_SIZE -_KiDoubleFaultStack: .data Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] Fri Aug 22 05:07:57 2008 @@ -90,6 +90,7 @@ </if> <if property="ARCH" value="amd64"> <directory name="amd64"> + <file first="true">boot.S</file> <file>cpu.c</file> <file>except.c</file> <file>irql.c</file>

1 0

[arty] 35523: Commit bugboy's patch from bug 2392, and remove DeviceDesc, which isn't needed anymore.
by arty＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: arty Date: Fri Aug 22 00:58:56 2008 New Revision: 35523 URL: http://svn.reactos.org/svn/reactos?rev=35523&view=rev Log: Commit bugboy's patch from bug 2392, and remove DeviceDesc, which isn't needed anymore. Modified: trunk/reactos/base/services/dhcp/adapter.c Modified: trunk/reactos/base/services/dhcp/adapter.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/services/dhcp/adapter… ============================================================================== --- trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] (original) +++ trunk/reactos/base/services/dhcp/adapter.c [iso-8859-1] Fri Aug 22 00:58:56 2008 @@ -108,7 +108,7 @@ PCHAR TargetKeyName = NULL; PCHAR *EnumKeysLinkage = GetSubkeyNames( EnumKeyName, "\\Linkage" ); PCHAR *EnumKeysTop = GetSubkeyNames( EnumKeyName, "" ); - PCHAR RootDevice = NULL, DriverDesc = NULL; + PCHAR RootDevice = NULL; HKEY EnumKey, OutKey = NULL; DWORD Error = ERROR_SUCCESS; @@ -121,12 +121,9 @@ for( i = 0; EnumKeysLinkage[i]; i++ ) { RootDevice = RegReadString ( EnumKey, EnumKeysLinkage[i], "RootDevice" ); - DriverDesc = RegReadString - ( EnumKey, EnumKeysTop[i], "DriverDesc" ); - - if( DriverDesc && - RootDevice && - !strcmp( DriverDesc, Adapter->DhclientInfo.name ) ) { + + if( RootDevice && + !strcmp( RootDevice, Adapter->DhclientInfo.name ) ) { TargetKeyName = (CHAR*) malloc( strlen( TargetKeyNameStart ) + strlen( RootDevice ) + @@ -138,13 +135,11 @@ break; } else { free( RootDevice ); RootDevice = 0; - free( DriverDesc ); DriverDesc = 0; } } cleanup: if( RootDevice ) free( RootDevice ); - if( DriverDesc ) free( DriverDesc ); if( EnumKeysLinkage ) free( EnumKeysLinkage ); if( EnumKeysTop ) free( EnumKeysTop ); if( TargetKeyName ) free( TargetKeyName );

1 0

[sginsberg] 35522: - Fix kernel mode debug output broken in 35520 - Patch by Alex
by sginsberg＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: sginsberg Date: Thu Aug 21 19:39:26 2008 New Revision: 35522 URL: http://svn.reactos.org/svn/reactos?rev=35522&view=rev Log: - Fix kernel mode debug output broken in 35520 - Patch by Alex Modified: trunk/reactos/lib/rtl/debug.c Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=35522&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Thu Aug 21 19:39:26 2008 @@ -186,7 +186,7 @@ IN va_list ap) { /* Call the internal routine that also handles ControlC */ - return vDbgPrintExWithPrefixInternal(NULL, + return vDbgPrintExWithPrefixInternal("", ComponentId, Level, Format, @@ -206,7 +206,7 @@ /* Call the internal routine that also handles ControlC */ va_start(ap, Format); - return vDbgPrintExWithPrefixInternal(NULL, + return vDbgPrintExWithPrefixInternal("", -1, DPFLTR_ERROR_LEVEL, Format, @@ -229,7 +229,7 @@ /* Call the internal routine that also handles ControlC */ va_start(ap, Format); - return vDbgPrintExWithPrefixInternal(NULL, + return vDbgPrintExWithPrefixInternal("", ComponentId, Level, Format, @@ -250,7 +250,7 @@ /* Call the internal routine that also handles ControlC */ va_start(ap, Format); - return vDbgPrintExWithPrefixInternal(NULL, + return vDbgPrintExWithPrefixInternal("", -1, DPFLTR_ERROR_LEVEL, Format,

1 0

[sginsberg] 35521: - Use correct bug code when crashing due to closing a protected handle - Add INVALID_KERNEL_HANDLE bug code
by sginsberg＠svn.reactos.org 22 Aug '08

22 Aug '08

Author: sginsberg Date: Thu Aug 21 19:26:52 2008 New Revision: 35521 URL: http://svn.reactos.org/svn/reactos?rev=35521&view=rev Log: - Use correct bug code when crashing due to closing a protected handle - Add INVALID_KERNEL_HANDLE bug code Modified: trunk/reactos/include/reactos/mc/bugcodes.mc trunk/reactos/ntoskrnl/ob/obhandle.c Modified: trunk/reactos/include/reactos/mc/bugcodes.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/bugcode… ============================================================================== --- trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/bugcodes.mc [iso-8859-1] Thu Aug 21 19:26:52 2008 @@ -1097,6 +1097,14 @@ PP1_INITIALIZATION_FAILED . +MessageId=0x93 +Severity=Success +Facility=System +SymbolicName=INVALID_KERNEL_HANDLE +Language=English +INVALID_KERNEL_HANDLE +. + MessageId=0x94 Severity=Success Facility=System Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Thu Aug 21 19:26:52 2008 @@ -697,7 +697,7 @@ else { /* Otherwise, bugcheck the OS */ - KeBugCheckEx(0x8B, (ULONG_PTR)Handle, 0, 0, 0); + KeBugCheckEx(INVALID_KERNEL_HANDLE, (ULONG_PTR)Handle, 0, 0, 0); } }

1 0

[sginsberg] 35520: - Patch by Alex Ionescu: Fix a typo, and code cleanup
by sginsberg＠svn.reactos.org 21 Aug '08

21 Aug '08

Author: sginsberg Date: Thu Aug 21 17:41:17 2008 New Revision: 35520 URL: http://svn.reactos.org/svn/reactos?rev=35520&view=rev Log: - Patch by Alex Ionescu: Fix a typo, and code cleanup Modified: trunk/reactos/lib/rtl/debug.c Modified: trunk/reactos/lib/rtl/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/debug.c?rev=35520&… ============================================================================== --- trunk/reactos/lib/rtl/debug.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/debug.c [iso-8859-1] Thu Aug 21 17:41:17 2008 @@ -54,51 +54,46 @@ IN va_list ap, IN BOOLEAN HandleBreakpoint) { - NTSTATUS Status; + NTSTATUS Status = STATUS_SUCCESS; ANSI_STRING DebugString; CHAR Buffer[512]; - PCHAR pBuffer = Buffer; - ULONG pBufferSize = sizeof(Buffer); - ULONG Length; + ULONG Length, PrefixLength; EXCEPTION_RECORD ExceptionRecord; /* Check if we should print it or not */ - if (ComponentId != -1 && !NtQueryDebugFilterState(ComponentId, Level)) + if ((ComponentId != -1) && !(NtQueryDebugFilterState(ComponentId, Level))) { /* This message is masked */ - return STATUS_SUCCESS; + return Status; } /* For user mode, don't recursively DbgPrint */ - if (RtlpSetInDbgPrint(TRUE)) return STATUS_SUCCESS; - - /* Initialize the length to 8 */ - DebugString.Length = 0; - - /* Handle the prefix */ - if (Prefix && *Prefix) - { - /* Get the length */ - DebugString.Length = strlen(Prefix); - - /* Normalize it */ - if(DebugString.Length > sizeof(Buffer)) - { - DebugString.Length = sizeof(Buffer); - } + if (RtlpSetInDbgPrint(TRUE)) return Status; + + /* Guard against incorrect pointers */ + _SEH_TRY + { + /* Get the length and normalize it */ + PrefixLength = strlen(Prefix); + if (PrefixLength > sizeof(Buffer)) PrefixLength = sizeof(Buffer); /* Copy it */ - strncpy(Buffer, Prefix, DebugString.Length); - - /* Set the pointer and update the size */ - pBuffer = &Buffer[DebugString.Length]; - pBufferSize -= DebugString.Length; - } - - /* Setup the ANSI String */ - DebugString.Buffer = Buffer; - DebugString.MaximumLength = sizeof(Buffer); - Length = _vsnprintf(pBuffer, pBufferSize, Format, ap); + strncpy(Buffer, Prefix, PrefixLength); + + /* Do the printf */ + Length = _vsnprintf(Buffer + PrefixLength, + sizeof(Buffer) - PrefixLength, + Format, + ap); + } + _SEH_HANDLE + { + /* Fail */ + Length = PrefixLength = 0; + Status = _SEH_GetExceptionCode(); + } + _SEH_END; + if (!NT_SUCCESS(Status)) return Status; /* Check if we went past the buffer */ if (Length == -1) @@ -109,9 +104,15 @@ /* Put maximum */ Length = sizeof(Buffer); } - - /* Update length */ - DebugString.Length += (USHORT)Length; + else + { + /* Add the prefix */ + Length += PrefixLength; + } + + /* Build the string */ + DebugString.Length = Length; + DebugString.Buffer = Buffer; /* First, let the debugger know as well */ if (RtlpCheckForActiveDebugger(FALSE))

1 0

[sginsberg] 35519: - Change ASSERT to C_ASSERT
by sginsberg＠svn.reactos.org 21 Aug '08

21 Aug '08

Author: sginsberg Date: Thu Aug 21 16:25:16 2008 New Revision: 35519 URL: http://svn.reactos.org/svn/reactos?rev=35519&view=rev Log: - Change ASSERT to C_ASSERT Modified: trunk/reactos/ntoskrnl/ke/gmutex.c Modified: trunk/reactos/ntoskrnl/ke/gmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gmutex.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] Thu Aug 21 16:25:16 2008 @@ -81,7 +81,7 @@ BitsToAdd = GM_LOCK_WAITER_WOKEN; /* We depend on these bits being just right */ - ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); + C_ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); } }

1 0

[tkreuzer] 35518: Implement KiSystemStartup in C instead of asm, implement KiSwapStack intrinsic, get rid of KiSetupStackandInitializeKernel, instead do the work in KiSystemStartupReal in C. Move Stack definitions into trap.S and get rid of the whole boot.S file. Comment out the sync loop for the moment and add a comment why it doesn't work (InterlockedBitTestAndSet64 doesn't work correctly).
by tkreuzer＠svn.reactos.org 21 Aug '08

21 Aug '08

Author: tkreuzer Date: Thu Aug 21 16:16:57 2008 New Revision: 35518 URL: http://svn.reactos.org/svn/reactos?rev=35518&view=rev Log: Implement KiSystemStartup in C instead of asm, implement KiSwapStack intrinsic, get rid of KiSetupStackandInitializeKernel, instead do the work in KiSystemStartupReal in C. Move Stack definitions into trap.S and get rid of the whole boot.S file. Comment out the sync loop for the moment and add a comment why it doesn't work (InterlockedBitTestAndSet64 doesn't work correctly). Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/trap.S branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/include/internal/amd64/intrin_i.h [iso-8859-1] Thu Aug 21 16:16:57 2008 @@ -10,6 +10,17 @@ #define KeSetCurrentIrql(x) __writecr8(x) #if defined(__GNUC__) + +ULONG64 +FORCEINLINE +KiSwapStack(ULONG64 NewStack) +{ + ULONG64 OldStack; + asm volatile ("movq %%rsp, %[oldstack]\n movq %[newstack], %%rsp\n" + : [oldstack] "=rm" (OldStack) + : [newstack] "rm" (NewStack)); + return OldStack; +} #define Ke386SetInterruptDescriptorTable(X) \ __asm__("lidt %0\n\t" \ Removed: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S (removed) @@ -1,86 +1,0 @@ -/* - * FILE: ntoskrnl/ke/i386/boot.S - * COPYRIGHT: See COPYING in the top level directory - * PURPOSE: FreeLDR Wrapper Bootstrap Code and Bootstrap Trampoline - * PROGRAMMERs: Alex Ionescu (alex(a)relsoft.net) - * Thomas Weidenmueller <w3seek(a)reactos.org> - */ - -/* INCLUDES ******************************************************************/ - -#include <asm.h> -.intel_syntax noprefix -.code64 - -/* GLOBALS *******************************************************************/ - -.bss -.align 16 - -/* Kernel Boot Stack */ -.globl _P0BootStack -.space KERNEL_STACK_SIZE -_P0BootStack: - -/* Kernel Double-Fault and Temporary DPC Stack */ -.globl _KiDoubleFaultStack -.space KERNEL_STACK_SIZE -_KiDoubleFaultStack: - -/* FUNCTIONS *****************************************************************/ -.global _KiSystemStartup -.text -.func KiSystemStartup -_KiSystemStartup: - - /* NTLDR Boot: Call the main kernel initialization */ - test rcx, 0x80000000 - jnz _KiSystemStartupReal - - /* FREELDR Boot: Cal the FreeLDR wrapper */ - jmp _KiRosPrepareForSystemStartup -.endfunc - -/** - * VOID - * KiSetupStackAndInitializeKernel( - * esp+4 = ? -> rcx - * esp+8 = ? -> rdx - * PVOID pNewstack // esp+12 = new stack -> r8 - * esp+16 -> r9 - * esp+20 -> rsp + 8 - * esp+24 -> rsp + 16? - */ -.globl _KiSetupStackAndInitializeKernel -.func KiSetupStackAndInitializeKernel -_KiSetupStackAndInitializeKernel: - - /* Save current stack */ - mov rsi, rsp - - /* Setup the new stack */ - mov rsp, r8 - sub rsp, NPX_FRAME_LENGTH + KTRAP_FRAME_ALIGN + KTRAP_FRAME_LENGTH - push CR0_EM + CR0_TS + CR0_MP - - /* Copy stack parameters to the new stack */ - push [rsi + 16] - push [rsi + 8] - xor rbp, rbp - call _KiInitializeKernel - - /* Set the priority of this thread to 0 */ - mov rbx, PCR[KPCR_CURRENT_THREAD] - mov byte ptr [rbx+KTHREAD_PRIORITY], 0 - - /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ - sti - mov rcx, DISPATCH_LEVEL - mov cr8, rcx - - /* Set the right wait IRQL */ - mov byte ptr [rbx+KTHREAD_WAIT_IRQL], DISPATCH_LEVEL; - - /* Jump into the idle loop */ - jmp _KiIdleLoop -.endfunc Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c [iso-8859-1] Thu Aug 21 16:16:57 2008 @@ -366,6 +366,7 @@ /* Start us out at PASSIVE_LEVEL */ // Pcr->Irql = PASSIVE_LEVEL; + KeSetCurrentIrql(PASSIVE_LEVEL); /* Set the GDI, IDT, TSS and DPC Stack */ Pcr->GdtBase = (PVOID)Gdt; @@ -386,6 +387,7 @@ IN CCHAR Number, IN PLOADER_PARAMETER_BLOCK LoaderBlock) { + FrLdrDbgPrint("Enter KiInitializeKernel\n"); #if 0 BOOLEAN NpxPresent; ULONG FeatureBits; @@ -642,6 +644,17 @@ (ULONG64)TssSelector.BaseUpper << 32); } +// Hack +VOID KiRosPrepareForSystemStartup(ULONG, PROS_LOADER_PARAMETER_BLOCK); + +VOID +NTAPI +KiSystemStartup(IN ULONG_PTR Dummy, + IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock) +{ + KiRosPrepareForSystemStartup(Dummy, LoaderBlock); +} + VOID NTAPI KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock) @@ -740,13 +753,15 @@ // RtlCopyMemory(&Idt[8], &DoubleFaultEntry, sizeof(KIDTENTRY)); } - +#if 0 // FIXME: InterlockedBitTestAndSet64 is broken! It needs to be specified + // that it should reference an absolute address! /* Loop until we can release the freeze lock */ do { /* Loop until execution can continue */ while (*(volatile PKSPIN_LOCK*)&KiFreezeExecutionLock == (PVOID)1); - } while(InterlockedBitTestAndSet((PLONG)&KiFreezeExecutionLock, 0)); + } while(InterlockedBitTestAndSet64((PLONG64)&KiFreezeExecutionLock, 0)); +#endif /* Setup CPU-related fields */ Pcr->Prcb.Number = Cpu; @@ -773,16 +788,29 @@ KfRaiseIrql(HIGH_LEVEL); /* Align stack and make space for the trap frame and NPX frame */ - InitialStack &= ~(KTRAP_FRAME_ALIGN - 1); - -FrLdrDbgPrint("Before KiSetupStackAndInitializeKernel\n"); -for(;;); - - /* Switch to new kernel stack and start kernel bootstrapping */ - KiSetupStackAndInitializeKernel(&KiInitialProcess.Pcb, - InitialThread, - (PVOID)InitialStack, - &Pcr->Prcb, - (CCHAR)Cpu, - KeLoaderBlock); + InitialStack &= ~(16 - 1); + + /* Switch to new kernel Stack */ + KiSwapStack(InitialStack); + + /* Initialize kernel */ + KiInitializeKernel(&KiInitialProcess.Pcb, + InitialThread, + (PVOID)InitialStack, + &Pcr->Prcb, + (CCHAR)Cpu, + KeLoaderBlock); + + /* Set the priority of this thread to 0 */ + InitialThread->Priority = 0; + + /* Force interrupts enabled and lower IRQL back to DISPATCH_LEVEL */ + _enable(); + KeLowerIrql(DISPATCH_LEVEL); + + /* Set the right wait IRQL */ + InitialThread->WaitIrql = DISPATCH_LEVEL; + + /* Jump into the idle loop */ + KiIdleLoop(); } 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] Thu Aug 21 16:16:57 2008 @@ -13,7 +13,22 @@ .intel_syntax noprefix .code64 +#define KERNEL_STACK_SIZE 0x6000 + /* GLOBALS *******************************************************************/ + +.bss +.align 16 + +/* Kernel Boot Stack */ +.globl _P0BootStack +.space KERNEL_STACK_SIZE +_P0BootStack: + +/* Kernel Double-Fault and Temporary DPC Stack */ +.globl _KiDoubleFaultStack +.space KERNEL_STACK_SIZE +_KiDoubleFaultStack: .data Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntosk… ============================================================================== --- branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/ntoskrnl/ntoskrnl-amd64hack.rbuild [iso-8859-1] Thu Aug 21 16:16:57 2008 @@ -90,7 +90,6 @@ </if> <if property="ARCH" value="amd64"> <directory name="amd64"> - <file first="true">boot.S</file> <file>cpu.c</file> <file>except.c</file> <file>irql.c</file>

1 0

[tkreuzer] 35517: Update syscall stubs
by tkreuzer＠svn.reactos.org 21 Aug '08

21 Aug '08

Author: tkreuzer Date: Thu Aug 21 16:10:17 2008 New Revision: 35517 URL: http://svn.reactos.org/svn/reactos?rev=35517&view=rev Log: Update syscall stubs Modified: branches/ros-amd64-bringup/reactos/tools/nci/ncitool.c Modified: branches/ros-amd64-bringup/reactos/tools/nci/ncitool.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/tools… ============================================================================== --- branches/ros-amd64-bringup/reactos/tools/nci/ncitool.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/tools/nci/ncitool.c [iso-8859-1] Thu Aug 21 16:10:17 2008 @@ -53,9 +53,9 @@ " call *(%%ecx)\n" \ " ret $0x%x\n\n" -#define UserModeStub_amd64 " movq $0x%x, %%rax\n" \ - " movq $KUSER_SHARED_SYSCALL, %%rcx\n" \ - " call *(%%rcx)\n" \ +#define UserModeStub_amd64 " movl $0x%x, %%eax\n" \ + " movq %%rcx, %%r10\n" \ + " syscall\n" \ " ret $0x%x\n\n" #define UserModeStub_ppc " stwu 1,-16(1)\n" \ @@ -99,10 +99,7 @@ " call _KiSystemService\n" \ " ret $0x%x\n\n" -#define KernelModeStub_amd64 " movq $0x%x, %%rax\n" \ - " leaq 4(%%rsp), %%rdx\n" \ - " pushfq\n" \ - " pushq $KGDT_R0_CODE\n" \ +#define KernelModeStub_amd64 " movl $0x%x, %%eax\n" \ " call _KiSystemService\n" \ " ret $0x%x\n\n"

1 0

[fireball] 35516: - "When releasing the gmutex my awesome code was removing the woken flag" (c) Alex Ionescu.
by fireball＠svn.reactos.org 21 Aug '08

21 Aug '08

Author: fireball Date: Thu Aug 21 16:07:52 2008 New Revision: 35516 URL: http://svn.reactos.org/svn/reactos?rev=35516&view=rev Log: - "When releasing the gmutex my awesome code was removing the woken flag" (c) Alex Ionescu. Modified: trunk/reactos/ntoskrnl/ke/gmutex.c Modified: trunk/reactos/ntoskrnl/ke/gmutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/gmutex.c?rev=3… ============================================================================== --- trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/gmutex.c [iso-8859-1] Thu Aug 21 16:07:52 2008 @@ -79,6 +79,9 @@ /* Ok, the wait is done, so set the new bits */ BitsToRemove = GM_LOCK_BIT | GM_LOCK_WAITER_WOKEN; BitsToAdd = GM_LOCK_WAITER_WOKEN; + + /* We depend on these bits being just right */ + ASSERT((GM_LOCK_WAITER_WOKEN * 2) == GM_LOCK_WAITER_INC); } } @@ -103,7 +106,7 @@ FASTCALL KiReleaseGuardedMutex(IN OUT PKGUARDED_MUTEX GuardedMutex) { - LONG OldValue; + LONG OldValue, NewValue; /* Destroy the Owner */ GuardedMutex->Owner = NULL; @@ -117,10 +120,14 @@ { /* Update the Oldvalue to what it should be now */ OldValue |= GM_LOCK_BIT; + + /* The mutex will be woken, minus one waiter */ + NewValue = (OldValue | GM_LOCK_WAITER_WOKEN); + NewValue &= ~GM_LOCK_WAITER_INC; /* Remove the Woken bit */ if (InterlockedCompareExchange(&GuardedMutex->Count, - OldValue - GM_LOCK_WAITER_WOKEN, + NewValue, OldValue) == OldValue) { /* Signal the Gate */

1 0

[tkreuzer] 35515: Fix hal build
by tkreuzer＠svn.reactos.org 21 Aug '08

21 Aug '08

Author: tkreuzer Date: Thu Aug 21 15:24:34 2008 New Revision: 35515 URL: http://svn.reactos.org/svn/reactos?rev=35515&view=rev Log: Fix hal build Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c Modified: branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/hal/hal.rbuild [iso-8859-1] Thu Aug 21 15:24:34 2008 @@ -36,9 +36,9 @@ <module name="hal" type="kernelmodedll"> <importlibrary definition="hal_amd64.def" /> <include base="ntoskrnl">include</include> + <library>halamd64_generic</library> <library>ntoskrnl</library> <define name="_NTHAL_" /> - <file>hal.c</file> <file>hal.rc</file> <file>hal.spec</file> </module> Modified: branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/hal/h… ============================================================================== --- branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/hal/halamd64/generic/hal.c [iso-8859-1] Thu Aug 21 15:24:34 2008 @@ -28,46 +28,6 @@ ULONG HalpCurrentTimeIncrement, HalpNextTimeIncrement, HalpNextIntervalCount; ULONG _KdComPortInUse = 0; - -ULONG HalpIrqlTable[HIGH_LEVEL + 1] = -{ - 0xFFFFFFFF, // IRQL 0 PASSIVE_LEVEL - 0xFFFFFFFD, // IRQL 1 APC_LEVEL - 0xFFFFFFF9, // IRQL 2 DISPATCH_LEVEL - 0xFFFFFFD9, // IRQL 3 - 0xFFFFFF99, // IRQL 4 - 0xFFFFFF19, // IRQL 5 - 0xFFFFFE19, // IRQL 6 - 0xFFFFFC19, // IRQL 7 - 0xFFFFF819, // IRQL 8 - 0xFFFFF019, // IRQL 9 - 0xFFFFE019, // IRQL 10 - 0xFFFFC019, // IRQL 11 - 0xFFFF8019, // IRQL 12 - 0xFFFF0019, // IRQL 13 - 0xFFFE0019, // IRQL 14 - 0xFFFC0019, // IRQL 15 -}; - -UCHAR HalpMaskTable[HIGH_LEVEL + 1] = -{ - PROFILE_LEVEL, // INT 0 WATCHDOG - APC_LEVEL, // INT 1 SOFTWARE INTERRUPT - DISPATCH_LEVEL,// INT 2 COMM RX - IPI_LEVEL, // INT 3 COMM TX - CLOCK_LEVEL, // INT 4 TIMER 0 - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13 -}; /* FUNCTIONS *****************************************************************/ @@ -802,42 +762,6 @@ return; } -VOID -FASTCALL -KfLowerIrql(IN KIRQL NewIrql) -{ - UNIMPLEMENTED; - return; -} - -KIRQL -FASTCALL -KfRaiseIrql(IN KIRQL NewIrql) -{ - UNIMPLEMENTED; - return; -} - - - -KIRQL -KeRaiseIrqlToDpcLevel(VOID) -{ - // - // Call the generic routine - // - return KfRaiseIrql(DISPATCH_LEVEL); -} - -KIRQL -KeRaiseIrqlToSynchLevel(VOID) -{ - // - // Call the generic routine - // - return KfRaiseIrql(DISPATCH_LEVEL); -} - BOOLEAN HalpProcessorIdentified; BOOLEAN HalpTestCleanSupported; @@ -865,29 +789,6 @@ /* * @implemented */ -#undef KeGetCurrentIrql -KIRQL -NTAPI -KeGetCurrentIrql(VOID) -{ - UNIMPLEMENTED; - return; -} - -/* - * @implemented - */ -VOID -NTAPI -KeLowerIrql(KIRQL NewIrql) -{ - /* Call the fastcall function */ - KfLowerIrql(NewIrql); -} - -/* - * @implemented - */ VOID NTAPI KeRaiseIrql(KIRQL NewIrql, @@ -952,7 +853,7 @@ KIRQL OldIrql) { /* Simply lower IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); } /* @@ -1010,7 +911,7 @@ IN KIRQL OldIrql) { /* Simply lower IRQL back */ - KfLowerIrql(OldIrql); + KeLowerIrql(OldIrql); } /* @@ -1021,7 +922,7 @@ KeReleaseInStackQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) { /* Simply lower IRQL back */ - KfLowerIrql(LockHandle->OldIrql); + KeLowerIrql(LockHandle->OldIrql); } /*

1 0

← Newer
1
...
30
31
32
33
34
35
36
...
86
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 August 2008