Changeset 882 in vbox

Timestamp:

Feb 13, 2007 5:26:15 PM (18 years ago)

Author:

vboxsync

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

18594

Message:

CSAMR3CheckCode added

Location:

trunk/src/VBox/VMM

Files:

• EM.cpp (modified) (3 diffs)
• PATM/CSAM.cpp (modified) (3 diffs)
• PATM/PATM.cpp (modified) (3 diffs)

trunk/src/VBox/VMM/EM.cpp

@@ -1515 +1515 @@
         &&  pCtx->eflags.Bits.u1VM == 0)
     {
-        RTGCPTR pInstrGC;
         Assert(!PATMIsPatchGCAddr(pVM, pCtx->eip));
-
-        pInstrGC = SELMToFlat(pVM, pCtx->cs, &pCtx->csHid, (RTGCPTR)pCtx->eip);
-
-        CSAMR3CheckEIP(pVM, pInstrGC, SELMIsSelector32Bit(pVM, pCtx->cs, &pCtx->csHid));
+        CSAMR3CheckCode(pVM, pCtx, pCtx->eip);
     }
 
@@ -2486 +2482 @@
         {
             STAM_PROFILE_ADV_SUSPEND(&pVM->em.s.StatRAWEntry, b);
-            CSAMR3CheckEIP(pVM, pCtx->eip, SELMIsSelector32Bit(pVM, pCtx->cs, &pCtx->csHid));
+            CSAMR3CheckCode(pVM, pCtx, pCtx->eip);
             STAM_PROFILE_ADV_RESUME(&pVM->em.s.StatRAWEntry, b);
         }
@@ -3021 +3017 @@
         if (VM_FF_ISSET(pVM, VM_FF_CSAM_SCAN_PAGE))
         {
+            PCPUMCTX pCtx = pVM->em.s.pCtx;
+
             /** @todo: check for 16 or 32 bits code! (D bit in the code selector) */
             Log(("Forced action VM_FF_CSAM_SCAN_PAGE\n"));
-            CSAMR3CheckEIP(pVM, CPUMGetGuestEIP(pVM), true);
+
+            CSAMR3CheckCode(pVM, pCtx, pCtx->eip);
             VM_FF_CLEAR(pVM, VM_FF_CSAM_SCAN_PAGE);
         }

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

@@ -2028 +2028 @@
 
 /**
- * Scan and analyse code starting at specified EIP
- *
- * @returns VBox status code. (trap handled or not)
+ * Scan and analyse code
+ *
+ * @returns VBox status code.
  * @param   pVM         The VM to operate on.
- * @param   pEip        Instruction pointer
- * @param   fCode32     16 of 32 bits code
- */
-CSAMR3DECL(int) CSAMR3CheckEIP(PVM pVM, RTGCPTR pEip, bool fCode32)
+ * @param   pCtx        CPU context
+ * @param   pInstrGC    Instruction pointer
+ */
+CSAMR3DECL(int) CSAMR3CheckCode(PVM pVM, PCPUMCTX pCtx, RTGCPTR pInstrGC)
 {
     int rc;
     PCSAMPAGE pPage = NULL;
 
-    if (EMIsRawRing0Enabled(pVM) == false || PATMIsPatchGCAddr(pVM, pEip) == true)
+    if (EMIsRawRing0Enabled(pVM) == false || PATMIsPatchGCAddr(pVM, pInstrGC) == true)
     {
         // No use
@@ -2050 +2050 @@
         // Cache record for PATMGCVirtToHCVirt
         CSAMP2GLOOKUPREC cacheRec = {0};
+        bool fCode32 = SELMIsSelector32Bit(pVM, pCtx->cs, &pCtx->csHid);
 
         //assuming 32 bits code for now
         Assert(fCode32);
 
+        pInstrGC = SELMToFlat(pVM, pCtx->cs, &pCtx->csHid, pInstrGC);
+
         STAM_PROFILE_START(&pVM->csam.s.StatTime, a);
-        rc = csamAnalyseCallCodeStream(pVM, pEip, pEip, fCode32, CSAMR3AnalyseCallback, pPage, &cacheRec);
+        rc = csamAnalyseCallCodeStream(pVM, pInstrGC, pInstrGC, fCode32, CSAMR3AnalyseCallback, pPage, &cacheRec);
         STAM_PROFILE_STOP(&pVM->csam.s.StatTime, a);
         if (rc != VINF_SUCCESS)
@@ -2061 +2064 @@
             Log(("csamAnalyseCodeStream failed with %d\n", rc));
             return rc;
-        }
-        else
-        {
-    //        Log(("CSAMR3CheckEIP: already scanned page at %VGv\n", pEip));
         }
     }

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

@@ -3909 +3909 @@
 {
     DISCPUSTATE cpu;
+    PCPUMCTX    pCtx;
     HCPTRTYPE(uint8_t *) pInstrHC;
     uint32_t opsize;
@@ -3924 +3925 @@
         return VERR_PATCHING_REFUSED;
 
+    CPUMQueryGuestCtxPtr(pVM, &pCtx);
+
     /* Test for patch conflict only with patches that actually change guest code. */
     if (!(flags & (PATMFL_GUEST_SPECIFIC|PATMFL_IDTHANDLER|PATMFL_INTHANDLER|PATMFL_TRAMPOLINE)))
@@ -3948 +3951 @@
     {
         /* New code. Make sure CSAM has a go at it first. */
-        CSAMR3CheckEIP(pVM, pInstrGC, !!(flags & PATMFL_CODE32));
+        CSAMR3CheckCode(pVM, pCtx, pInstrGC);
     }