- 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
NTAPI
KiSystemStartup(
KiSystemStartupReal(
IN PLOADER_PARAMETER_BLOCK LoaderBlock
);

View file

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

View file

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

View file

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

View file

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

View file

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

View file

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