Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-04 09:16:17 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOSKRNL]

Browse source 
- Handle VME for the PUSHF and POPF instruction in virtual mode
 - There is no reason to set interrupt flag when handling POPF
 - Fix a typo in POPF case : mask out the right variable
See http://www.rcollins.org/articles/vme1/ for reference

svn path=/trunk/; revision=58852
This commit is contained in:
Jérôme Gardou 2013-04-25 21:29:59 +00:00
parent b4fe8f646f
commit 990171235d
1 changed files with 24 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

32
reactos/ntoskrnl/ke/i386/v86vdm.c
View file

@ -53,16 +53,22 @@ KiVdmOpcodePUSHF(IN PKTRAP_FRAME TrapFrame,
{ {
ULONG Esp, V86EFlags, TrapEFlags; ULONG Esp, V86EFlags, TrapEFlags;
/* Check for VME support */
ASSERT(KeI386VirtualIntExtensions == FALSE);
/* Get current V8086 flags and mask out interrupt flag */ /* Get current V8086 flags and mask out interrupt flag */
V86EFlags = *KiNtVdmState; V86EFlags = *KiNtVdmState;
V86EFlags &= ~EFLAGS_INTERRUPT_MASK; V86EFlags &= ~EFLAGS_INTERRUPT_MASK;
/* Get trap frame EFLags and leave only align, nested task and interrupt */ /* Get trap frame EFLags */
TrapEFlags = TrapFrame->EFlags; TrapEFlags = TrapFrame->EFlags;
V86EFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_NESTED_TASK | EFLAGS_INTERRUPT_MASK); /* Check for VME support */
if(KeI386VirtualIntExtensions)
{
/* Copy the virtual interrupt flag to the interrupt flag */
TrapEFlags &= ~EFLAGS_INTERRUPT_MASK;
if(TrapEFlags & EFLAGS_VIF)
TrapEFlags |= EFLAGS_INTERRUPT_MASK;
}
/* Leave only align, nested task and interrupt */
TrapEFlags &= (EFLAGS_ALIGN_CHECK | EFLAGS_NESTED_TASK | EFLAGS_INTERRUPT_MASK);
/* Add in those flags if they exist, and add in the IOPL flag */ /* Add in those flags if they exist, and add in the IOPL flag */
V86EFlags |= TrapEFlags; V86EFlags |= TrapEFlags;
@ -133,10 +139,20 @@ KiVdmOpcodePOPF(IN PKTRAP_FRAME TrapFrame,
TrapEFlags = TrapFrame->EFlags; TrapEFlags = TrapFrame->EFlags;
/* Check for VME support */ /* Check for VME support */
ASSERT(KeI386VirtualIntExtensions == FALSE); if(KeI386VirtualIntExtensions)
{
/* Copy the IF flag into the VIF one */
V86EFlags &= ~EFLAGS_VIF;
if(V86EFlags & EFLAGS_INTERRUPT_MASK)
{
V86EFlags |= EFLAGS_VIF;
/* Don't set the interrupt flag */
V86EFlags &= ~EFLAGS_INTERRUPT_MASK;
}
}
/* Add V86 and Interrupt flag */ /* Add V86 flag */
V86EFlags |= EFLAGS_V86_MASK | EFLAGS_INTERRUPT_MASK; V86EFlags |= EFLAGS_V86_MASK;
/* Update EFlags in trap frame */ /* Update EFlags in trap frame */
TrapFrame->EFlags = V86EFlags; TrapFrame->EFlags = V86EFlags;