Changeset 47327 in vbox

Timestamp:

Jul 22, 2013 10:11:09 PM (12 years ago)

Author:

vboxsync

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

87470

Message:

IEM: Implemented swapgs

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAll.cpp (modified) (1 diff)
• VMMAll/IEMAllCImpl.cpp.h (modified) (1 diff)
• VMMAll/IEMAllInstructions.cpp.h (modified) (7 diffs)
• testcase/tstIEMCheckMc.cpp (modified) (1 diff)

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

@@ -7394 +7394 @@
     { \
         if (pIemCpu->enmCpuMode == IEMMODE_64BIT) \
+            return IEMOP_RAISE_INVALID_OPCODE(); \
+    } while (0)
+
+/** The instruction is only available in 64-bit mode, throw #UD if we're not in
+ * 64-bit mode. */
+#define IEMOP_HLP_ONLY_64BIT() \
+    do \
+    { \
+        if (pIemCpu->enmCpuMode != IEMMODE_64BIT) \
             return IEMOP_RAISE_INVALID_OPCODE(); \
     } while (0)

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

@@ -4418 +4418 @@
 
 /**
+ * Implements 'SWAPGS'.
+ */
+IEM_CIMPL_DEF_0(iemCImpl_swapgs)
+{
+    Assert(pIemCpu->enmCpuMode == IEMMODE_64BIT); /* Caller checks this. */
+
+    /*
+     * Permission checks.
+     */
+    if (pIemCpu->uCpl != 0)
+    {
+        Log2(("swapgs: CPL != 0\n"));
+        return iemRaiseUndefinedOpcode(pIemCpu);
+    }
+
+    /*
+     * Do the job.
+     */
+    PCPUMCTX pCtx = pIemCpu->CTX_SUFF(pCtx);
+    uint64_t uOtherGsBase = pCtx->msrKERNELGSBASE;
+    pCtx->msrKERNELGSBASE = pCtx->gs.u64Base;
+    pCtx->gs.u64Base = uOtherGsBase;
+
+    iemRegAddToRip(pIemCpu, cbInstr);
+    return VINF_SUCCESS;
+}
+
+
+/**
  * Implements 'CPUID'.
  */

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

@@ -811 +811 @@
 {
     IEMOP_MNEMONIC("monitor");
-    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+    IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX(); /** @todo Verify that monitor is allergic to lock prefixes. */
     return IEM_MC_DEFER_TO_CIMPL_1(iemCImpl_monitor, pIemCpu->iEffSeg);
 }
@@ -819 +819 @@
 FNIEMOP_DEF(iemOp_Grp7_mwait)
 {
-    IEMOP_MNEMONIC("mwait");
+    IEMOP_MNEMONIC("mwait"); /** @todo Verify that mwait is allergic to lock prefixes. */
     IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
     return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_mwait);
@@ -828 +828 @@
 FNIEMOP_DEF_1(iemOp_Grp7_lgdt, uint8_t, bRm)
 {
+    IEMOP_MNEMONIC("lgdt");
     IEMOP_HLP_NO_LOCK_PREFIX();
 
@@ -904 +905 @@
 FNIEMOP_DEF_1(iemOp_Grp7_smsw, uint8_t, bRm)
 {
+    IEMOP_MNEMONIC("smsw");
     IEMOP_HLP_NO_LOCK_PREFIX();
     if ((bRm & X86_MODRM_MOD_MASK) == (3 << X86_MODRM_MOD_SHIFT))
@@ -960 +962 @@
     /* The operand size is effectively ignored, all is 16-bit and only the
        lower 3-bits are used. */
+    IEMOP_MNEMONIC("lmsw");
     IEMOP_HLP_NO_LOCK_PREFIX();
     if ((bRm & X86_MODRM_MOD_MASK) == (3 << X86_MODRM_MOD_SHIFT))
@@ -986 +989 @@
 FNIEMOP_DEF_1(iemOp_Grp7_invlpg, uint8_t, bRm)
 {
+    IEMOP_MNEMONIC("invlpg");
     IEMOP_HLP_NO_LOCK_PREFIX();
     IEM_MC_BEGIN(1, 1);
@@ -999 +1003 @@
 FNIEMOP_DEF(iemOp_Grp7_swapgs)
 {
-    NOREF(pIemCpu);
-    IEMOP_BITCH_ABOUT_STUB();
-    return VERR_IEM_INSTR_NOT_IMPLEMENTED;
+    IEMOP_MNEMONIC("swapgs");
+    IEMOP_HLP_NO_LOCK_PREFIX();
+    IEMOP_HLP_ONLY_64BIT();
+    return IEM_MC_DEFER_TO_CIMPL_0(iemCImpl_swapgs);
 }
 

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

@@ -98 +98 @@
 #define IEMOP_HLP_NO_LOCK_PREFIX()                          do { } while (0)
 #define IEMOP_HLP_NO_64BIT()                                do { } while (0)
+#define IEMOP_HLP_ONLY_64BIT()                              do { } while (0)
 #define IEMOP_HLP_64BIT_OP_SIZE()                           do { } while (0)
 #define IEMOP_HLP_DEFAULT_64BIT_OP_SIZE()                   do { } while (0)