Index: /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (revision 41385) +++ /trunk/src/VBox/VMM/VMMAll/PGMAll.cpp (revision 41386) @@ -523,5 +523,5 @@ * @returns NULL if not * - * @param pVM The virtual machine. + * @param pVM The VM handle. * @param GCPtr The guest context pointer. */ @@ -800,5 +800,5 @@ * * @returns VBox status code (appropriate for trap handling and GC return). - * @param pVM VM handle. + * @param pVM The VM handle. * @param pVCpu VMCPU handle. * @param pRegFrame Register frame. @@ -2318,5 +2318,5 @@ * * @returns bool locked/not locked - * @param pVM The VM to operate on. + * @param pVM The VM handle. */ VMMDECL(bool) PGMHasDirtyPages(PVM pVM) @@ -2330,5 +2330,5 @@ * * @returns bool owner/not owner - * @param pVM The VM to operate on. + * @param pVM The VM handle. */ VMMDECL(bool) PGMIsLockOwner(PVM pVM) @@ -2342,5 +2342,5 @@ * * @returns VBox status code. - * @param pVM The VM to operate on. + * @param pVM The VM handle. * @param fUseLargePages Use/not use large pages */ @@ -2358,5 +2358,5 @@ * * @returns VBox status code - * @param pVM The VM to operate on. + * @param pVM The VM handle. */ int pgmLock(PVM pVM) @@ -2376,5 +2376,5 @@ * * @returns VBox status code - * @param pVM The VM to operate on. + * @param pVM The VM handle. */ void pgmUnlock(PVM pVM) @@ -2592,5 +2592,5 @@ * * @returns Number of conflicts. - * @param pVM The VM Handle. + * @param pVM The VM handle. */ VMMDECL(unsigned) PGMAssertNoMappingConflicts(PVM pVM) @@ -2636,6 +2636,6 @@ * * @returns Number of conflicts. - * @param pVM The VM Handle. - * @param pVCpu VMCPU handle. + * @param pVM The VM handle. + * @param pVCpu The VMCPU handle. * @param cr3 The current guest CR3 register value. * @param cr4 The current guest CR4 register value. Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (revision 41385) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllPhys.cpp (revision 41386) @@ -57,5 +57,5 @@ * * @returns VBox status code (appropriate for trap handling and GC return). - * @param pVM VM Handle. + * @param pVM The VM handle. * @param uErrorCode CPU Error code. * @param pRegFrame Trap register frame. @@ -76,5 +76,5 @@ * * @returns VBox status code (appropriate for trap handling and GC return). - * @param pVM VM Handle. + * @param pVM The VM handle. * @param uErrorCode CPU Error code. * @param pRegFrame Trap register frame. @@ -547,5 +547,5 @@ * @todo Propagate VERR_EM_NO_MEMORY up the call tree. * - * @param pVM The VM address. + * @param pVM The VM handle. * @param pPage The physical page tracking structure. This will * be modified on success. @@ -703,5 +703,5 @@ * @todo Propagate VERR_EM_NO_MEMORY up the call tree. * - * @param pVM The VM address. + * @param pVM The VM handle. * @param GCPhys The address of the page. * @@ -792,5 +792,5 @@ * @retval VERR_PGM_INVALID_LARGE_PAGE_RANGE if it can't be reused * - * @param pVM The VM address. + * @param pVM The VM handle. * @param GCPhys The address of the page. * @param pLargePage Page structure of the base page @@ -853,5 +853,5 @@ * @returns VBox strict status code. * - * @param pVM The VM address. + * @param pVM The VM handle. * @param pPage The physical page tracking structure. * @@ -877,5 +877,5 @@ * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. * - * @param pVM The VM address. + * @param pVM The VM handle. * @param pPage The physical page tracking structure. * @param GCPhys The address of the page. @@ -1000,5 +1000,5 @@ * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. * - * @param pVM The VM address. + * @param pVM The VM handle. * @param pPage The physical page tracking structure. * @param GCPhys The address of the page. @@ -1126,5 +1126,5 @@ * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. * - * @param pVM The VM address. + * @param pVM The VM handle. * @param pPage The physical page tracking structure. * @param GCPhys The address of the page. @@ -1161,5 +1161,5 @@ * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. * - * @param pVM The VM address. + * @param pVM The VM handle. * @param pPage The physical page tracking structure. Must be in the * allocated state. @@ -1190,5 +1190,5 @@ * @retval VERR_PGM_PHYS_PAGE_RESERVED it it's a valid page but has no physical backing. * - * @param pVM The VM address. + * @param pVM The VM handle. * @param pPage The physical page tracking structure. * @param GCPhys The address of the page. @@ -2032,5 +2032,5 @@ * Cache PGMPhys memory access * - * @param pVM VM Handle. + * @param pVM The VM handle. * @param pCache Cache structure pointer * @param GCPhys GC physical address @@ -2197,5 +2197,5 @@ * @retval VERR_PGM_PHYS_WR_HIT_HANDLER in R0 and GC, NEVER in R3. * - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPhys Physical address start reading from. * @param pvBuf Where to put the read bits. @@ -2731,5 +2731,5 @@ * @retval VERR_PGM_PHYS_WR_HIT_HANDLER in R0 and GC, NEVER in R3. * - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPhys Physical address to write to. * @param pvBuf What to write. @@ -2844,5 +2844,5 @@ * * @returns VBox status. - * @param pVM VM handle. + * @param pVM The VM handle. * @param pvDst The destination address. * @param GCPhysSrc The source address (GC physical address). @@ -2916,5 +2916,5 @@ * * @returns VBox status. - * @param pVM VM handle. + * @param pVM The VM handle. * @param GCPhysDst The GC physical address of the destination. * @param pvSrc The source buffer. @@ -3987,5 +3987,5 @@ * * @returns The page type. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPhys Guest physical address */ Index: /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (revision 41385) +++ /trunk/src/VBox/VMM/VMMAll/PGMAllPool.cpp (revision 41386) @@ -140,5 +140,5 @@ * * @returns VBox status code suitable for scheduling. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param pvDst Destination address * @param pvSrc Source guest virtual address. @@ -735,5 +735,5 @@ * @returns true if we consider the page as being reused for a different purpose. * @returns false if we consider it to still be a paging page. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param pVCpu VMCPU Handle. * @param pRegFrame Trap register frame. @@ -1028,5 +1028,5 @@ * * @returns VBox status code (appropriate for GC return). - * @param pVM VM Handle. + * @param pVM The VM handle. * @param uErrorCode CPU Error code. * @param pRegFrame Trap register frame. @@ -1606,5 +1606,5 @@ * Flush a dirty page * - * @param pVM VM Handle. + * @param pVM The VM handle. * @param pPool The pool. * @param idxSlot Dirty array slot index @@ -1704,5 +1704,5 @@ * Add a new dirty page * - * @param pVM VM Handle. + * @param pVM The VM handle. * @param pPool The pool. * @param pPage The page. @@ -1780,5 +1780,5 @@ * * @return dirty or not - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPhys Guest physical address */ @@ -1810,5 +1810,5 @@ * Reset all dirty pages by reinstating page monitoring. * - * @param pVM VM Handle. + * @param pVM The VM handle. */ void pgmPoolResetDirtyPages(PVM pVM) @@ -1848,5 +1848,5 @@ * Invalidate the PT entry for the specified page * - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPtrPage Guest page to invalidate */ @@ -1869,5 +1869,5 @@ * Reset all dirty pages by reinstating page monitoring. * - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPhysPT Physical address of the page table */ Index: /trunk/src/VBox/VMM/VMMR3/PGMMap.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PGMMap.cpp (revision 41385) +++ /trunk/src/VBox/VMM/VMMR3/PGMMap.cpp (revision 41386) @@ -47,5 +47,5 @@ * * @returns VBox status code. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPtr Virtual Address. (Page table aligned!) * @param cb Size of the range. Must be a 4MB aligned! @@ -215,5 +215,5 @@ * * @returns VBox status code. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPtr Virtual Address. (Page table aligned!) * @@ -289,5 +289,5 @@ * * @returns true/false. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param iPD The first PDE in the range. * @param cPTs The number of PDEs in the range. @@ -313,5 +313,5 @@ * The mapping *must* be in the list. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pMapping The mapping to unlink. */ @@ -345,5 +345,5 @@ * Links the mapping. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pMapping The mapping to linked. */ @@ -392,5 +392,5 @@ * * @returns VBox status code. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @thread EMT(0) */ @@ -478,5 +478,5 @@ * * @returns VBox status code. - * @param pVM The VM. + * @param pVM The VM handle. * @param pcb Where to store the size. */ @@ -498,5 +498,5 @@ * * @returns VBox status code. - * @param pVM The VM. + * @param pVM The VM handle. * @param GCPtrBase The address of the reserved range of guest memory. * @param cb The size of the range starting at GCPtrBase. @@ -538,5 +538,5 @@ * * @returns VBox status code. - * @param pVM The VM. + * @param pVM The VM handle. * @param GCPtrBase The address of the reserved range of guest memory. * @param cb The size of the range starting at GCPtrBase. @@ -680,5 +680,5 @@ * * @returns VBox status code. - * @param pVM The VM. + * @param pVM The VM handle. */ VMMR3DECL(int) PGMR3MappingsDisable(PVM pVM) @@ -721,5 +721,5 @@ * * @returns VBox status code. - * @param pVM The VM. + * @param pVM The VM handle. */ VMMR3DECL(int) PGMR3MappingsUnfix(PVM pVM) @@ -766,5 +766,5 @@ * * @returns VBox status code. - * @param pVM The virtual machine. + * @param pVM The VM handle. * @param Addr Intermediate context address of the mapping. * @param HCPhys Start of the range of physical pages. This must be entriely below 4GB! @@ -831,7 +831,7 @@ * * @returns VBox status code. - * @param pVM VM handle. - * @param uAddress Address of the mapping. - * @param cPages Number of pages. + * @param pVM The VM handle. + * @param uAddress Address of the mapping. + * @param cPages Number of pages. * @param pPTDefault Pointer to the default page table for this mapping. * @param pPTPaeDefault Pointer to the default page table for this mapping. @@ -839,5 +839,5 @@ static int pgmR3MapIntermediateCheckOne(PVM pVM, uintptr_t uAddress, unsigned cPages, PX86PT pPTDefault, PX86PTPAE pPTPaeDefault) { - AssertMsg((uAddress >> X86_PD_SHIFT) + cPages <= 1024, ("64-bit fixme\n")); + AssertMsg((uAddress >> X86_PD_SHIFT) + cPages <= 1024, ("64-bit fixme uAddress=%RGv cPages=%u\n", uAddress, cPages)); /* @@ -913,5 +913,5 @@ * Sets up the intermediate page tables for a verified mapping. * - * @param pVM VM handle. + * @param pVM The VM handle. * @param uAddress Address of the mapping. * @param HCPhys The physical address of the page range. @@ -1064,5 +1064,5 @@ * Relocates a mapping to a new address. * - * @param pVM VM handle. + * @param pVM The VM handle. * @param pMapping The mapping to relocate. * @param GCPtrOldMapping The address of the start of the old mapping. @@ -1186,5 +1186,5 @@ * * @returns VBox status code. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param pMapping The mapping which conflicts. * @param pPDSrc The page directory of the guest OS. @@ -1263,5 +1263,5 @@ * * @returns VBox status code. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param pMapping The mapping which conflicts. * @param GCPtrOldMapping The address of the start of the current mapping. @@ -1355,5 +1355,5 @@ * * @returns VBox status. - * @param pVM VM handle. + * @param pVM The VM handle. * @param pvDst The destination address (HC of course). * @param GCPtrSrc The source address (GC virtual address). Index: /trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp =================================================================== --- /trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (revision 41385) +++ /trunk/src/VBox/VMM/VMMR3/PGMPhys.cpp (revision 41386) @@ -102,5 +102,5 @@ * @retval VINF_SUCCESS. * - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPhys Physical address to read from. * @param pvBuf Where to read into. @@ -231,5 +231,5 @@ * @retval VERR_EM_NO_MEMORY. * - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPhys Physical address to write to. * @param pvBuf What to write. @@ -735,5 +735,5 @@ * Called when anything was relocated. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. */ void pgmR3PhysRelinkRamRanges(PVM pVM) @@ -785,5 +785,5 @@ * Links a new RAM range into the list. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pNew Pointer to the new list entry. * @param pPrev Pointer to the previous list entry. If NULL, insert as head. @@ -824,5 +824,5 @@ * Unlink an existing RAM range from the list. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pRam Pointer to the new list entry. * @param pPrev Pointer to the previous list entry. If NULL, insert as head. @@ -860,5 +860,5 @@ * Unlink an existing RAM range from the list. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pRam Pointer to the new list entry. */ @@ -1618,5 +1618,5 @@ * * @returns VBox status code. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param GCPhys The physical address of the RAM. * @param cb The size of the RAM. @@ -1755,5 +1755,5 @@ * @returns VBox status code. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. */ int pgmR3PhysRamPreAllocate(PVM pVM) @@ -1822,5 +1822,5 @@ * * @returns VBox status code. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. */ int pgmR3PhysRamReset(PVM pVM) @@ -1984,5 +1984,5 @@ * * @returns VBox status code. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. */ int pgmR3PhysRamTerm(PVM pVM) @@ -2065,5 +2065,5 @@ * @returns VBox status code. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param GCPhys The start of the MMIO region. * @param cb The size of the MMIO region. @@ -2231,5 +2231,5 @@ * * @returns VBox status code. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param GCPhys The start of the MMIO region. * @param cb The size of the MMIO region. @@ -2346,5 +2346,5 @@ * * @returns Pointer to the MMIO2 range. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pDevIns The device instance owning the region. * @param iRegion The region. @@ -2381,5 +2381,5 @@ * @retval VERR_ALREADY_EXISTS if the region already exists. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pDevIns The device instance owning the region. * @param iRegion The region number. If the MMIO2 memory is a PCI @@ -2509,5 +2509,5 @@ * * @returns VBox status code. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pDevIns The device instance owning the region. * @param iRegion The region. If it's UINT32_MAX it'll be a wildcard match. @@ -2614,6 +2614,6 @@ * @returns VBox status code. * - * @param pVM Pointer to the shared VM structure. - * @param pDevIns The + * @param pVM The VM handle. + * @param pDevIns The device instance owning the region. */ VMMR3DECL(int) PGMR3PhysMMIO2Map(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys) @@ -2870,5 +2870,5 @@ * * @returns true/false accordingly. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pDevIns The owner of the memory, optional. * @param GCPhys The address to check. @@ -2908,5 +2908,5 @@ * * @returns VBox status code. - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pDevIns The owner of the memory, optional. * @param iRegion The region. @@ -2943,5 +2943,5 @@ * @return VBox status code. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pDevIns The device owning the MMIO2 memory. * @param iRegion The region. @@ -2985,5 +2985,5 @@ * * @returns VBox status. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param pDevIns The device instance owning the ROM. * @param GCPhys First physical address in the range. @@ -3348,5 +3348,5 @@ * * @returns VBox status. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param pDevIns The device instance owning the ROM. * @param GCPhys First physical address in the range. @@ -3382,5 +3382,5 @@ * @returns VINF_SUCCESS if the handler have carried out the operation. * @returns VINF_PGM_HANDLER_DO_DEFAULT if the caller should carry out the access operation. - * @param pVM VM Handle. + * @param pVM The VM handle. * @param GCPhys The physical address the guest is writing to. * @param pvPhys The HC mapping of that address. @@ -3617,5 +3617,5 @@ * @retval VINF_PGM_SYNC_CR3 * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param GCPhys Where to start. Page aligned. * @param cb How much to change. Page aligned. @@ -3943,5 +3943,5 @@ * * @returns VBox status code. - * @param pVM The VM to operate on. + * @param pVM The VM handle. */ void pgmR3PhysUnmapChunk(PVM pVM) @@ -4408,5 +4408,5 @@ * This is used by ballooning, remapping MMIO2, RAM reset and state loading. * - * @param pVM Pointer to the shared VM structure. + * @param pVM The VM handle. * @param pReq Pointer to the request. * @param pcPendingPages Where the number of pages waiting to be freed are