[tkreuzer] 45188: [NTOS] Fixup code based on recent changes

Author: tkreuzer
Date: Thu Jan 21 20:33:47 2010
New Revision: 45188

URL: http://svn.reactos.org/svn/reactos?rev=45188&view=rev
Log:
[NTOS]
Fixup code based on recent changes

Modified:
    branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S
    branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c
    branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr...
==============================================================================
--- branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] (original)
+++ branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/boot.S [iso-8859-1] Thu Jan 21 20:33:47 2010
@@ -14,18 +14,6 @@

/* 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 *****************************************************************/

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/kiinit.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr...
==============================================================================
--- 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 Jan 21 20:33:47 2010
@@ -29,6 +29,12 @@
 extern ADDRESS_RANGE KeMemoryMap[64];

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 *****************************************************************/

@@ -344,30 +350,20 @@

VOID
 NTAPI
-KiSystemStartup(IN ULONG_PTR Dummy,
-                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)
+KiSystemStartup(IN PLOADER_PARAMETER_BLOCK LoaderBlock)
 {
     ULONG Cpu;
     PKTHREAD InitialThread;
     ULONG64 InitialStack;
     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 */
     KeLoaderBlock = LoaderBlock;

@@ -416,7 +412,7 @@
     InitialThread->ApcState.Process = (PVOID)LoaderBlock->Process;

/* Initialize the PCR */
-    KiInitializePcr(Pcr, Cpu, InitialThread, KiDoubleFaultStack);
+    KiInitializePcr(Pcr, Cpu, InitialThread, (PVOID)KiDoubleFaultStack);

/* Initialize the CPU features */
     KiInitializeCpuFeatures(Cpu);

Modified: branches/ros-amd64-bringup/reactos/ntoskrnl/ke/amd64/stubs.c
URL: http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/ntoskr...
==============================================================================
--- 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] Thu Jan 21 20:33:47 2010
@@ -41,14 +41,6 @@

VOID
 NTAPI
-KeUpdateRunTime(IN PKTRAP_FRAME TrapFrame,
-                IN KIRQL Irql)
-{
-    UNIMPLEMENTED;
-}
-
-VOID
-NTAPI
 KeUpdateSystemTime(IN PKTRAP_FRAME TrapFrame,
                    IN KIRQL Irql,
                    IN ULONG Increment)
@@ -67,14 +59,6 @@
 {
     UNIMPLEMENTED;
     return STATUS_UNSUCCESSFUL;
-}
-
-ULONG
-NTAPI
-KiComputeTimerTableIndex(LONGLONG Timer)
-{
-    UNIMPLEMENTED;
-    return 0;
 }

VOID