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

Timestamp:

Jul 16, 2009 2:09:40 PM (16 years ago)

Author:

vboxsync

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

50187

Message:

Updates + compile fixes

Location:

trunk/src/VBox/VMM

Files:

• HWACCM.cpp (modified) (5 diffs)
• HWACCMInternal.h (modified) (1 diff)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1380 +1380 @@
 #endif
     }
+
+    /* Clear all patch information. */
+    pVM->hwaccm.s.pGuestPatchMem      = 0;
+    pVM->hwaccm.s.pFreeGuestPatchMem  = 0;
+    pVM->hwaccm.s.cbGuestPatchMem     = 0;
+    pVM->hwaccm.s.svm.cPatches        = 0;
+    ASMMemZero32(pVM->hwaccm.s.svm.aPatches, sizeof(pVM->hwaccm.s.svm.aPatches));
 }
 
@@ -1398 +1405 @@
         return VERR_NOT_SUPPORTED;
 
-    pVM->hwaccm.s.pGuestPatchMem  = pPatchMem;
-    pVM->hwaccm.s.cbGuestPatchMem = cbPatchMem;
+    pVM->hwaccm.s.pGuestPatchMem      = pPatchMem;
+    pVM->hwaccm.s.pFreeGuestPatchMem  = pPatchMem;
+    pVM->hwaccm.s.cbGuestPatchMem     = cbPatchMem;
     return VINF_SUCCESS;
 }
@@ -1413 +1421 @@
 VMMR3DECL(int)  HWACMMR3DisablePatching(PVM pVM, RTGCPTR pPatchMem, unsigned cbPatchMem)
 {
-    pVM->hwaccm.s.pGuestPatchMem  = 0;
-    pVM->hwaccm.s.cbGuestPatchMem = 0;
+    Assert(pVM->hwaccm.s.pGuestPatchMem == pPatchMem);
+    Assert(pVM->hwaccm.s.cbGuestPatchMem == cbPatchMem);
+
+    pVM->hwaccm.s.pGuestPatchMem      = 0;
+    pVM->hwaccm.s.pFreeGuestPatchMem  = 0;
+    pVM->hwaccm.s.cbGuestPatchMem     = 0;
     return VINF_SUCCESS;
 }
@@ -1833 +1845 @@
         AssertRCReturn(rc, rc);
 
+        rc = SSMR3PutMem(pSSM, pPatch->aOpcode, sizeof(pPatch->aOpcode));
+        AssertRCReturn(rc, rc);
+
         rc = SSMR3PutU32(pSSM, pPatch->cbOp);
         AssertRCReturn(rc, rc);
 
-        AssertCompile(sizeof(HWACCMTPRINSTR) == sizeof(uint32_t));
+        rc = SSMR3PutMem(pSSM, pPatch->aNewOpcode, sizeof(pPatch->aNewOpcode));
+        AssertRCReturn(rc, rc);
+
+        rc = SSMR3PutU32(pSSM, pPatch->cbNewOp);
+        AssertRCReturn(rc, rc);
+
+        AssertCompileSize(HWACCMTPRINSTR == 4);
         rc = SSMR3PutU32(pSSM, (uint32_t)&pPatch->enmType);
         AssertRCReturn(rc, rc);
@@ -1927 +1948 @@
             AssertRCReturn(rc, rc);
 
+            rc = SSMR3GetMem(pSSM, pPatch->aOpcode, sizeof(pPatch->aOpcode));
+            AssertRCReturn(rc, rc);
+
             rc = SSMR3GetU32(pSSM, &pPatch->cbOp);
             AssertRCReturn(rc, rc);
 
-            AssertCompile(sizeof(HWACCMTPRINSTR) == sizeof(uint32_t));
+            rc = SSMR3GetMem(pSSM, pPatch->aNewOpcode, sizeof(pPatch->aNewOpcode));
+            AssertRCReturn(rc, rc);
+
+            rc = SSMR3GetU32(pSSM, &pPatch->cbNewOp);
+            AssertRCReturn(rc, rc);
+
             rc = SSMR3GetU32(pSSM, (uint32_t *)&pPatch->enmType);
             AssertRCReturn(rc, rc);

trunk/src/VBox/VMM/HWACCMInternal.h

@@ -210 +210 @@
     /** Instruction size. */
     uint32_t                cbOp;
+    /** Replacement opcode. */
+    uint8_t                 aNewOpcode[16];
+    /** Replacement instruction size. */
+    uint32_t                cbNewOp;
     /** Instruction type. */
     HWACCMTPRINSTR          enmType;