Changeset 55489 in vbox

Timestamp:

Apr 28, 2015 3:40:59 PM (10 years ago)

Author:

vboxsync

Message:

MM: Added MMHyperHeapOffsetToPtr, MMHyperHeapPtrToOffset and MMR3IsInitialized.

Location:

trunk

Files:

• include/VBox/vmm/mm.h (modified) (3 diffs)
• src/VBox/VMM/VMMAll/MMAll.cpp (modified) (1 diff)
• src/VBox/VMM/VMMAll/MMAllHyper.cpp (modified) (2 diffs)
• src/VBox/VMM/VMMR3/MM.cpp (modified) (1 diff)

trunk/include/VBox/vmm/mm.h

@@ -112 +112 @@
     MM_TAG_PGM_CHUNK_MAPPING,
     MM_TAG_PGM_HANDLERS,
+    MM_TAG_PGM_HANDLER_TYPES,
     MM_TAG_PGM_MAPPINGS,
     MM_TAG_PGM_PHYS,
@@ -216 +217 @@
 VMMDECL(size_t)     MMHyperHeapGetFreeSize(PVM pVM);
 VMMDECL(size_t)     MMHyperHeapGetSize(PVM pVM);
+VMMDECL(void *)     MMHyperHeapOffsetToPtr(PVM pVM, uint32_t offHeap);
+VMMDECL(uint32_t)   MMHyperHeapPtrToOffset(PVM pVM, void *pv);
 VMMDECL(RTGCPTR)    MMHyperGetArea(PVM pVM, size_t *pcb);
 VMMDECL(bool)       MMHyperIsInsideArea(PVM pVM, RTGCPTR GCPtr);
@@ -251 +254 @@
 VMMR3DECL(int)      MMR3Term(PVM pVM);
 VMMR3DECL(void)     MMR3TermUVM(PUVM pUVM);
+VMMR3_INT_DECL(bool) MMR3IsInitialized(PVM pVM);
 VMMR3DECL(int)      MMR3ReserveHandyPages(PVM pVM, uint32_t cHandyPages);
 VMMR3DECL(int)      MMR3IncreaseBaseReservation(PVM pVM, uint64_t cAddBasePages);

trunk/src/VBox/VMM/VMMAll/MMAll.cpp

@@ -624 +624 @@
         TAG2STR(PGM_CHUNK_MAPPING);
         TAG2STR(PGM_HANDLERS);
+        TAG2STR(PGM_HANDLER_TYPES);
         TAG2STR(PGM_MAPPINGS);
         TAG2STR(PGM_PHYS);

trunk/src/VBox/VMM/VMMAll/MMAllHyper.cpp

@@ -1259 +1259 @@
 }
 
+
 /**
  * Query the size the hypervisor heap.
@@ -1267 +1268 @@
 {
     return pVM->mm.s.CTX_SUFF(pHyperHeap)->cbHeap;
+}
+
+
+/**
+ * Converts a context neutral heap offset into a pointer.
+ *
+ * @returns Pointer to hyper heap data.
+ * @param   pVM         Pointer to the cross context VM structure.
+ * @param   offHeap     The hyper heap offset.
+ */
+VMMDECL(void *) MMHyperHeapOffsetToPtr(PVM pVM, uint32_t offHeap)
+{
+    Assert(offHeap - MMYPERHEAP_HDR_SIZE <= pVM->mm.s.CTX_SUFF(pHyperHeap)->cbHeap);
+    return (uint8_t *)pVM->mm.s.CTX_SUFF(pHyperHeap) + offHeap;
+}
+
+
+/**
+ * Converts a context specific heap pointer into a neutral heap offset.
+ *
+ * @returns Heap offset.
+ * @param   pVM         Pointer to the cross context VM structure.
+ * @param   pv          Pointer to the heap data.
+ */
+VMMDECL(uint32_t) MMHyperHeapPtrToOffset(PVM pVM, void *pv)
+{
+    size_t offHeap = (uint8_t *)pv - (uint8_t *)pVM->mm.s.CTX_SUFF(pHyperHeap);
+    Assert(offHeap - MMYPERHEAP_HDR_SIZE <= pVM->mm.s.CTX_SUFF(pHyperHeap)->cbHeap);
+    return (uint32_t)offHeap;
 }
 

trunk/src/VBox/VMM/VMMR3/MM.cpp

@@ -503 +503 @@
 
 /**
+ * Checks if the both VM and UVM parts of MM have been initialized.
+ *
+ * @returns true if initialized, false if not.
+ * @param   pVM         Pointer to the cross context VM structure.
+ */
+VMMR3_INT_DECL(bool) MMR3IsInitialized(PVM pVM)
+{
+    return pVM->mm.s.pHyperHeapR3 != NULL;
+}
+
+
+/**
  * Execute state save operation.
  *