Changeset 7628 in vbox for trunk/src

Timestamp:

Mar 28, 2008 1:51:20 PM (17 years ago)

Author:

vboxsync

Message:

Assert some one problematic VMR3ReqCall* RTGC* stuff. (fix when they trigger)

Location:

trunk/src/VBox/VMM

Files:

• PATM/CSAM.cpp (modified) (5 diffs)
• PDMDevice.cpp (modified) (2 diffs)

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

@@ -59 +59 @@
 /* Enable to monitor all scanned pages
 #define CSAM_MONITOR_CSAM_CODE_PAGES */
-/* Enable to scan beyond ret instructions.  
+/* Enable to scan beyond ret instructions.
 #define CSAM_ANALYSE_BEYOND_RET */
 
@@ -173 +173 @@
     STAM_REG(pVM, &pVM->csam.s.StatCheckGates,       STAMTYPE_PROFILE, "/PROF/CSAM/CheckGates",       STAMUNIT_TICKS_PER_CALL, "CSAMR3CheckGates overhead.");
 
-    /* 
+    /*
      * Check CFGM option and enable/disable CSAM.
      */
@@ -1195 +1195 @@
         {
             /* We need to parse 'call dword ptr [address]' type of calls to catch cpuid instructions in some recent Linux distributions (e.g. OpenSuse 10.3) */
-            if (    cpu.pCurInstr->opcode == OP_CALL 
+            if (    cpu.pCurInstr->opcode == OP_CALL
                 &&  cpu.param1.flags == USE_DISPLACEMENT32)
             {
@@ -1922 +1922 @@
          */
         Log(("CSAMCodePageWriteHandler: delayed write!\n"));
+        AssertCompileSize(RTGCPTR, 4);
         rc = VMR3ReqCallEx(pVM, NULL, 0, VMREQFLAGS_NO_WAIT | VMREQFLAGS_VOID,
                            (PFNRT)CSAMDelayedWriteHandler, 3, pVM, GCPtr, cbBuf);
@@ -2357 +2358 @@
                 continue;
             }
-            
+
 
             if (pGuestIdte->Gen.u5Type2 == VBOX_IDTE_TYPE2_TRAP_32)

trunk/src/VBox/VMM/PDMDevice.cpp

@@ -3158 +3158 @@
         Log(("pdmR3DevHlp_PhysRead: caller='%s'/%d: Requesting call in EMT...\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
         PVMREQ pReq;
+        AssertCompileSize(RTGCPHYS, 4);
         int rc = VMR3ReqCallVoid(pDevIns->Internal.s.pVMHC, &pReq, RT_INDEFINITE_WAIT,
                                  (PFNRT)PGMPhysRead, 4, pDevIns->Internal.s.pVMHC, GCPhys, pvBuf, cbRead);
@@ -3190 +3191 @@
         Log(("pdmR3DevHlp_PhysWrite: caller='%s'/%d: Requesting call in EMT...\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance));
         PVMREQ pReq;
+        AssertCompileSize(RTGCPHYS, 4);
         int rc = VMR3ReqCallVoid(pDevIns->Internal.s.pVMHC, &pReq, RT_INDEFINITE_WAIT,
                                  (PFNRT)PGMPhysWrite, 4, pDevIns->Internal.s.pVMHC, GCPhys, pvBuf, cbWrite);