vbox的更動 9212 路徑 trunk/src/VBox/VMM/VMMAll/MMAll.cpp

時間撮記:

2008-5-29 上午09:38:38 (16 年 以前)

作者:

vboxsync

訊息:

Major changes for sizeof(RTGCPTR) == uint64_t.
Introduced RCPTRTYPE for pointers valid in raw mode only (RTGCPTR32).

Disabled by default. Enable by adding VBOX_WITH_64_BITS_GUESTS to your LocalConfig.kmk.

檔案:

• trunk/src/VBox/VMM/VMMAll/MMAll.cpp (修改) (10 筆差異)

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

@@ -174 +174 @@
 {
 #ifdef IN_GC
-    return mmHyperLookupGC(pVM, pv, poff);
+    return mmHyperLookupGC(pVM, (RTGCPTR)pv, poff);
 #elif defined(IN_RING0)
     return mmHyperLookupR0(pVM, pv, poff);
@@ -254 +254 @@
 {
 #ifdef IN_GC
-    return mmHyperLookupCalcGC(pVM, pLookup, off);
+    return (void *)mmHyperLookupCalcGC(pVM, pLookup, off);
 #elif defined(IN_RING0)
     return mmHyperLookupCalcR0(pLookup, off);
@@ -494 +494 @@
  */
 #ifndef IN_GC
-MMDECL(RTGCPTR) MMHyperCCToGC(PVM pVM, void *pv)
+MMDECL(RCPTRTYPE(void *)) MMHyperCCToGC(PVM pVM, void *pv)
 {
     uint32_t off;
@@ -516 +516 @@
  * @deprecated
  */
-MMDECL(RTGCPTR) MMHyperHC2GC(PVM pVM, RTHCPTR HCPtr)
+MMDECL(RCPTRTYPE(void *)) MMHyperHC2GC(PVM pVM, RTHCPTR HCPtr)
 {
     PMMLOOKUPHYPER  pLookup = (PMMLOOKUPHYPER)((char*)CTXSUFF(pVM->mm.s.pHyperHeap) + pVM->mm.s.offLookupHyper);
@@ -527 +527 @@
                 unsigned    off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)pLookup->u.Locked.pvHC;
                 if (off < pLookup->cb)
-                    return (RTGCPTR)((RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC + pLookup->off + off);
+                    return (RCPTRTYPE(void *))((RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC + pLookup->off + off);
                 break;
             }
@@ -535 +535 @@
                 unsigned    off = (RTHCUINTPTR)HCPtr - (RTHCUINTPTR)pLookup->u.HCPhys.pvHC;
                 if (off < pLookup->cb)
-                    return (RTGCPTR)((RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC + pLookup->off + off);
+                    return (RCPTRTYPE(void *))((RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC + pLookup->off + off);
                 break;
             }
@@ -556 +556 @@
 
     AssertMsgFailed(("HCPtr=%p is not inside the hypervisor memory area!\n", HCPtr));
-    return (RTGCPTR)0;
+    return (RCPTRTYPE(void *))0;
 }
 
@@ -570 +570 @@
  * @deprecated
  */
-MMDECL(RTHCPTR) MMHyperGC2HC(PVM pVM, RTGCPTR GCPtr)
+MMDECL(RTHCPTR) MMHyperGC2HC(PVM pVM, RCPTRTYPE(void *) GCPtr)
 {
     unsigned        offGC = (RTGCUINTPTR)GCPtr - (RTGCUINTPTR)pVM->mm.s.pvHyperAreaGC;
@@ -615 +615 @@
 MMDECL(RTHCPTR) MMHyper2HC(PVM pVM, uintptr_t Ptr)
 {
-    return MMHyperGC2HC(pVM, (RTGCPTR)Ptr);
+    return MMHyperGC2HC(pVM, (RCPTRTYPE(void *))Ptr);
 }
 
@@ -630 +630 @@
  * @deprecated
  */
-MMDECL(RTGCPTR) MMHyper2GC(PVM pVM, uintptr_t Ptr)
+MMDECL(RCPTRTYPE(void *)) MMHyper2GC(PVM pVM, uintptr_t Ptr)
 {
     return MMHyperHC2GC(pVM, (RTHCPTR)Ptr);