Changeset 60320 in vbox

Timestamp:

Apr 4, 2016 10:10:47 PM (9 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

106386

Message:

bs3-cpu-basic-2: 386 fix

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-template.c (modified) (2 diffs)

trunk/src/VBox/ValidationKit/bootsectors/bs3-cpu-basic-2-template.c

@@ -346 +346 @@
     unsigned        i, j, k;
     uint32_t        uExpected;
+    bool const      f486Plus = (g_uBs3CpuDetected & BS3CPU_TYPE_MASK) >= BS3CPU_80486;
 # if TMPL_BITS == 16
     bool const      f386Plus = (g_uBs3CpuDetected & BS3CPU_TYPE_MASK) >= BS3CPU_80386;
@@ -1158 +1159 @@
             CtxTmp.rflags.u32 |= X86_EFL_CF | X86_EFL_PF | X86_EFL_AF | X86_EFL_ZF | X86_EFL_SF /* | X86_EFL_TF */ /*| X86_EFL_IF*/
                                | X86_EFL_DF | X86_EFL_OF | X86_EFL_IOPL /* | X86_EFL_NT*/;
-            if (f386Plus)
-                CtxTmp.rflags.u32 |= /*X86_EFL_VM |*/ X86_EFL_AC | X86_EFL_VIF | X86_EFL_VIP;
-            if (f386Plus && !g_f16BitSys)
+            if (f486Plus)
+                CtxTmp.rflags.u32 |= X86_EFL_AC;
+            if (f486Plus && !g_f16BitSys)
                 CtxTmp.rflags.u32 |= X86_EFL_RF;
             if (g_uBs3CpuDetected & BS3CPU_F_CPUID)
-                CtxTmp.rflags.u32 |= X86_EFL_ID;
+                CtxTmp.rflags.u32 |= X86_EFL_VIF | X86_EFL_VIP;
             Bs3TrapSetJmpAndRestore(&CtxTmp, &TrapCtx);
             CtxTmp.rflags.u32 &= ~X86_EFL_RF;