Navigation

← Previous Changeset
Next Changeset →

Changeset 11164

Timestamp:

08/06/08 02:15:58 (4 months ago)

Author:

vboxsync

Message:

#1865: VGA. Changed PDMDevHlpMMHyperMapMMIO2/MMHyperMapMMIO2 to return a RC pointer instead of a GC one.

Files:

trunk/include/VBox/mm.h (modified) (1 diff)
trunk/include/VBox/pdmdev.h (modified) (2 diffs)
trunk/src/VBox/VMM/MMHyper.cpp (modified) (2 diffs)
trunk/src/VBox/VMM/PDMDevice.cpp (modified) (4 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

trunk/include/VBox/mm.h

r11153	r11164
355	355	MMR3DECL(int) MMR3HyperMapHCPhys(PVM pVM, void pvHC, RTHCPHYS HCPhys, size_t cb, const char pszDesc, PRTGCPTR pGCPtr);
356	356	MMR3DECL(int) MMR3HyperMapGCPhys(PVM pVM, RTGCPHYS GCPhys, size_t cb, const char *pszDesc, PRTGCPTR pGCPtr);
357		MMR3DECL(int) MMR3HyperMapMMIO2(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRT~~GCPTR pG~~CPtr);
	357	MMR3DECL(int) MMR3HyperMapMMIO2(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRTRCPTR pRCPtr);
358	358	MMR3DECL(int) MMR3HyperMapHCRam(PVM pVM, void pvHC, size_t cb, bool fFree, const char pszDesc, PRTGCPTR pGCPtr);
359	359	MMR3DECL(int) MMR3HyperMapPages(PVM pVM, void pvR3, RTR0PTR pvR0, size_t cPages, PCSUPPAGE paPages, const char pszDesc, PRTGCPTR pGCPtr);

trunk/include/VBox/pdmdev.h

r11149	r11164
2658	2658	* @param cb The number of bytes to map. Will be rounded up to the closest page boundrary.
2659	2659	* @param pszDesc Mapping description.
2660		* @param p~~GCPtr Where to store the G~~C address.
	2660	* @param pRCPtr Where to store the RC address.
2661	2661	*/
2662	2662	DECLR3CALLBACKMEMBER(int, pfnMMHyperMapMMIO2,(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb,
2663		const char *pszDesc, PRT~~GCPTR pG~~CPtr));
	2663	const char *pszDesc, PRTRCPTR pRCPtr));
2664	2664
2665	2665	/** @} */
…	…
3188	3188	*/
3189	3189	DECLINLINE(int) PDMDevHlpMMHyperMapMMIO2(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb,
3190		const char *pszDesc, PRT~~GCPTR pG~~CPtr)
3191		{
3192		return pDevIns->pDevHlp->pfnMMHyperMapMMIO2(pDevIns, iRegion, off, cb, pszDesc, pGCPtr);
	3190	const char *pszDesc, PRTRCPTR pRCPtr)
	3191	{
	3192	return pDevIns->pDevHlp->pfnMMHyperMapMMIO2(pDevIns, iRegion, off, cb, pszDesc, pRCPtr);
3193	3193	}
3194	3194

trunk/src/VBox/VMM/MMHyper.cpp

r9303	r11164
425	425	* @param cb The number of bytes to map. Will be rounded up to the closest page boundrary.
426	426	* @param pszDesc Mapping description.
427		* @param p~~GCPtr Where to store the G~~C address.
	427	* @param pRCPtr Where to store the RC address.
428	428	*/
429	429	MMR3DECL(int) MMR3HyperMapMMIO2(PVM pVM, PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb,
430		const char *pszDesc, PRT~~GCPTR pG~~CPtr)
431		{
432		LogFlow(("MMR3HyperMapMMIO2: pDevIns=%p iRegion=%#x off=%VGp cb=%VGp pszDesc=%p:{%s} pGCPtr=%p\n",
433		pDevIns, iRegion, off, cb, pszDesc, pszDesc, pGCPtr));
	430	const char *pszDesc, PRTRCPTR pRCPtr)
	431	{
	432	LogFlow(("MMR3HyperMapMMIO2: pDevIns=%p iRegion=%#x off=%VGp cb=%VGp pszDesc=%p:{%s} pRCPtr=%p\n",
	433	pDevIns, iRegion, off, cb, pszDesc, pszDesc, pRCPtr));
434	434	int rc;
435	435
…	…
484	484	}
485	485
486		if (VBOX_SUCCESS(rc) && pGCPtr)
487		*pGCPtr = GCPtr \| offPage;
	486	if (VBOX_SUCCESS(rc))
	487	{
	488	GCPtr \|= offPage;
	489	*pRCPtr = GCPtr;
	490	AssertLogRelReturn(*pRCPtr == GCPtr, VERR_INTERNAL_ERROR);
	491	}
488	492	}
489	493	return rc;

trunk/src/VBox/VMM/PDMDevice.cpp

r10841	r11164
172	172	static DECLCALLBACK(int) pdmR3DevHlp_MMIO2Map(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys);
173	173	static DECLCALLBACK(int) pdmR3DevHlp_MMIO2Unmap(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys);
174		static DECLCALLBACK(int) pdmR3DevHlp_MMHyperMapMMIO2(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRT~~GCPTR pG~~CPtr);
	174	static DECLCALLBACK(int) pdmR3DevHlp_MMHyperMapMMIO2(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRTRCPTR pRCPtr);
175	175
176	176	static DECLCALLBACK(PVM) pdmR3DevHlp_Untrusted_GetVM(PPDMDEVINS pDevIns);
…	…
211	211	static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_MMIO2Map(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys);
212	212	static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_MMIO2Unmap(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS GCPhys);
213		static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_MMHyperMapMMIO2(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRT~~GCPTR pG~~CPtr);
	213	static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_MMHyperMapMMIO2(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRTRCPTR pRCPtr);
214	214	/** @} */
215	215
…	…
3625	3625	*/
3626	3626	static DECLCALLBACK(int) pdmR3DevHlp_MMHyperMapMMIO2(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb,
3627		const char *pszDesc, PRT~~GCPTR pG~~CPtr)
	3627	const char *pszDesc, PRTRCPTR pRCPtr)
3628	3628	{
3629	3629	PDMDEV_ASSERT_DEVINS(pDevIns);
3630	3630	VM_ASSERT_EMT(pDevIns->Internal.s.pVMHC);
3631		LogFlow(("pdmR3DevHlp_MMHyperMapMMIO2: caller='%s'/%d: iRegion=#x off=%RGp cb=%RGp pszDesc=%p:{%s} pGCPtr=%p\n",
3632		pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, iRegion, off, cb, pszDesc, pszDesc, pGCPtr));
3633
3634		int rc = MMR3HyperMapMMIO2(pDevIns->Internal.s.pVMHC, pDevIns, iRegion, off, cb, pszDesc, pGCPtr);
3635
3636		LogFlow(("pdmR3DevHlp_MMHyperMapMMIO2: caller='%s'/%d: returns %Rrc~~\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc~~));
	3631	LogFlow(("pdmR3DevHlp_MMHyperMapMMIO2: caller='%s'/%d: iRegion=#x off=%RGp cb=%RGp pszDesc=%p:{%s} pRCPtr=%p\n",
	3632	pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, iRegion, off, cb, pszDesc, pszDesc, pRCPtr));
	3633
	3634	int rc = MMR3HyperMapMMIO2(pDevIns->Internal.s.pVMHC, pDevIns, iRegion, off, cb, pszDesc, pRCPtr);
	3635
	3636	LogFlow(("pdmR3DevHlp_MMHyperMapMMIO2: caller='%s'/%d: returns %Rrc pRCPtr=%RRv\n", pDevIns->pDevReg->szDeviceName, pDevIns->iInstance, rc, pRCPtr));
3637	3637	return rc;
3638	3638	}
…	…
3988	3988
3989	3989	/** @copydoc PDMDEVHLP::pfnMMHyperMapMMIO2 */
3990		static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_MMHyperMapMMIO2(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRT~~GCPTR pG~~CPtr)
	3990	static DECLCALLBACK(int) pdmR3DevHlp_Untrusted_MMHyperMapMMIO2(PPDMDEVINS pDevIns, uint32_t iRegion, RTGCPHYS off, RTGCPHYS cb, const char *pszDesc, PRTRCPTR pRCPtr)
3991	3991	{
3992	3992	PDMDEV_ASSERT_DEVINS(pDevIns);

Navigation

Changeset 11164

Legend:

trunk/include/VBox/mm.h

trunk/include/VBox/pdmdev.h

trunk/src/VBox/VMM/MMHyper.cpp

trunk/src/VBox/VMM/PDMDevice.cpp

Download in other formats: