vbox的更動 60384 路徑 trunk/src/VBox/VMM

時間撮記:

2016-4-8 上午12:16:58 (9 年 以前)

作者:

vboxsync

訊息:

IEM: Marked instructions introduced by the 186, 286, 386 and 486 to speed up debugging bs3kit on the 286.

位置:

trunk/src/VBox/VMM

檔案:

• VMMAll/IEMAll.cpp (修改) (1 筆差異)
• VMMAll/IEMAllInstructions.cpp.h (修改) (117 筆差異)
• VMMR3/IEMR3.cpp (修改) (1 筆差異)
• include/IEMInternal.h (修改) (5 筆差異)
• testcase/tstIEMCheckMc.cpp (修改) (1 筆差異)

trunk/src/VBox/VMM/VMMAll/IEMAll.cpp

@@ -9344 +9344 @@
  */
 
+#ifdef IN_RING3
+# define IEMOP_HLP_MIN_CPU(a_uMinCpu, a_fOnlyIf) \
+    do { \
+        if (IEM_GET_TARGET_CPU(pIemCpu) >= (a_uMinCpu) || !(a_fOnlyIf)) { } \
+        else \
+        { \
+            DBGFSTOP(IEMCPU_TO_VM(pIemCpu)); \
+            return IEMOP_RAISE_INVALID_OPCODE(); \
+        } \
+    } while (0)
+#else
+# define IEMOP_HLP_MIN_CPU(a_uMinCpu, a_fOnlyIf) \
+    do { \
+        if (IEM_GET_TARGET_CPU(pIemCpu) >= (a_uMinCpu) || !(a_fOnlyIf)) { } \
+        else return IEMOP_RAISE_INVALID_OPCODE(); \
+    } while (0)
+#endif
+
+/** The instruction requires a 186 or later. */
+#if IEM_CFG_TARGET_CPU >= IEMTARGETCPU_186
+# define IEMOP_HLP_MIN_186() do { } while (0)
+#else
+# define IEMOP_HLP_MIN_186() IEMOP_HLP_MIN_CPU(IEMTARGETCPU_186, true)
+#endif
+
+/** The instruction requires a 286 or later. */
+#if IEM_CFG_TARGET_CPU >= IEMTARGETCPU_286
+# define IEMOP_HLP_MIN_286() do { } while (0)
+#else
+# define IEMOP_HLP_MIN_286() IEMOP_HLP_MIN_CPU(IEMTARGETCPU_286, true)
+#endif
+
+/** The instruction requires a 386 or later. */
+#if IEM_CFG_TARGET_CPU >= IEMTARGETCPU_386
+# define IEMOP_HLP_MIN_386() do { } while (0)
+#else
+# define IEMOP_HLP_MIN_386() IEMOP_HLP_MIN_CPU(IEMTARGETCPU_386, true)
+#endif
+
+/** The instruction requires a 386 or later if the given expression is true. */
+#if IEM_CFG_TARGET_CPU >= IEMTARGETCPU_386
+# define IEMOP_HLP_MIN_386_EX(a_fOnlyIf) do { } while (0)
+#else
+# define IEMOP_HLP_MIN_386_EX(a_fOnlyIf) IEMOP_HLP_MIN_CPU(IEMTARGETCPU_386, a_fOnlyIf)
+#endif
+
+/** The instruction requires a 486 or later. */
+#if IEM_CFG_TARGET_CPU >= IEMTARGETCPU_486
+# define IEMOP_HLP_MIN_486() do { } while (0)
+#else
+# define IEMOP_HLP_MIN_486() IEMOP_HLP_MIN_CPU(IEMTARGETCPU_486, true)
+#endif
+
+/** The instruction requires a Pentium (586) or later. */
+#if IEM_CFG_TARGET_CPU >= IEMTARGETCPU_586
+# define IEMOP_HLP_MIN_586() do { } while (0)
+#else
+# define IEMOP_HLP_MIN_586() IEMOP_HLP_MIN_CPU(IEMTARGETCPU_586, true)
+#endif
+
+/** The instruction requires a PentiumPro (686) or later. */
+#if IEM_CFG_TARGET_CPU >= IEMTARGETCPU_686
+# define IEMOP_HLP_MIN_686() do { } while (0)
+#else
+# define IEMOP_HLP_MIN_686() IEMOP_HLP_MIN_CPU(IEMTARGETCPU_686, true)
+#endif
+
+
 /** The instruction raises an \#UD in real and V8086 mode. */
 #define IEMOP_HLP_NO_REAL_OR_V86_MODE() \

trunk/src/VBox/VMM/VMMAll/IEMAllInstructions.cpp.h

@@ -541 +541 @@
 {
     IEMOP_MNEMONIC("sldt Rv/Mw");
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_NO_REAL_OR_V86_MODE();
 
@@ -598 +599 @@
 {
     IEMOP_MNEMONIC("str Rv/Mw");
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_NO_REAL_OR_V86_MODE();
 
@@ -655 +657 @@
 {
     IEMOP_MNEMONIC("lldt Ew");
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_NO_REAL_OR_V86_MODE();
 
@@ -686 +689 @@
 {
     IEMOP_MNEMONIC("ltr Ew");
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_NO_REAL_OR_V86_MODE();
 
@@ -716 +720 @@
 FNIEMOP_DEF_2(iemOpCommonGrp6VerX, uint8_t, bRm, bool, fWrite)
 {
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_NO_REAL_OR_V86_MODE();
 
@@ -748 +753 @@
 {
     IEMOP_MNEMONIC("verr Ew");
+    IEMOP_HLP_MIN_286();
     return FNIEMOP_CALL_2(iemOpCommonGrp6VerX, bRm, false);
 }
@@ -756 +762 @@
 {
     IEMOP_MNEMONIC("verr Ew");
+    IEMOP_HLP_MIN_286();
     return FNIEMOP_CALL_2(iemOpCommonGrp6VerX, bRm, true);
 }
@@ -784 +791 @@
 {
     IEMOP_MNEMONIC("sgdt Ms");
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_64BIT_OP_SIZE();
     IEM_MC_BEGIN(3, 1);
@@ -834 +842 @@
 {
     IEMOP_MNEMONIC("sidt Ms");
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_64BIT_OP_SIZE();
     IEM_MC_BEGIN(3, 1);
@@ -957 +966 @@
 {
     IEMOP_MNEMONIC("smsw");
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_NO_LOCK_PREFIX();
     if ((bRm & X86_MODRM_MOD_MASK) == (3 << X86_MODRM_MOD_SHIFT))
@@ -1014 +1024 @@
        lower 3-bits are used. */
     IEMOP_MNEMONIC("lmsw");
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_NO_LOCK_PREFIX();
     if ((bRm & X86_MODRM_MOD_MASK) == (3 << X86_MODRM_MOD_SHIFT))
@@ -1041 +1052 @@
 {
     IEMOP_MNEMONIC("invlpg");
+    IEMOP_HLP_MIN_486();
     IEMOP_HLP_NO_LOCK_PREFIX();
     IEM_MC_BEGIN(1, 1);
@@ -1055 +1067 @@
 {
     IEMOP_MNEMONIC("swapgs");
+    IEMOP_HLP_ONLY_64BIT();
     IEMOP_HLP_NO_LOCK_PREFIX();
-    IEMOP_HLP_ONLY_64BIT();
     return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_swapgs);
 }
@@ -1267 +1279 @@
 
 
-/** Opcode 0x0f 0x04. */
+/** Opcode 0x0f 0x05. */
 FNIEMOP_DEF(iemOp_syscall)
 {
-    IEMOP_MNEMONIC("syscall");
+    IEMOP_MNEMONIC("syscall"); /** @todo 286 LOADALL   */
     IEMOP_HLP_NO_LOCK_PREFIX();
     return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_syscall);
@@ -1276 +1288 @@
 
 
-/** Opcode 0x0f 0x05. */
+/** Opcode 0x0f 0x06. */
 FNIEMOP_DEF(iemOp_clts)
 {
@@ -1285 +1297 @@
 
 
-/** Opcode 0x0f 0x06. */
+/** Opcode 0x0f 0x07. */
 FNIEMOP_DEF(iemOp_sysret)
 {
-    IEMOP_MNEMONIC("sysret");
+    IEMOP_MNEMONIC("sysret");  /** @todo 386 LOADALL   */
     IEMOP_HLP_NO_LOCK_PREFIX();
     return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_sysret);
@@ -1296 +1308 @@
 /** Opcode 0x0f 0x08. */
 FNIEMOP_STUB(iemOp_invd);
+// IEMOP_HLP_MIN_486();
 
 
@@ -1302 +1315 @@
 {
     IEMOP_MNEMONIC("wbinvd");
+    IEMOP_HLP_MIN_486();
     IEMOP_HLP_NO_LOCK_PREFIX();
     IEM_MC_BEGIN(0, 0);
@@ -1555 +1569 @@
     /* mod is ignored, as is operand size overrides. */
     IEMOP_MNEMONIC("mov Rd,Cd");
+    IEMOP_HLP_MIN_386();
     if (pIemCpu->enmCpuMode == IEMMODE_64BIT)
         pIemCpu->enmEffOpSize = pIemCpu->enmDefOpSize = IEMMODE_64BIT;
@@ -1586 +1601 @@
 {
     IEMOP_MNEMONIC("mov Rd,Dd");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX();
@@ -1601 +1617 @@
     /* mod is ignored, as is operand size overrides. */
     IEMOP_MNEMONIC("mov Cd,Rd");
+    IEMOP_HLP_MIN_386();
     if (pIemCpu->enmCpuMode == IEMMODE_64BIT)
         pIemCpu->enmEffOpSize = pIemCpu->enmDefOpSize = IEMMODE_64BIT;
@@ -1632 +1649 @@
 {
     IEMOP_MNEMONIC("mov Dd,Rd");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
@@ -1646 +1664 @@
 {
     IEMOP_MNEMONIC("mov Rd,Td");
+    /** @todo works on 386 and 486. */
     /* The RM byte is not considered, see testcase. */
     return IEMOP_RAISE_INVALID_OPCODE();
@@ -1655 +1674 @@
 {
     IEMOP_MNEMONIC("mov Td,Rd");
+    /** @todo works on 386 and 486. */
     /* The RM byte is not considered, see testcase. */
     return IEMOP_RAISE_INVALID_OPCODE();
@@ -3122 +3142 @@
 {
     IEMOP_MNEMONIC("jo  Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3157 +3178 @@
 {
     IEMOP_MNEMONIC("jno Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3192 +3214 @@
 {
     IEMOP_MNEMONIC("jc/jb/jnae Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3227 +3250 @@
 {
     IEMOP_MNEMONIC("jnc/jnb/jae Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3262 +3286 @@
 {
     IEMOP_MNEMONIC("je/jz Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3297 +3322 @@
 {
     IEMOP_MNEMONIC("jne/jnz Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3332 +3358 @@
 {
     IEMOP_MNEMONIC("jbe/jna Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3367 +3394 @@
 {
     IEMOP_MNEMONIC("jnbe/ja Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3402 +3430 @@
 {
     IEMOP_MNEMONIC("js  Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3437 +3466 @@
 {
     IEMOP_MNEMONIC("jns Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3472 +3502 @@
 {
     IEMOP_MNEMONIC("jp  Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3507 +3538 @@
 {
     IEMOP_MNEMONIC("jo  Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3542 +3574 @@
 {
     IEMOP_MNEMONIC("jl/jnge Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3577 +3610 @@
 {
     IEMOP_MNEMONIC("jnl/jge Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3612 +3646 @@
 {
     IEMOP_MNEMONIC("jle/jng Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3647 +3682 @@
 {
     IEMOP_MNEMONIC("jnle/jg Jv");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -3682 +3718 @@
 {
     IEMOP_MNEMONIC("seto Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -3722 +3759 @@
 {
     IEMOP_MNEMONIC("setno Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -3762 +3800 @@
 {
     IEMOP_MNEMONIC("setc Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -3802 +3841 @@
 {
     IEMOP_MNEMONIC("setnc Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -3842 +3882 @@
 {
     IEMOP_MNEMONIC("sete Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -3882 +3923 @@
 {
     IEMOP_MNEMONIC("setne Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -3922 +3964 @@
 {
     IEMOP_MNEMONIC("setbe Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -3962 +4005 @@
 {
     IEMOP_MNEMONIC("setnbe Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -4002 +4046 @@
 {
     IEMOP_MNEMONIC("sets Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -4042 +4087 @@
 {
     IEMOP_MNEMONIC("setns Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -4082 +4128 @@
 {
     IEMOP_MNEMONIC("setnp Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -4122 +4169 @@
 {
     IEMOP_MNEMONIC("setnp Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -4162 +4210 @@
 {
     IEMOP_MNEMONIC("setl Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -4202 +4251 @@
 {
     IEMOP_MNEMONIC("setnl Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -4242 +4292 @@
 {
     IEMOP_MNEMONIC("setle Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -4282 +4333 @@
 {
     IEMOP_MNEMONIC("setnle Eb");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_HLP_NO_LOCK_PREFIX(); /** @todo too early? */
@@ -4366 +4418 @@
 {
     IEMOP_MNEMONIC("push fs");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_NO_LOCK_PREFIX();
     return FNIEMOP_CALL_1(iemOpCommonPushSReg, X86_SREG_FS);
@@ -4375 +4428 @@
 {
     IEMOP_MNEMONIC("pop fs");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_NO_LOCK_PREFIX();
     return IEM_MC_DEFER_TO_CIMPL_2(iemCImpl_pop_Sreg, X86_SREG_FS, pIemCpu->enmEffOpSize);
@@ -4384 +4438 @@
 {
     IEMOP_MNEMONIC("cpuid");
+    IEMOP_HLP_MIN_486(); /* not all 486es. */
     IEMOP_HLP_NO_LOCK_PREFIX();
     return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_cpuid);
@@ -4571 +4626 @@
 {
     IEMOP_MNEMONIC("bt  Gv,Gv");
+    IEMOP_HLP_MIN_386();
     return FNIEMOP_CALL_1(iemOpCommonBit_Ev_Gv, &g_iemAImpl_bt);
 }
@@ -4871 +4927 @@
 {
     IEMOP_MNEMONIC("shld Ev,Gv,Ib");
+    IEMOP_HLP_MIN_386();
     return FNIEMOP_CALL_1(iemOpCommonShldShrd_Ib, &g_iemAImpl_shld);
 }
 
 
-/** Opcode 0x0f 0xa7. */
+/** Opcode 0x0f 0xa5. */
 FNIEMOP_DEF(iemOp_shld_Ev_Gv_CL)
 {
     IEMOP_MNEMONIC("shld Ev,Gv,CL");
+    IEMOP_HLP_MIN_386();
     return FNIEMOP_CALL_1(iemOpCommonShldShrd_CL, &g_iemAImpl_shld);
 }
@@ -4887 +4945 @@
 {
     IEMOP_MNEMONIC("push gs");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_NO_LOCK_PREFIX();
     return FNIEMOP_CALL_1(iemOpCommonPushSReg, X86_SREG_GS);
@@ -4896 +4955 @@
 {
     IEMOP_MNEMONIC("pop gs");
+    IEMOP_HLP_MIN_386();
     IEMOP_HLP_NO_LOCK_PREFIX();
     return IEM_MC_DEFER_TO_CIMPL_2(iemCImpl_pop_Sreg, X86_SREG_GS, pIemCpu->enmEffOpSize);
@@ -4903 +4963 @@
 /** Opcode 0x0f 0xaa. */
 FNIEMOP_STUB(iemOp_rsm);
+//IEMOP_HLP_MIN_386();
 
 
@@ -4909 +4970 @@
 {
     IEMOP_MNEMONIC("bts Ev,Gv");
+    IEMOP_HLP_MIN_386();
     return FNIEMOP_CALL_1(iemOpCommonBit_Ev_Gv, &g_iemAImpl_bts);
 }
@@ -4917 +4979 @@
 {
     IEMOP_MNEMONIC("shrd Ev,Gv,Ib");
+    IEMOP_HLP_MIN_386();
     return FNIEMOP_CALL_1(iemOpCommonShldShrd_Ib, &g_iemAImpl_shrd);
 }
@@ -4925 +4988 @@
 {
     IEMOP_MNEMONIC("shrd Ev,Gv,CL");
+    IEMOP_HLP_MIN_386();
     return FNIEMOP_CALL_1(iemOpCommonShldShrd_CL, &g_iemAImpl_shrd);
 }
@@ -5061 +5125 @@
 FNIEMOP_DEF(iemOp_Grp15)
 {
+    IEMOP_HLP_MIN_586(); /* Not entirely accurate nor needed, but useful for debugging 286 code. */
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     if ((bRm & X86_MODRM_MOD_MASK) != (3 << X86_MODRM_MOD_SHIFT))
@@ -5122 +5187 @@
 {
     IEMOP_MNEMONIC("imul Gv,Ev");
+    IEMOP_HLP_MIN_386();
     IEMOP_VERIFICATION_UNDEFINED_EFLAGS(X86_EFL_SF | X86_EFL_ZF | X86_EFL_AF | X86_EFL_PF);
     return FNIEMOP_CALL_1(iemOpHlpBinaryOperator_rv_rm, &g_iemAImpl_imul_two);
@@ -5131 +5197 @@
 {
     IEMOP_MNEMONIC("cmpxchg Eb,Gb");
+    IEMOP_HLP_MIN_486();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
 
@@ -5189 +5256 @@
 {
     IEMOP_MNEMONIC("cmpxchg Ev,Gv");
+    IEMOP_HLP_MIN_486();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
 
@@ -5446 +5514 @@
 {
     IEMOP_MNEMONIC("lss Gv,Mp");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     if ((bRm & X86_MODRM_MOD_MASK) == (3 << X86_MODRM_MOD_SHIFT))
@@ -5465 +5534 @@
 {
     IEMOP_MNEMONIC("lfs Gv,Mp");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     if ((bRm & X86_MODRM_MOD_MASK) == (3 << X86_MODRM_MOD_SHIFT))
@@ -5476 +5546 @@
 {
     IEMOP_MNEMONIC("lgs Gv,Mp");
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     if ((bRm & X86_MODRM_MOD_MASK) == (3 << X86_MODRM_MOD_SHIFT))
@@ -5487 +5558 @@
 {
     IEMOP_MNEMONIC("movzx Gv,Eb");
+    IEMOP_HLP_MIN_386();
 
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
@@ -5578 +5650 @@
 {
     IEMOP_MNEMONIC("movzx Gv,Ew");
+    IEMOP_HLP_MIN_386();
 
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
@@ -5656 +5729 @@
 FNIEMOP_DEF(iemOp_Grp8)
 {
+    IEMOP_HLP_MIN_386();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     PCIEMOPBINSIZES pImpl;
@@ -5820 +5894 @@
 {
     IEMOP_MNEMONIC("btc Ev,Gv");
+    IEMOP_HLP_MIN_386();
     return FNIEMOP_CALL_1(iemOpCommonBit_Ev_Gv, &g_iemAImpl_btc);
 }
@@ -5828 +5903 @@
 {
     IEMOP_MNEMONIC("bsf Gv,Ev");
+    IEMOP_HLP_MIN_386();
     IEMOP_VERIFICATION_UNDEFINED_EFLAGS(X86_EFL_OF | X86_EFL_SF | X86_EFL_AF | X86_EFL_PF | X86_EFL_CF);
     return FNIEMOP_CALL_1(iemOpHlpBinaryOperator_rv_rm, &g_iemAImpl_bsf);
@@ -5837 +5913 @@
 {
     IEMOP_MNEMONIC("bsr Gv,Ev");
+    IEMOP_HLP_MIN_386();
     IEMOP_VERIFICATION_UNDEFINED_EFLAGS(X86_EFL_OF | X86_EFL_SF | X86_EFL_AF | X86_EFL_PF | X86_EFL_CF);
     return FNIEMOP_CALL_1(iemOpHlpBinaryOperator_rv_rm, &g_iemAImpl_bsr);
@@ -5846 +5923 @@
 {
     IEMOP_MNEMONIC("movsx Gv,Eb");
+    IEMOP_HLP_MIN_386();
 
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
@@ -5937 +6015 @@
 {
     IEMOP_MNEMONIC("movsx Gv,Ew");
+    IEMOP_HLP_MIN_386();
 
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
@@ -6004 +6083 @@
 {
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
+    IEMOP_HLP_MIN_486();
     IEMOP_MNEMONIC("xadd Eb,Gb");
 
@@ -6063 +6143 @@
 {
     IEMOP_MNEMONIC("xadd Ev,Gv");
+    IEMOP_HLP_MIN_486();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
 
@@ -6385 +6466 @@
              prefix.  REX.B is the correct prefix it appears.  For a parallel
              case, see iemOp_mov_AL_Ib and iemOp_mov_eAX_Iv. */
+    IEMOP_HLP_MIN_486();
     return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xAX | pIemCpu->uRexB);
 }
@@ -6393 +6475 @@
 {
     IEMOP_MNEMONIC("bswap rCX/r9");
+    IEMOP_HLP_MIN_486();
     return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xCX | pIemCpu->uRexB);
 }
@@ -6401 +6484 @@
 {
     IEMOP_MNEMONIC("bswap rDX/r9");
+    IEMOP_HLP_MIN_486();
     return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xDX | pIemCpu->uRexB);
 }
@@ -6409 +6493 @@
 {
     IEMOP_MNEMONIC("bswap rBX/r9");
+    IEMOP_HLP_MIN_486();
     return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xBX | pIemCpu->uRexB);
 }
@@ -6417 +6502 @@
 {
     IEMOP_MNEMONIC("bswap rSP/r12");
+    IEMOP_HLP_MIN_486();
     return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xSP | pIemCpu->uRexB);
 }
@@ -6425 +6511 @@
 {
     IEMOP_MNEMONIC("bswap rBP/r13");
+    IEMOP_HLP_MIN_486();
     return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xBP | pIemCpu->uRexB);
 }
@@ -6433 +6520 @@
 {
     IEMOP_MNEMONIC("bswap rSI/r14");
+    IEMOP_HLP_MIN_486();
     return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xSI | pIemCpu->uRexB);
 }
@@ -6441 +6529 @@
 {
     IEMOP_MNEMONIC("bswap rDI/r15");
+    IEMOP_HLP_MIN_486();
     return FNIEMOP_CALL_1(iemOpCommonBswapGReg, X86_GREG_xDI | pIemCpu->uRexB);
 }
@@ -6999 +7088 @@
 {
     uint8_t b; IEM_OPCODE_GET_NEXT_U8(&b);
+    /** @todo PUSH CS on 8086, undefined on 80186. */
+    IEMOP_HLP_MIN_286();
     return FNIEMOP_CALL(g_apfnTwoByteMap[b]);
 }
@@ -8084 +8175 @@
 {
     IEMOP_MNEMONIC("pusha");
+    IEMOP_HLP_MIN_186();
     IEMOP_HLP_NO_64BIT();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -8096 +8188 @@
 {
     IEMOP_MNEMONIC("popa");
+    IEMOP_HLP_MIN_186();
     IEMOP_HLP_NO_64BIT();
     if (pIemCpu->enmEffOpSize == IEMMODE_16BIT)
@@ -8106 +8199 @@
 /** Opcode 0x62. */
 FNIEMOP_STUB(iemOp_bound_Gv_Ma_evex);
+//    IEMOP_HLP_MIN_186();
 
 
@@ -8112 +8206 @@
 {
     IEMOP_MNEMONIC("arpl Ew,Gw");
+    IEMOP_HLP_MIN_286();
     IEMOP_HLP_NO_REAL_OR_V86_MODE();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
@@ -8205 +8300 @@
 {
     IEMOP_HLP_CLEAR_REX_NOT_BEFORE_OPCODE("seg fs");
+    IEMOP_HLP_MIN_386();
+
     pIemCpu->fPrefixes |= IEM_OP_PRF_SEG_FS;
     pIemCpu->iEffSeg    = X86_SREG_FS;
@@ -8217 +8314 @@
 {
     IEMOP_HLP_CLEAR_REX_NOT_BEFORE_OPCODE("seg gs");
+    IEMOP_HLP_MIN_386();
+
     pIemCpu->fPrefixes |= IEM_OP_PRF_SEG_GS;
     pIemCpu->iEffSeg    = X86_SREG_GS;
@@ -8229 +8328 @@
 {
     IEMOP_HLP_CLEAR_REX_NOT_BEFORE_OPCODE("op size");
+    IEMOP_HLP_MIN_386();
+
     pIemCpu->fPrefixes |= IEM_OP_PRF_SIZE_OP;
     iemRecalEffOpSize(pIemCpu);
@@ -8241 +8342 @@
 {
     IEMOP_HLP_CLEAR_REX_NOT_BEFORE_OPCODE("addr size");
+    IEMOP_HLP_MIN_386();
+
     pIemCpu->fPrefixes |= IEM_OP_PRF_SIZE_ADDR;
     switch (pIemCpu->enmDefAddrMode)
@@ -8259 +8362 @@
 {
     IEMOP_MNEMONIC("push Iz");
+    IEMOP_HLP_MIN_186();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     switch (pIemCpu->enmEffOpSize)
@@ -8304 +8408 @@
 {
     IEMOP_MNEMONIC("imul Gv,Ev,Iz"); /* Gv = Ev * Iz; */
+    IEMOP_HLP_MIN_186();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_VERIFICATION_UNDEFINED_EFLAGS(X86_EFL_SF | X86_EFL_ZF | X86_EFL_AF | X86_EFL_PF);
@@ -8464 +8569 @@
 {
     IEMOP_MNEMONIC("push Ib");
+    IEMOP_HLP_MIN_186();
     int8_t i8Imm; IEM_OPCODE_GET_NEXT_S8(&i8Imm);
     IEMOP_HLP_NO_LOCK_PREFIX();
@@ -8491 +8597 @@
 {
     IEMOP_MNEMONIC("imul Gv,Ev,Ib"); /* Gv = Ev * Iz; */
+    IEMOP_HLP_MIN_186();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_VERIFICATION_UNDEFINED_EFLAGS(X86_EFL_SF | X86_EFL_ZF | X86_EFL_AF | X86_EFL_PF);
@@ -8644 +8751 @@
 FNIEMOP_DEF(iemOp_insb_Yb_DX)
 {
+    IEMOP_HLP_MIN_186();
     IEMOP_HLP_NO_LOCK_PREFIX();
     if (pIemCpu->fPrefixes & (IEM_OP_PRF_REPNZ | IEM_OP_PRF_REPZ))
@@ -8673 +8781 @@
 FNIEMOP_DEF(iemOp_inswd_Yv_DX)
 {
+    IEMOP_HLP_MIN_186();
     IEMOP_HLP_NO_LOCK_PREFIX();
     if (pIemCpu->fPrefixes & (IEM_OP_PRF_REPZ | IEM_OP_PRF_REPNZ))
@@ -8734 +8843 @@
 FNIEMOP_DEF(iemOp_outsb_Yb_DX)
 {
+    IEMOP_HLP_MIN_186();
     IEMOP_HLP_NO_LOCK_PREFIX();
     if (pIemCpu->fPrefixes & (IEM_OP_PRF_REPNZ | IEM_OP_PRF_REPZ))
@@ -8763 +8873 @@
 FNIEMOP_DEF(iemOp_outswd_Yv_DX)
 {
+    IEMOP_HLP_MIN_186();
     IEMOP_HLP_NO_LOCK_PREFIX();
     if (pIemCpu->fPrefixes & (IEM_OP_PRF_REPZ | IEM_OP_PRF_REPNZ))
@@ -9373 +9484 @@
     uint8_t bRm;   IEM_OPCODE_GET_NEXT_U8(&bRm);
     IEMOP_MNEMONIC2("add\0or\0\0adc\0sbb\0and\0sub\0xor\0cmp" + ((bRm >> X86_MODRM_REG_SHIFT) & X86_MODRM_REG_SMASK)*4, "Ev,Ib");
+    /* Note! Seems the OR, AND, and XOR instructions are present on CPUs prior
+             to the 386 even if absent in the intel reference manuals and some
+             3rd party opcode listings. */
     PCIEMOPBINSIZES pImpl = g_apIemImplGrp1[(bRm >> X86_MODRM_REG_SHIFT) & X86_MODRM_REG_SMASK];
 
@@ -11766 +11880 @@
 FNIEMOP_DEF(iemOp_Grp2_Eb_Ib)
 {
+    IEMOP_HLP_MIN_186();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     PCIEMOPSHIFTSIZES pImpl;
@@ -11826 +11941 @@
 FNIEMOP_DEF(iemOp_Grp2_Ev_Ib)
 {
+    IEMOP_HLP_MIN_186();
     uint8_t bRm; IEM_OPCODE_GET_NEXT_U8(&bRm);
     PCIEMOPSHIFTSIZES pImpl;
@@ -12164 +12280 @@
 {
     IEMOP_MNEMONIC("enter Iw,Ib");
+    IEMOP_HLP_MIN_186();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     IEMOP_HLP_NO_LOCK_PREFIX();
@@ -12176 +12293 @@
 {
     IEMOP_MNEMONIC("retn");
+    IEMOP_HLP_MIN_186();
     IEMOP_HLP_DEFAULT_64BIT_OP_SIZE();
     IEMOP_HLP_NO_LOCK_PREFIX();
@@ -12656 +12774 @@
 {
     IEMOP_MNEMONIC("salc");
+    IEMOP_HLP_MIN_286(); /* (undocument at the time) */
     uint8_t bImm; IEM_OPCODE_GET_NEXT_U8(&bImm);
     IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
@@ -16204 +16323 @@
 {
     IEMOP_MNEMONIC("int1"); /* icebp */
+    IEMOP_HLP_MIN_386(); /** @todo does not generate #UD on 286, or so they say... */
     /** @todo testcase! */
     return IEM_MC_DEFER_TO_CIMPL_2(iemCImpl_int, X86_XCPT_DB, false /*fIsBpInstr*/);
@@ -16239 +16359 @@
 {
     IEMOP_HLP_NO_LOCK_PREFIX();
+#if IEM_CFG_TARGET_CPU == IEMTARGETCPU_DYNAMIC && 0
+    if (   pIemCpu->uTargetCpu == IEMTARGETCPU_CURRENT
+        && pIemCpu->CTX_SUFF(pCtx)->cs.Sel <= 1000)
+    {
+        pIemCpu->uTargetCpu = IEMTARGETCPU_286;
+        LogAlways(("\niemOp_hlt: Enabled CPU restrictions!\n\n"));
+    }
+#endif
     return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_hlt);
 }

trunk/src/VBox/VMM/VMMR3/IEMR3.cpp

@@ -72 +72 @@
          * Host and guest CPU information.
          */
+#if IEM_CFG_TARGET_CPU == IEMTARGETCPU_DYNAMIC
+        pVCpu->iem.s.uTargetCpu = IEMTARGETCPU_CURRENT;
+#endif
         if (idCpu == 0)
         {

trunk/src/VBox/VMM/include/IEMInternal.h

@@ -48 +48 @@
 # define IEM_VERIFICATION_MODE_FULL
 #endif
+
+
+/** @def IEM_CFG_TARGET_CPU
+ * The minimum target CPU for the IEM emulation (IEMTARGETCPU_XXX value). The
+ * default is the a "current" CPU, i.e. something newer than the pentium pro. By
+ * twiddling this value, you can make IEM try behave like older CPUs which is
+ * useful when checking software that needs to run on real old CPUs.
+ */
+#if !defined(IEM_CFG_TARGET_CPU) || defined(DOXYGEN_RUNNING)
+# define IEM_CFG_TARGET_CPU IEMTARGETCPU_CURRENT
+/*# define IEM_CFG_TARGET_CPU IEMTARGETCPU_DYNAMIC*/
+#endif
+
 
 
@@ -382 +395 @@
     uint8_t                 offFpuOpcode;
 
-    /** @}*/
+    /** @} */
 
     /** The number of active guest memory mappings. */
@@ -451 +464 @@
     /** @name Target CPU information.
      * @{ */
+#if IEM_CFG_TARGET_CPU == IEMTARGETCPU_DYNAMIC
+    /** The target CPU. */
+    uint32_t                uTargetCpu;
+#else
+    uint32_t                u32TargetCpuPadding;
+#endif
     /** The CPU vendor. */
     CPUMCPUVENDOR           enmCpuVendor;
@@ -460 +479 @@
     CPUMCPUVENDOR           enmHostCpuVendor;
     /** @} */
+
+    uint32_t                u32Alignment6; /**< Alignment padding. */
 
 #ifdef IEM_VERIFICATION_MODE_FULL
@@ -490 +511 @@
  */
 #define IEMCPU_TO_VM(a_pIemCpu)     ((PVM)( (uintptr_t)(a_pIemCpu) + a_pIemCpu->offVM ))
+
+/** Gets the current IEMTARGETCPU value.
+ * @returns IEMTARGETCPU value.
+ * @param   a_pIemCpu       The IEM per CPU instance data.
+ */
+#if IEM_CFG_TARGET_CPU != IEMTARGETCPU_DYNAMIC
+# define IEM_GET_TARGET_CPU(a_pIemCpu)   (IEM_CFG_TARGET_CPU)
+#else
+# define IEM_GET_TARGET_CPU(a_pIemCpu)   ((a_pIemCpu)->uTargetCpu)
+#endif
 
 /** @name IEM_ACCESS_XXX - Access details.

trunk/src/VBox/VMM/testcase/tstIEMCheckMc.cpp

@@ -100 +100 @@
 #define IEM_OPCODE_GET_NEXT_S32_SX_U64(a_pu64)              do { *(a_pu64) = g_bRandom; CHK_PTYPE(uint64_t *, a_pu64); } while (0)
 #define IEM_OPCODE_GET_NEXT_U64(a_pu64)                     do { *(a_pu64) = g_bRandom; CHK_PTYPE(uint64_t *, a_pu64); } while (0)
+#define IEMOP_HLP_MIN_186()                                 do { } while (0)
+#define IEMOP_HLP_MIN_286()                                 do { } while (0)
+#define IEMOP_HLP_MIN_386()                                 do { } while (0)
+#define IEMOP_HLP_MIN_386_EX(a_fTrue)                       do { } while (0)
+#define IEMOP_HLP_MIN_486()                                 do { } while (0)
+#define IEMOP_HLP_MIN_586()                                 do { } while (0)
+#define IEMOP_HLP_MIN_686()                                 do { } while (0)
 #define IEMOP_HLP_NO_REAL_OR_V86_MODE()                     do { } while (0)
 #define IEMOP_HLP_NO_LOCK_PREFIX()                          do { } while (0)