Changeset 47284 in vbox

Timestamp:

Jul 19, 2013 11:31:20 PM (12 years ago)

Author:

vboxsync

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

87418

Message:

Fixed jmp far [indirect] and call far [indirect] to no cause #UD. These instructions seems to be misbehaving on AMD when REX.W is used (it's ignored according to my observations - needs verification).

Location:

trunk/src/VBox/VMM

Files:

• VMMAll/IEMAllInstructions.cpp.h (modified) (3 diffs)
• testcase/tstIEMCheckMc.cpp (modified) (1 diff)

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

@@ -15567 +15567 @@
             return VINF_SUCCESS;
 
+        case IEMMODE_64BIT:
+            /** @todo testcase: AMD does not seem to believe in the case (see bs-cpu-xcpt-1)
+             *        and will apparently ignore REX.W, at least for the jmp far qword [rsp]
+             *        and call far qword [rsp] encodings. */
+            if (!IEM_IS_GUEST_CPU_AMD(pIemCpu))
+            {
+                IEM_MC_BEGIN(3, 1);
+                IEM_MC_ARG(uint16_t,        u16Sel,                         0);
+                IEM_MC_ARG(uint64_t,        offSeg,                         1);
+                IEM_MC_ARG_CONST(IEMMODE,   enmEffOpSize, IEMMODE_16BIT,    2);
+                IEM_MC_LOCAL(RTGCPTR, GCPtrEffSrc);
+                IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffSrc, bRm, 0);
+                IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
+                IEM_MC_FETCH_MEM_U64(offSeg, pIemCpu->iEffSeg, GCPtrEffSrc);
+                IEM_MC_FETCH_MEM_U16_DISP(u16Sel, pIemCpu->iEffSeg, GCPtrEffSrc, 8);
+                IEM_MC_CALL_CIMPL_3(pfnCImpl, u16Sel, offSeg, enmEffOpSize);
+                IEM_MC_END();
+                return VINF_SUCCESS;
+            }
+            /* AMD falls thru. */
+
         case IEMMODE_32BIT:
             IEM_MC_BEGIN(3, 1);
@@ -15581 +15602 @@
             return VINF_SUCCESS;
 
-        case IEMMODE_64BIT:
-            /** @todo AMD does not believe in the case (see bs-cpu-xcpt-1) and will
-             *        apparently ignore REX.W, at least for the jmp far qword [rsp] and
-             *        call far qword [rsp] encodings. */
-            IEM_MC_BEGIN(3, 1);
-            IEM_MC_ARG(uint16_t,        u16Sel,                         0);
-            IEM_MC_ARG(uint64_t,        offSeg,                         1);
-            IEM_MC_ARG_CONST(IEMMODE,   enmEffOpSize, IEMMODE_16BIT,    2);
-            IEM_MC_LOCAL(RTGCPTR, GCPtrEffSrc);
-            IEM_MC_CALC_RM_EFF_ADDR(GCPtrEffSrc, bRm, 0);
-            IEMOP_HLP_DONE_DECODING_NO_LOCK_PREFIX();
-            IEM_MC_FETCH_MEM_U64(offSeg, pIemCpu->iEffSeg, GCPtrEffSrc);
-            IEM_MC_FETCH_MEM_U16_DISP(u16Sel, pIemCpu->iEffSeg, GCPtrEffSrc, 8);
-            IEM_MC_CALL_CIMPL_3(pfnCImpl, u16Sel, offSeg, enmEffOpSize);
-            IEM_MC_END();
-            return VINF_SUCCESS;
-
         IEM_NOT_REACHED_DEFAULT_CASE_RET();
     }
@@ -15704 +15708 @@
 {
     IEMOP_MNEMONIC("jmpf Ep");
-    IEMOP_HLP_NO_64BIT(); /** @todo this isn't quite right I'm afraid... */
     return FNIEMOP_CALL_2(iemOpHlp_Grp5_far_Ep, bRm, iemCImpl_FarJmp);
 }

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

@@ -134 +134 @@
 #define IEM_IS_AMD_CPUID_FEATURES_ANY_PRESENT(a_fEdx, a_fEcx) (g_fRandom)
 #define IEM_IS_INTEL_CPUID_FEATURE_PRESENT_EDX(a_fEdx)      (g_fRandom)
+#define IEM_IS_GUEST_CPU_AMD(a_pIemCpu)                     (g_fRandom)
+#define IEM_IS_GUEST_CPU_INTEL(a_pIemCpu)                   (g_fRandom)
 
 #define iemRecalEffOpSize(a_pIemCpu)                        do { } while (0)