Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-06 01:13:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NTOS]

Browse source 
- Always initialize TrapFrame segment selectors in KiEnterTrap, because further C code relies on at least TrapFrame->SegFs being correct. Running Arwinss on VirtualBox exposed this bug.
I wouldn't find solution for this bug without Timo's great help!

svn path=/trunk/; revision=50095
This commit is contained in:
Aleksey Bragin 2010-12-22 14:26:36 +00:00
parent 2342366fe3
commit fc17a96938
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reactos/ntoskrnl/include/internal/i386/asmmacro.S
View file

@ -135,7 +135,17 @@ MACRO(KiEnterTrap, Flags)
endif
/* Save segment registers? */
if (NOT (Flags AND KI_DONT_SAVE_SEGS))
if (Flags AND KI_DONT_SAVE_SEGS)
/* Initialize TrapFrame segment registers with sane values */
mov eax, 0x23
mov ecx, fs
mov [esp - FrameSize + KTRAP_FRAME_DS], eax
mov [esp - FrameSize + KTRAP_FRAME_ES], eax
mov [esp - FrameSize + KTRAP_FRAME_FS], ecx
mov dword ptr [esp - FrameSize + KTRAP_FRAME_GS], 0
else
/* Check for V86 mode */
test byte ptr [esp + KTRAP_FRAME_EFLAGS + 2], (EFLAGS_V86_MASK / HEX(10000))