- Kernel's entry point is called KiSystemStartup, not NtProcessStartup (now it's done correctly).

svn path=/trunk/; revision=32450
This commit is contained in:
Aleksey Bragin 2008-02-22 13:41:37 +00:00
parent 5b1c7de117
commit 0c8475d7ca
7 changed files with 9 additions and 10 deletions

View file

@ -697,7 +697,7 @@ KiInitializeBugCheck(VOID);
VOID VOID
NTAPI NTAPI
KiSystemStartup( KiSystemStartupReal(
IN PLOADER_PARAMETER_BLOCK LoaderBlock IN PLOADER_PARAMETER_BLOCK LoaderBlock
); );

View file

@ -1330,7 +1330,7 @@ KiRosPrepareForSystemStartup(IN ULONG Dummy,
#endif #endif
/* Do general System Startup */ /* Do general System Startup */
KiSystemStartup(NtLoaderBlock); KiSystemStartupReal(NtLoaderBlock);
} }
/* EOF */ /* EOF */

View file

@ -29,12 +29,12 @@ _KiDoubleFaultStack:
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
.text .text
.func NtProcessStartup .func KiSystemStartup
_NtProcessStartup: _KiSystemStartup:
/* NTLDR Boot: Call the main kernel initialization */ /* NTLDR Boot: Call the main kernel initialization */
test dword ptr [esp+4], 0x80000000 test dword ptr [esp+4], 0x80000000
jnz _KiSystemStartup@4 jnz _KiSystemStartupReal@4
/* FREELDR Boot: Cal the FreeLDR wrapper */ /* FREELDR Boot: Cal the FreeLDR wrapper */
jmp @KiRosPrepareForSystemStartup@8 jmp @KiRosPrepareForSystemStartup@8

View file

@ -646,7 +646,7 @@ KiGetMachineBootPointers(IN PKGDTENTRY *Gdt,
VOID VOID
NTAPI NTAPI
KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
{ {
ULONG Cpu; ULONG Cpu;
PKTHREAD InitialThread; PKTHREAD InitialThread;

View file

@ -252,7 +252,7 @@ KTRAP_FRAME KiInitialTrapFrame;
/* Use this for early boot additions to the page table */ /* Use this for early boot additions to the page table */
VOID VOID
NTAPI NTAPI
KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock) KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
{ {
ULONG Cpu; ULONG Cpu;
ppc_map_info_t info[4]; ppc_map_info_t info[4];

View file

@ -33,12 +33,11 @@ _kernel_trap_stack_top:
KiDoubleFaultStack: KiDoubleFaultStack:
.text .text
.globl NtProcessStartup
.globl KiSystemStartup .globl KiSystemStartup
.globl KiRosPrepareForSystemStartup .globl KiRosPrepareForSystemStartup
.globl DrawNumber .globl DrawNumber
NtProcessStartup: KiSystemStartup:
/* /*
* Set a normal MSR value * Set a normal MSR value
*/ */

View file

@ -1033,7 +1033,7 @@ Module::GetDefaultModuleEntrypoint () const
switch ( type ) switch ( type )
{ {
case Kernel: case Kernel:
return "NtProcessStartup"; return "KiSystemStartup";
case KernelModeDLL: case KernelModeDLL:
case KernelModeDriver: case KernelModeDriver:
return "DriverEntry@8"; return "DriverEntry@8";