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

Timestamp:

Jan 17, 2007 1:11:29 PM (18 years ago)

Author:

vboxsync

Message:

Patch2GuestAddrTree / RECPATCHTOGUEST: changed from PV to U32 AVL tree. (first in a series of 64-bit fixes)

File:

• trunk/src/VBox/VMM/PATM/PATMSSM.cpp (modified) (5 diffs)

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

@@ -56 +56 @@
 #define PATM_ADD_PTR(a, b)      *(uintptr_t *)&(a) = (uintptr_t)(a) + (uintptr_t)(b)
 
+#ifdef VBOX_STRICT
 /**
  * Callback function for RTAvlPVDoWithAll
@@ -65 +66 @@
  * @param   pcPatches       Pointer to patch counter
  */
-static DECLCALLBACK(int) patmCountLeaf(PAVLPVNODECORE pNode, void *pcPatches)
+static DECLCALLBACK(int) patmCountLeafPV(PAVLPVNODECORE pNode, void *pcPatches)
 {
     *(uint32_t *)pcPatches = *(uint32_t *)pcPatches + 1;
     return VINF_SUCCESS;
 }
+#endif 
+
+/**
+ * Callback function for RTAvlU32DoWithAll
+ *
+ * Counts the number of patches in the tree
+ *
+ * @returns VBox status code.
+ * @param   pNode           Current node
+ * @param   pcPatches       Pointer to patch counter
+ */
+static DECLCALLBACK(int) patmCountLeaf(PAVLU32NODECORE pNode, void *pcPatches)
+{
+    *(uint32_t *)pcPatches = *(uint32_t *)pcPatches + 1;
+    return VINF_SUCCESS;
+}
 
 /**
@@ -87 +104 @@
 
 /**
- * Callback function for RTAvlPVDoWithAll
+ * Callback function for RTAvlU32DoWithAll
  *
  * Saves all patch to guest lookup records.
@@ -95 +112 @@
  * @param   pVM1            VM Handle
  */
-static DECLCALLBACK(int) patmSaveP2GLookupRecords(PAVLPVNODECORE pNode, void *pVM1)
+static DECLCALLBACK(int) patmSaveP2GLookupRecords(PAVLU32NODECORE pNode, void *pVM1)
 {
     PVM                 pVM    = (PVM)pVM1;
@@ -173 +190 @@
 #ifdef VBOX_STRICT
     int nrFixupRecs = 0;
-    RTAvlPVDoWithAll(&pPatch->patch.FixupTree, true, patmCountLeaf, &nrFixupRecs);
+    RTAvlPVDoWithAll(&pPatch->patch.FixupTree, true, patmCountLeafPV, &nrFixupRecs);
     AssertMsg(nrFixupRecs == pPatch->patch.nrFixups, ("Fixup inconsistency! counted %d vs %d\n", nrFixupRecs, pPatch->patch.nrFixups));
 #endif