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

Timestamp:

Apr 2, 2007 2:08:55 PM (18 years ago)

Author:

vboxsync

Message:

updated scan beyond ret instruction code

Location:

trunk/src/VBox/VMM/PATM

Files:

• CSAM.cpp (modified) (4 diffs)
• CSAMInternal.h (modified) (1 diff)

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

@@ -63 +63 @@
 /* Enable to monitor all scanned pages
 #define CSAM_MONITOR_CSAM_CODE_PAGES */
+/* Enable to scan beyond ret instructions.  
+#define CSAM_ANALYSE_BEYOND_RET */
 
 /*******************************************************************************
@@ -958 +960 @@
                 {
                 case OP_NOP:
+                case OP_INT3:
                     break;  /* acceptable */
 
@@ -2090 +2093 @@
         CSAMP2GLOOKUPREC cacheRec = {0};
 
+if ((pInstrGC >> 24) == 0xf8
+    && (pInstrGC & 0xfff) == 0) _asm int 3;
+
         STAM_PROFILE_START(&pVM->csam.s.StatTime, a);
         rc = csamAnalyseCallCodeStream(pVM, pInstrGC, pInstrGC, true /* 32 bits code */, CSAMR3AnalyseCallback, pPage, &cacheRec);
@@ -2165 +2171 @@
 
         Log(("csamR3FlushCodePages: %VGv\n", GCPtr));
+        PGMShwSetPage(pVM, GCPtr, 1, 0);
         /* Resync the page to make sure instruction fetch will fault */
         CSAMMarkPage(pVM, GCPtr, false);
-        PGMInvalidatePage(pVM, GCPtr);
-        PGMPrefetchPage(pVM, GCPtr);
-
-        CSAMMarkPage(pVM, GCPtr, true);
+//        PGMInvalidatePage(pVM, GCPtr);
+/////        PGMPrefetchPage(pVM, GCPtr);
+
+/////        CSAMMarkPage(pVM, GCPtr, true);
     }
     pVM->csam.s.cPossibleCodePages = 0;

trunk/src/VBox/VMM/PATM/CSAMInternal.h

@@ -186 +186 @@
     /* Set when the IDT gates have been checked for the first time. */
     bool                fGatesChecked;
-    bool                Alignment1[HC_ARCH_BITS == 32 ? 4 : 6]; /**< Align the stats on an 8-byte boundrary. */
+    bool                Alignment1[2];
+//    bool                Alignment1[HC_ARCH_BITS == 32 ? 4 : 6]; /**< Align the stats on an 8-byte boundrary. */
 
     STAMCOUNTER         StatNrTraps;