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

[FAST486]

Browse source 
Fix VERR and VERW.


svn path=/trunk/; revision=68016
This commit is contained in:
Aleksandar Andrejevic 2015-06-04 20:25:14 +00:00
parent 17d16d0718
commit e97fb8ee65
1 changed files with 17 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
reactos/lib/fast486/opgroups.c
View file

@ -2002,13 +2002,6 @@ FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0F00)
return;
}
/* This is a privileged instruction */
if (Fast486GetCurrentPrivLevel(State) != 0)
{
Fast486Exception(State, FAST486_EXCEPTION_GP);
return;
}
if (!Fast486ReadModrmWordOperands(State,
&ModRegRm,
NULL,
@ -2033,23 +2026,23 @@ FAST486_OPCODE_HANDLER(Fast486ExtOpcodeGroup0F00)
/* Set ZF if it is valid and accessible */
State->Flags.Zf = GdtEntry.Present // must be present
&& GdtEntry.SystemType // must be a segment
&& (((ModRegRm.Register == 4)
/* code segments are only readable if the RW bit is set */
&& (!GdtEntry.Executable || GdtEntry.ReadWrite))
|| ((ModRegRm.Register == 5)
/* code segments are never writable, data segments are writable when RW is set */
&& (!GdtEntry.Executable && GdtEntry.ReadWrite)))
/*
* for segments other than conforming code segments,
* both RPL and CPL must be less than or equal to DPL
*/
&& ((!GdtEntry.Executable || !GdtEntry.DirConf)
&& ((GET_SEGMENT_RPL(Selector) <= GdtEntry.Dpl)
&& (Fast486GetCurrentPrivLevel(State) <= GdtEntry.Dpl)))
/* for conforming code segments, DPL must be less than or equal to CPL */
&& ((GdtEntry.Executable && GdtEntry.DirConf)
&& (GdtEntry.Dpl <= Fast486GetCurrentPrivLevel(State)));
&& GdtEntry.SystemType // must be a segment
&& (((ModRegRm.Register == 4)
/* code segments are only readable if the RW bit is set */
&& (!GdtEntry.Executable || GdtEntry.ReadWrite))
|| ((ModRegRm.Register == 5)
/* code segments are never writable, data segments are writable when RW is set */
&& (!GdtEntry.Executable && GdtEntry.ReadWrite)))
/*
* for segments other than conforming code segments,
* both RPL and CPL must be less than or equal to DPL
*/
&& (((!GdtEntry.Executable || !GdtEntry.DirConf)
&& (GET_SEGMENT_RPL(Selector) <= GdtEntry.Dpl)
&& (Fast486GetCurrentPrivLevel(State) <= GdtEntry.Dpl))
/* for conforming code segments, DPL must be less than or equal to CPL */
|| ((GdtEntry.Executable && GdtEntry.DirConf)
&& (GdtEntry.Dpl <= Fast486GetCurrentPrivLevel(State))));
break;