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

Timestamp:

Jul 16, 2009 3:49:53 PM (16 years ago)

Author:

vboxsync

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

50191

Message:

Updates

File:

• trunk/src/VBox/VMM/HWACCM.cpp (modified) (4 diffs)

trunk/src/VBox/VMM/HWACCM.cpp

@@ -1543 +1543 @@
                 rc = PGMPhysSimpleWriteGCPtr(pVCpu, pCtx->rip, aVMMCall, sizeof(aVMMCall));
                 AssertRC(rc);
+
+                memcpy(pPatch->aNewOpcode, aVMMCall, sizeof(aVMMCall));
+                pPatch->cbNewOp = sizeof(aVMMCall);
             }
             else
@@ -1567 +1570 @@
                     &&  pDis->param2.flags == USE_IMMEDIATE8
                     &&  pDis->param2.parval == 4
-                    &&  oldcbOp + cbOp < sizeof(pVM->hwaccm.s.svm.aPatches[idx]))
+                    &&  oldcbOp + cbOp < sizeof(pVM->hwaccm.s.svm.aPatches[idx].aOpcode))
                 {
                     uint8_t szInstr[15];
@@ -1582 +1585 @@
                     szInstr[2] = 0x20;
                     szInstr[3] = 0xC0 | pDis->param1.base.reg_gen;
-                    for (unsigned i = 4; i < 5+cbOp; i++)
+                    for (unsigned i = 4; i < pPatch->cbOp; i++)
                         szInstr[i] = 0x90;  /* nop */
 
-                    rc = PGMPhysSimpleWriteGCPtr(pVCpu, pCtx->rip, szInstr, 5+cbOp);
+                    rc = PGMPhysSimpleWriteGCPtr(pVCpu, pCtx->rip, szInstr, pPatch->cbOp);
                     AssertRC(rc);
+
+                    memcpy(pPatch->aNewOpcode, szInstr, pPatch->cbOp);
+                    pPatch->cbNewOp = pPatch->cbOp;
 
                     Log(("Acceptable read/shr candidate!\n"));
@@ -1598 +1604 @@
                     rc = PGMPhysSimpleWriteGCPtr(pVCpu, pCtx->rip, aVMMCall, sizeof(aVMMCall));
                     AssertRC(rc);
+
+                    memcpy(pPatch->aNewOpcode, aVMMCall, sizeof(aVMMCall));
+                    pPatch->cbNewOp = sizeof(aVMMCall);
                 }
             }