Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 15:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS]

Browse source 
Fixup code based on recent changes

svn path=/branches/ros-amd64-bringup/; revision=45188
This commit is contained in:
Timo Kreuzer 2010-01-21 19:33:47 +00:00
parent 4409da3038
commit f7a3094ecc
3 changed files with 15 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

12
reactos/ntoskrnl/ke/amd64/boot.S
View file

@ -14,18 +14,6 @@
/* GLOBALS *******************************************************************/ /* 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 *****************************************************************/ /* FUNCTIONS *****************************************************************/

34
reactos/ntoskrnl/ke/amd64/kiinit.c
View file

@ -30,6 +30,12 @@ extern ADDRESS_RANGE KeMemoryMap[64];
KIPCR KiInitialPcr; KIPCR KiInitialPcr;
/* Boot and double-fault/NMI/DPC stack */
UCHAR P0BootStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0};
UCHAR KiDoubleFaultStackData[KERNEL_STACK_SIZE] __attribute__((aligned (16))) = {0};
ULONG_PTR P0BootStack = (ULONG_PTR)&P0BootStackData[KERNEL_STACK_SIZE];
ULONG_PTR KiDoubleFaultStack = (ULONG_PTR)&KiDoubleFaultStackData[KERNEL_STACK_SIZE];
/* FUNCTIONS *****************************************************************/ /* FUNCTIONS *****************************************************************/
VOID VOID
@ -344,30 +350,20 @@ KiInitializeKernel(IN PKPROCESS InitProcess,
VOID VOID
NTAPI NTAPI
KiSystemStartup(IN ULONG_PTR Dummy, KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
IN PROS_LOADER_PARAMETER_BLOCK LoaderBlock)
{
FrLdrDbgPrint = ((PLOADER_PARAMETER_BLOCK)Dummy)->u.I386.CommonDataArea;
FrLdrDbgPrint("Hello from KiSystemStartup!!!\n");
/* HACK, because freeldr maps page 0 */
MiAddressToPte((PVOID)0)->u.Hard.Valid = 0;
KiSystemStartupReal((PLOADER_PARAMETER_BLOCK)Dummy);
// KiRosPrepareForSystemStartup(Dummy, LoaderBlock);
}
VOID
NTAPI
KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
{ {
ULONG Cpu; ULONG Cpu;
PKTHREAD InitialThread; PKTHREAD InitialThread;
ULONG64 InitialStack; ULONG64 InitialStack;
PKIPCR Pcr; PKIPCR Pcr;
/* HACK */
FrLdrDbgPrint = LoaderBlock->u.I386.CommonDataArea;
FrLdrDbgPrint("Hello from KiSystemStartup!!!\n");
/* HACK, because freeldr maps page 0 */
MiAddressToPte((PVOID)0)->u.Hard.Valid = 0;
/* Save the loader block */ /* Save the loader block */
KeLoaderBlock = LoaderBlock; KeLoaderBlock = LoaderBlock;
@ -416,7 +412,7 @@ KiSystemStartupReal(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
InitialThread->ApcState.Process = (PVOID)LoaderBlock->Process; InitialThread->ApcState.Process = (PVOID)LoaderBlock->Process;
/* Initialize the PCR */ /* Initialize the PCR */
KiInitializePcr(Pcr, Cpu, InitialThread, KiDoubleFaultStack); KiInitializePcr(Pcr, Cpu, InitialThread, (PVOID)KiDoubleFaultStack);
/* Initialize the CPU features */ /* Initialize the CPU features */
KiInitializeCpuFeatures(Cpu); KiInitializeCpuFeatures(Cpu);

16
reactos/ntoskrnl/ke/amd64/stubs.c
View file

@ -39,14 +39,6 @@ KeSynchronizeExecution(
return FALSE; return FALSE;
} }
VOID
NTAPI
KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame,
IN KIRQL Irql)
{
UNIMPLEMENTED;
}
VOID VOID
NTAPI NTAPI
KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame, KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame,
@ -69,14 +61,6 @@ KeUserModeCallback(IN ULONG RoutineIndex,
return STATUS_UNSUCCESSFUL; return STATUS_UNSUCCESSFUL;
} }
ULONG
NTAPI
KiComputeTimerTableIndex(LONGLONG Timer)
{
UNIMPLEMENTED;
return 0;
}
VOID VOID
KiIdleLoop() KiIdleLoop()
{ {