GitHub-Mirror/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos synced 2025-10-06 00:12:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS:KE/x64] Handle XState allocation on the stack

Browse Source
This commit is contained in:
Timo Kreuzer
2023-11-14 16:45:18 +02:00
parent 72fbbdf854
commit 410cf69b0c
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ntoskrnl/ke/amd64/stubs.c
View File

@@ -76,6 +76,10 @@ KiSwitchKernelStack(PVOID StackBase, PVOID StackLimit)
CurrentThread->InitialStack = Add2Ptr(CurrentThread->InitialStack,
StackOffset);
/* Switch StateSaveArea */
CurrentThread->StateSaveArea = Add2Ptr(CurrentThread->StateSaveArea,
StackOffset);
/* Set the new stack limits */
CurrentThread->StackBase = StackBase;
CurrentThread->StackLimit = (ULONG_PTR)StackLimit;

30
ntoskrnl/ke/amd64/thrdini.c
View File

@@ -43,12 +43,30 @@ KiInitializeContextThread(IN PKTHREAD Thread,
IN PVOID StartContext,
IN PCONTEXT Context)
{
//PFX_SAVE_AREA FxSaveArea;
//PFXSAVE_FORMAT FxSaveFormat;
PKSTART_FRAME StartFrame;
PKSWITCH_FRAME CtxSwitchFrame;
PKTRAP_FRAME TrapFrame;
ULONG ContextFlags;
PVOID InitialStack;
/* Allocate space on the stack for the XSAVE area */
InitialStack = (PUCHAR)Thread->InitialStack - KeXStateLength;
InitialStack = ALIGN_DOWN_POINTER_BY(InitialStack, 64);
Thread->InitialStack = InitialStack;
/* Initialize the state save area */
Thread->StateSaveArea = InitialStack;
RtlZeroMemory(Thread->StateSaveArea, KeXStateLength);
Thread->StateSaveArea->MxCsr = INITIAL_MXCSR;
/* Special initialization for XSAVES */
if (KeFeatureBits & KF_XSAVES)
{
/* Set bit 63 in XCOMP_BV to mark the area as compacted.
XRSTORS requires this and will #GP otherwise. */
PXSAVE_AREA XSaveArea = (PXSAVE_AREA)Thread->StateSaveArea;
XSaveArea->Header.Reserved[0] = 0x8000000000000000ULL;
}
/* Check if this is a With-Context Thread */
if (Context)
@@ -66,10 +84,8 @@ KiInitializeContextThread(IN PKTHREAD Thread,
/* Tell the thread it will run in User Mode */
Thread->PreviousMode = UserMode;
// FIXME Setup the Fx Area
/* Set the Thread's NPX State */
Thread->NpxState = 0xA;
Thread->NpxState = SharedUserData->XState.EnabledFeatures;
Thread->Header.NpxIrql = PASSIVE_LEVEL;
/* Make sure, we have control registers, disable debug registers */
@@ -123,10 +139,8 @@ KiInitializeContextThread(IN PKTHREAD Thread,
/* Tell the thread it will run in Kernel Mode */
Thread->PreviousMode = KernelMode;
// FIXME Setup the Fx Area
/* No NPX State */
Thread->NpxState = 0xA;
Thread->NpxState = 0;
/* This must never return! */
StartFrame->Return = (ULONG64)KiInvalidSystemThreadStartupExit;