vbox的更動 9212 路徑 trunk/src/VBox/VMM/VMMAll/EMAll.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/EMAll.cpp (修改) (5 筆差異)

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

@@ -55 +55 @@
 typedef DECLCALLBACK(uint32_t) PFN_EMULATE_PARAM2(uint32_t *pu32Param1, size_t val2);
 typedef DECLCALLBACK(uint32_t) PFN_EMULATE_PARAM3(uint32_t *pu32Param1, uint32_t val2, size_t val3);
-typedef DECLCALLBACK(int)      FNEMULATELOCKPARAM2(RTGCPTR GCPtrParam1, RTGCUINTREG Val2, uint32_t *pf);
+typedef DECLCALLBACK(int)      FNEMULATELOCKPARAM2(RTGCPTR GCPtrParam1, RTGCUINTREG Val2, RTGCUINTREG32 *pf);
 typedef FNEMULATELOCKPARAM2 *PFNEMULATELOCKPARAM2;
-typedef DECLCALLBACK(int)      FNEMULATELOCKPARAM3(RTGCPTR GCPtrParam1, RTGCUINTREG Val2, size_t cb, uint32_t *pf);
+typedef DECLCALLBACK(int)      FNEMULATELOCKPARAM3(RTGCPTR GCPtrParam1, RTGCUINTREG Val2, size_t cb, RTGCUINTREG32 *pf);
 typedef FNEMULATELOCKPARAM3 *PFNEMULATELOCKPARAM3;
 
@@ -291 +291 @@
 {
 #ifdef IN_GC
-    int rc = MMGCRamRead(pVM, pDest, GCSrc, cb);
+    int rc = MMGCRamRead(pVM, pDest, (void *)GCSrc, cb);
     if (RT_LIKELY(rc != VERR_ACCESS_DENIED))
         return rc;
@@ -312 +312 @@
 {
 #ifdef IN_GC
-    int rc = MMGCRamWrite(pVM, GCDest, pSrc, cb);
+    int rc = MMGCRamWrite(pVM, (void *)GCDest, pSrc, cb);
     if (RT_LIKELY(rc != VERR_ACCESS_DENIED))
         return rc;
@@ -816 +816 @@
     Log2(("%s %RGv imm%d=%RGr\n", emGetMnemonic(pCpu), GCPtrPar1, pCpu->param2.size*8, ValPar2));
 
-    RTGCUINTREG eflags = 0;
+    RTGCUINTREG32 eflags = 0;
     MMGCRamRegisterTrapHandler(pVM);
     rc = pfnEmulate(GCPtrPar1, ValPar2, pCpu->param2.size, &eflags);
@@ -1090 +1090 @@
 
     /* Try emulate it with a one-shot #PF handler in place. */
-    RTGCUINTREG eflags = 0;
+    RTGCUINTREG32 eflags = 0;
     MMGCRamRegisterTrapHandler(pVM);
     rc = pfnEmulate(GCPtrPar1, ValPar2, &eflags);