diff --git a/sdk/xtdk/amd64/ketypes.h b/sdk/xtdk/amd64/ketypes.h index 6a97ccc..af48477 100644 --- a/sdk/xtdk/amd64/ketypes.h +++ b/sdk/xtdk/amd64/ketypes.h @@ -184,7 +184,7 @@ #define KTRAP_FRAME_SIZE sizeof(KTRAP_FRAME) /* Initial stack reservation size */ -#define KTHREAD_STACK_INITIAL_RESERVE ((sizeof(KTHREAD_INIT_FRAME) + STACK_ALIGNMENT - 1) & ~(STACK_ALIGNMENT - 1)) +#define KTHREAD_STACK_OFFSET ((sizeof(KTHREAD_INIT_FRAME) + STACK_ALIGNMENT - 1) & ~(STACK_ALIGNMENT - 1)) /* Return address size pushed by 'call' instruction */ #define KRETURN_ADDRESS_SIZE 0x8 diff --git a/sdk/xtdk/i686/ketypes.h b/sdk/xtdk/i686/ketypes.h index 92b1e2c..39b0ee4 100644 --- a/sdk/xtdk/i686/ketypes.h +++ b/sdk/xtdk/i686/ketypes.h @@ -202,7 +202,7 @@ #define NPX_FRAME_SIZE 0x210 /* Initial stack reservation size */ -#define KTHREAD_STACK_INITIAL_RESERVE ((sizeof(KTHREAD_INIT_FRAME) + STACK_ALIGNMENT - 1) & ~(STACK_ALIGNMENT - 1)) +#define KTHREAD_STACK_OFFSET ((sizeof(KTHREAD_INIT_FRAME) + STACK_ALIGNMENT - 1) & ~(STACK_ALIGNMENT - 1)) /* Number of supported extensions */ #define MAXIMUM_SUPPORTED_EXTENSION 512 diff --git a/xtoskrnl/hl/x86/cpu.cc b/xtoskrnl/hl/x86/cpu.cc index 3b37480..10b41f9 100644 --- a/xtoskrnl/hl/x86/cpu.cc +++ b/xtoskrnl/hl/x86/cpu.cc @@ -174,7 +174,7 @@ HL::Cpu::StartAllProcessors(VOID) StartBlock->Cr3 = AR::CpuFunctions::ReadControlRegister(3); StartBlock->Cr4 = AR::CpuFunctions::ReadControlRegister(4); StartBlock->EntryPoint = (PVOID)&KE::KernelInit::BootstrapApplicationProcessor; - StartBlock->InitialStack = (PVOID)((ULONG_PTR)StartBlock->Stack - KTHREAD_STACK_INITIAL_RESERVE); + StartBlock->InitialStack = (PVOID)((ULONG_PTR)StartBlock->Stack - KTHREAD_STACK_OFFSET); StartBlock->ProcessorStructures = CpuStructures; StartBlock->Started = FALSE; diff --git a/xtoskrnl/ke/amd64/krnlinit.cc b/xtoskrnl/ke/amd64/krnlinit.cc index 4e5ee1d..2a23e87 100644 --- a/xtoskrnl/ke/amd64/krnlinit.cc +++ b/xtoskrnl/ke/amd64/krnlinit.cc @@ -213,6 +213,6 @@ KE::KernelInit::SwitchBootStack(VOID) : : [Stack] "r" (Stack), [TargetRoutine] "r" (StartKernel), - [TotalSize] "i" (KTHREAD_STACK_INITIAL_RESERVE) + [TotalSize] "i" (KTHREAD_STACK_OFFSET) : "memory", "rbp", "rsp"); } diff --git a/xtoskrnl/ke/i686/krnlinit.cc b/xtoskrnl/ke/i686/krnlinit.cc index 3fb3710..7dd579b 100644 --- a/xtoskrnl/ke/i686/krnlinit.cc +++ b/xtoskrnl/ke/i686/krnlinit.cc @@ -215,6 +215,6 @@ KE::KernelInit::SwitchBootStack(VOID) : [Cr0Value] "i" (CR0_EM | CR0_MP | CR0_TS), [Stack] "r" (Stack), [TargetRoutine] "r" (StartKernel), - [TotalSize] "i" (KTHREAD_STACK_INITIAL_RESERVE) + [TotalSize] "i" (KTHREAD_STACK_OFFSET) : "ebp", "esp", "memory"); }