Changeset 18927 in vbox for trunk/src/VBox/VMM/PATM/PATMGuest.cpp

Timestamp:

Apr 16, 2009 11:41:38 AM (16 years ago)

Author:

vboxsync

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

46003

Message:

Big step to separate VMM data structures for guest SMP. (pgm, em)

File:

• trunk/src/VBox/VMM/PATM/PATMGuest.cpp (modified) (6 diffs)

trunk/src/VBox/VMM/PATM/PATMGuest.cpp

@@ -99 +99 @@
 int PATMPatchSysenterXP(PVM pVM, RTGCPTR32 pInstrGC, PPATMPATCHREC pPatchRec)
 {
-    PPATCHINFO pPatch = &pPatchRec->patch;
-    uint8_t   uTemp[16];
+    PPATCHINFO  pPatch = &pPatchRec->patch;
+    uint8_t     uTemp[16];
     RTGCPTR32   lpfnKiFastSystemCall, lpfnKiIntSystemCall = 0; /* (initializing it to shut up warning.) */
-    int       rc, i;
+    int         rc, i;
+    PVMCPU      pVCpu = VMMGetCpu0(pVM); 
 
     Assert(sizeof(uTemp) > sizeof(uFnKiIntSystemCall));
@@ -111 +112 @@
     /* check the epilog of KiFastSystemCall */
     lpfnKiFastSystemCall = pInstrGC - 2;
-    rc = PGMPhysSimpleReadGCPtr(pVM, uTemp, lpfnKiFastSystemCall, sizeof(uFnKiFastSystemCall));
+    rc = PGMPhysSimpleReadGCPtr(pVCpu, uTemp, lpfnKiFastSystemCall, sizeof(uFnKiFastSystemCall));
     if (    RT_FAILURE(rc)
         ||  memcmp(uFnKiFastSystemCall, uTemp, sizeof(uFnKiFastSystemCall)))
@@ -121 +122 @@
     for (i=0;i<64;i++)
     {
-        rc = PGMPhysSimpleReadGCPtr(pVM, uTemp, pInstrGC + i, sizeof(uFnKiIntSystemCall));
+        rc = PGMPhysSimpleReadGCPtr(pVCpu, uTemp, pInstrGC + i, sizeof(uFnKiIntSystemCall));
         if(RT_FAILURE(rc))
         {
@@ -146 +147 @@
 
     // make a copy of the guest code bytes that will be overwritten
-    rc = PGMPhysSimpleReadGCPtr(pVM, pPatch->aPrivInstr, pPatch->pPrivInstrGC, SIZEOF_NEARJUMP32);
+    rc = PGMPhysSimpleReadGCPtr(pVCpu, pPatch->aPrivInstr, pPatch->pPrivInstrGC, SIZEOF_NEARJUMP32);
     AssertRC(rc);
 
@@ -152 +153 @@
     uTemp[0] = 0xE9;
     *(RTGCPTR32 *)&uTemp[1] = lpfnKiIntSystemCall - (pInstrGC + SIZEOF_NEARJUMP32);
-    rc = PGMPhysSimpleDirtyWriteGCPtr(pVM, pInstrGC, uTemp, SIZEOF_NEARJUMP32);
+    rc = PGMPhysSimpleDirtyWriteGCPtr(pVCpu, pInstrGC, uTemp, SIZEOF_NEARJUMP32);
     if (RT_FAILURE(rc))
     {
@@ -189 +190 @@
     /* Guest OS specific patch; check heuristics first */
 
-    rc = PGMPhysSimpleReadGCPtr(pVM, uTemp, pInstrGC, RT_MAX(sizeof(uFnOpenBSDHandlerPrefix1), sizeof(uFnOpenBSDHandlerPrefix2)));
+    rc = PGMPhysSimpleReadGCPtr(VMMGetCpu0(pVM), uTemp, pInstrGC, RT_MAX(sizeof(uFnOpenBSDHandlerPrefix1), sizeof(uFnOpenBSDHandlerPrefix2)));
     if (    RT_FAILURE(rc)
         || (    memcmp(uFnOpenBSDHandlerPrefix1, uTemp, sizeof(uFnOpenBSDHandlerPrefix1))