Changeset 21210 in vbox for trunk/src

Timestamp:

Jul 3, 2009 3:07:16 PM (16 years ago)

Author:

vboxsync

Message:

Updates

Location:

trunk/src/VBox/VMM

Files:

• EMHwaccm.cpp (modified) (1 diff)
• HWACCM.cpp (modified) (1 diff)
• HWACCMInternal.h (modified) (1 diff)
• VMMR0/HWACCMR0.cpp (modified) (2 diffs)
• VMMR0/HWSVMR0.cpp (modified) (1 diff)
• VMMR0/HWVMXR0.cpp (modified) (1 diff)

trunk/src/VBox/VMM/EMHwaccm.cpp

@@ -301 +301 @@
 
     /* Try to restart the io instruction that was refused in ring-0. */
-    rc = HWACCMR3RestartPendingIOInstr(pVM, pVCpu);
+    rc = HWACCMR3RestartPendingIOInstr(pVM, pVCpu, pCtx);
     if (rc == VINF_SUCCESS)
     {

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1640 +1640 @@
  * @returns VBox status code
  * @param   pVM         The VM to operate on.
- * @param   pVM         The VM to operate on.
- */
-VMMR3DECL(int)  HWACCMR3RestartPendingIOInstr(PVM pVM, PVMCPU pVCpu)
-{
-    return VERR_NOT_FOUND;
+ * @param   pVCpu       The VMCPU to operate on.
+ * @param   pCtx        VCPU register context
+ */
+VMMR3DECL(int)  HWACCMR3RestartPendingIOInstr(PVM pVM, PVMCPU pVCpu, PCPUMCTX pCtx)
+{
+    HWACCMPENDINGIO enmType = pVCpu->hwaccm.s.PendingIO.enmType;
+    int rc;
+
+        return VERR_NOT_FOUND;
+
+    pVCpu->hwaccm.s.PendingIO.enmType = HWACCMPENDINGIO_INVALID;
+
+    if (    pVCpu->hwaccm.s.PendingIO.GCPtrRip != pCtx->rip
+        ||  pVCpu->hwaccm.s.PendingIO.enmType  == HWACCMPENDINGIO_INVALID)
+        return VERR_NOT_FOUND;
+
+    switch (enmType)
+    {
+    case HWACCMPENDINGIO_PORT_READ:
+    {
+        uint32_t uAndVal = pVCpu->hwaccm.s.PendingIO.s.Port.uAndVal;
+        uint32_t u32Val  = 0;
+
+        rc = IOMIOPortRead(pVM, pVCpu->hwaccm.s.PendingIO.s.Port.uPort, 
+                           &u32Val, 
+                           pVCpu->hwaccm.s.PendingIO.s.Port.cbSize);
+        if (IOM_SUCCESS(rc))
+        {
+            /* Write back to the EAX register. */
+            pCtx->eax = (pCtx->eax & ~uAndVal) | (u32Val & uAndVal);
+            pCtx->rip = pVCpu->hwaccm.s.PendingIO.GCPtrRipNext;
+        }
+        break;
+    }
+
+    case HWACCMPENDINGIO_PORT_WRITE:
+        rc = IOMIOPortWrite(pVM, pVCpu->hwaccm.s.PendingIO.s.Port.uPort, 
+                            pCtx->eax & pVCpu->hwaccm.s.PendingIO.s.Port.uAndVal, 
+                            pVCpu->hwaccm.s.PendingIO.s.Port.cbSize);
+        if (IOM_SUCCESS(rc))
+            pCtx->rip = pVCpu->hwaccm.s.PendingIO.GCPtrRipNext;
+        break;
+
+    default:
+        AssertFailed();
+        return VERR_INTERNAL_ERROR;
+    }
+
+    return rc;
 }
 

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -608 +608 @@
                 unsigned        uAndVal;
                 unsigned        cbSize;
-            } Read;
-            struct
-            {
-                unsigned        uPort;
-                unsigned        uValue;
-                unsigned        cbSize;
-            } Write;
+            } Port;
             uint64_t            aRaw[2];
-        } Port;
+        } s;
     } PendingIO;
 

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

@@ -1232 +1232 @@
 VMMR0DECL(void) HWACCMR0SavePendingIOPortRead(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext, unsigned uPort, unsigned uAndVal, unsigned cbSize)
 {
-    pVCpu->hwaccm.s.PendingIO.enmType            = HWACCMPENDINGIO_PORT_READ;
-    pVCpu->hwaccm.s.PendingIO.GCPtrRip           = GCPtrRip;
-    pVCpu->hwaccm.s.PendingIO.GCPtrRipNext       = GCPtrRipNext;
-    pVCpu->hwaccm.s.PendingIO.Port.Read.uPort    = uPort;
-    pVCpu->hwaccm.s.PendingIO.Port.Read.uAndVal  = uAndVal;
-    pVCpu->hwaccm.s.PendingIO.Port.Read.cbSize   = cbSize;
+    pVCpu->hwaccm.s.PendingIO.enmType         = HWACCMPENDINGIO_PORT_READ;
+    pVCpu->hwaccm.s.PendingIO.GCPtrRip        = GCPtrRip;
+    pVCpu->hwaccm.s.PendingIO.GCPtrRipNext    = GCPtrRipNext;
+    pVCpu->hwaccm.s.PendingIO.s.Port.uPort    = uPort;
+    pVCpu->hwaccm.s.PendingIO.s.Port.uAndVal  = uAndVal;
+    pVCpu->hwaccm.s.PendingIO.s.Port.cbSize   = cbSize;
     return;
 }
@@ -1247 +1247 @@
  * @param   GCPtrRIP        Address of IO instruction
  * @param   uPort           Port address
- * @param   uValue          Value to write
+ * @param   uAndVal         And mask for fetching the result from eax
  * @param   cbSize          Read size
  */
-VMMR0DECL(void) HWACCMR0SavePendingIOPortWrite(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext, unsigned uPort, unsigned uValue, unsigned cbSize)
-{
-    pVCpu->hwaccm.s.PendingIO.enmType             = HWACCMPENDINGIO_PORT_WRITE;
-    pVCpu->hwaccm.s.PendingIO.GCPtrRip            = GCPtrRip;
-    pVCpu->hwaccm.s.PendingIO.GCPtrRipNext        = GCPtrRipNext;
-    pVCpu->hwaccm.s.PendingIO.Port.Write.uPort    = uPort;
-    pVCpu->hwaccm.s.PendingIO.Port.Write.uValue   = uValue;
-    pVCpu->hwaccm.s.PendingIO.Port.Write.cbSize   = cbSize;
+VMMR0DECL(void) HWACCMR0SavePendingIOPortWrite(PVMCPU pVCpu, RTGCPTR GCPtrRip, RTGCPTR GCPtrRipNext, unsigned uPort, unsigned uAndVal, unsigned cbSize)
+{
+    pVCpu->hwaccm.s.PendingIO.enmType         = HWACCMPENDINGIO_PORT_WRITE;
+    pVCpu->hwaccm.s.PendingIO.GCPtrRip        = GCPtrRip;
+    pVCpu->hwaccm.s.PendingIO.GCPtrRipNext    = GCPtrRipNext;
+    pVCpu->hwaccm.s.PendingIO.s.Port.uPort    = uPort;
+    pVCpu->hwaccm.s.PendingIO.s.Port.uAndVal  = uAndVal;
+    pVCpu->hwaccm.s.PendingIO.s.Port.cbSize   = cbSize;
     return;
 }

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

@@ -2109 +2109 @@
                 rc = IOMIOPortWrite(pVM, IoExitInfo.n.u16Port, pCtx->eax & uAndVal, uIOSize);
                 if (rc == VINF_IOM_HC_IOPORT_WRITE)
-                    HWACCMR0SavePendingIOPortWrite(pVCpu, pCtx->rip, pVMCB->ctrl.u64ExitInfo2, IoExitInfo.n.u16Port, pCtx->eax & uAndVal, uIOSize);
+                    HWACCMR0SavePendingIOPortWrite(pVCpu, pCtx->rip, pVMCB->ctrl.u64ExitInfo2, IoExitInfo.n.u16Port, uAndVal, uIOSize);
             }
             else

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

@@ -3392 +3392 @@
                 rc = IOMIOPortWrite(pVM, uPort, pCtx->eax & uAndVal, cbSize);
                 if (rc == VINF_IOM_HC_IOPORT_WRITE)
-                    HWACCMR0SavePendingIOPortWrite(pVCpu, pCtx->rip, pCtx->rip + cbInstr, uPort, pCtx->eax & uAndVal, cbSize);
+                    HWACCMR0SavePendingIOPortWrite(pVCpu, pCtx->rip, pCtx->rip + cbInstr, uPort, uAndVal, cbSize);
             }
             else