Changeset 10010 in vbox for trunk/src/VBox/VMM

Timestamp:

Jun 30, 2008 9:39:04 AM (16 years ago)

Author:

vboxsync

Message:

Updates for 64 bits mode (invlpg - amd-v)

File:

• trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp (modified) (7 diffs)

trunk/src/VBox/VMM/VMMR0/HWSVMR0.cpp

@@ -1868 +1868 @@
     case PARMTYPE_IMMEDIATE:
     case PARMTYPE_ADDRESS:
-        if(!(param1.flags & PARAM_VAL32))
+        if(!(param1.flags & (PARAM_VAL32|PARAM_VAL64)))
             return VERR_EM_INTERPRETER;
-        addr = (RTGCPTR)param1.val.val32;
+        addr = param1.val.val64;
         break;
 
@@ -1908 +1908 @@
 static int SVMR0InterpretInvpg(PVM pVM, PCPUMCTXCORE pRegFrame, uint32_t uASID)
 {
-    Assert(!CPUMIsGuestInLongMode(pVM));    /** @todo */
     /*
-     * Only allow 32-bit code.
+     * Only allow 32 & 64 bits code.
      */
-    if (SELMGetCpuModeFromSelector(pVM, pRegFrame->eflags, pRegFrame->cs, &pRegFrame->csHid) == CPUMODE_32BIT)
+    DISCPUMODE enmMode = SELMGetCpuModeFromSelector(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid);
+    if (enmMode != CPUMODE_16BIT)
     {
         RTGCPTR pbCode;
@@ -1921 +1921 @@
             DISCPUSTATE Cpu;
 
-            Cpu.mode = CPUMODE_32BIT;
+            Cpu.mode = enmMode;
             rc = EMInterpretDisasOneEx(pVM, pbCode, pRegFrame, &Cpu, &cbOp);
             Assert(VBOX_FAILURE(rc) || Cpu.pCurInstr->opcode == OP_INVLPG);
@@ -1985 +1985 @@
     Assert(pVM->hwaccm.s.fNestedPaging);
 
-    Assert(!CPUMIsGuestInLongMode(pVM));    /** @todo */
-
     /* Skip it if a TLB flush is already pending. */
     if (!fFlushPending)
@@ -2005 +2003 @@
 
         /*
-        * Only allow 32-bit code.
-        */
-        if (SELMGetCpuModeFromSelector(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid) == CPUMODE_32BIT)
+         * Only allow 32 & 64 bits code.
+         */
+        DISCPUMODE enmMode = SELMGetCpuModeFromSelector(pVM, pCtx->eflags, pCtx->cs, &pCtx->csHid);
+        if (enmMode != CPUMODE_16BIT)
         {
             RTGCPTR pbCode;
@@ -2018 +2017 @@
                 RTGCPTR     addr;
 
-                Cpu.mode = CPUMODE_32BIT;
+                Cpu.mode = enmMode;
                 rc = EMInterpretDisasOneEx(pVM, pbCode, CPUMCTX2CORE(pCtx), &Cpu, &cbOp);
                 AssertRCReturn(rc, rc);
@@ -2030 +2029 @@
                 case PARMTYPE_IMMEDIATE:
                 case PARMTYPE_ADDRESS:
-                    AssertReturn((param1.flags & PARAM_VAL32), VERR_EM_INTERPRETER);
-
-                    addr = (RTGCPTR)param1.val.val32;
+                    AssertReturn((param1.flags & (PARAM_VAL32|PARAM_VAL64)), VERR_EM_INTERPRETER);
+
+                    addr = param1.val.val64;
                     break;