Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-01 03:54:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
Simplify code, which should bring some fixing

svn path=/trunk/; revision=49618
This commit is contained in:
Pierre Schweitzer 2010-11-19 06:46:59 +00:00
parent ae495fcf68
commit 752c855c83
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
reactos/ntoskrnl/ke/i386/thrdini.c
View file

@ -334,7 +334,6 @@ KiSwapContextExit(IN PKTHREAD OldThread,
PKPROCESS OldProcess, NewProcess; PKPROCESS OldProcess, NewProcess;
PKGDTENTRY GdtEntry; PKGDTENTRY GdtEntry;
PKTHREAD NewThread; PKTHREAD NewThread;
PKUINIT_FRAME InitFrame;
/* We are on the new thread stack now */ /* We are on the new thread stack now */
NewThread = Pcr->PrcbData.CurrentThread; NewThread = Pcr->PrcbData.CurrentThread;
@ -366,12 +365,12 @@ KiSwapContextExit(IN PKTHREAD OldThread,
GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)NewThread->Teb >> 24); GdtEntry->HighWord.Bytes.BaseHi = (UCHAR)((ULONG_PTR)NewThread->Teb >> 24);
/* Set new TSS fields */ /* Set new TSS fields */
InitFrame = (PKUINIT_FRAME)NewThread->InitialStack - 1; Pcr->TSS->Esp0 = (ULONG_PTR)NewThread->InitialStack;
Pcr->TSS->Esp0 = (ULONG_PTR)&InitFrame->TrapFrame; if (!((KeGetTrapFrame(NewThread))->EFlags & EFLAGS_V86_MASK))
if (!(InitFrame->TrapFrame.EFlags & EFLAGS_V86_MASK))
{ {
Pcr->TSS->Esp0 -= (FIELD_OFFSET(KTRAP_FRAME, V86Gs) - FIELD_OFFSET(KTRAP_FRAME, HardwareSegSs)); Pcr->TSS->Esp0 -= (FIELD_OFFSET(KTRAP_FRAME, V86Gs) - FIELD_OFFSET(KTRAP_FRAME, HardwareSegSs));
} }
Pcr->TSS->Esp0 -= NPX_FRAME_LENGTH;
Pcr->TSS->IoMapBase = NewProcess->IopmOffset; Pcr->TSS->IoMapBase = NewProcess->IopmOffset;
/* Increase thread context switches */ /* Increase thread context switches */
@ -443,7 +442,7 @@ KiSwapContextEntry(IN PKSWITCHFRAME SwitchFrame,
Cr0 = __readcr0(); Cr0 = __readcr0();
NewCr0 = NewThread->NpxState | NewCr0 = NewThread->NpxState |
(Cr0 & ~(CR0_MP | CR0_EM | CR0_TS)) | (Cr0 & ~(CR0_MP | CR0_EM | CR0_TS)) |
((PKUINIT_FRAME)NewThread->InitialStack - 1)->FxSaveArea.Cr0NpxState; KiGetThreadNpxArea(NewThread)->Cr0NpxState;
if (Cr0 != NewCr0) __writecr0(NewCr0); if (Cr0 != NewCr0) __writecr0(NewCr0);
/* Now enable interrupts and do the switch */ /* Now enable interrupts and do the switch */