Changeset 13144 in vbox for trunk/src/VBox/VMM/VMMAll/EMAll.cpp

Timestamp:

Oct 9, 2008 10:44:11 PM (16 years ago)

Author:

vboxsync

Message:

#1865: Implmented the alternative R0 code for darwin (turned out to be all generic new-phys code). Started renaming the read/write functions: PGMPhysReadGCPtr -> PGMPhysSimpleReadGCPtr, PGMPhysWriteGCPtr -> PGMPhysSimpleWriteGCPtr, PGMPhysWriteGCPtrDirty -> PGMPhysSimpleDirtyWriteGCPtr.

File:

• trunk/src/VBox/VMM/VMMAll/EMAll.cpp (modified) (4 diffs)

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

@@ -116 +116 @@
     PVM           pVM      = (PVM)pCpu->apvUserData[0];
 # ifdef IN_RING0
-    int rc = PGMPhysReadGCPtr(pVM, pDest, pSrc, cb);
-    AssertMsgRC(rc, ("PGMPhysReadGCPtr failed for pSrc=%VGv cb=%x\n", pSrc, cb));
+    int rc = PGMPhysSimpleReadGCPtr(pVM, pDest, pSrc, cb);
+    AssertMsgRC(rc, ("PGMPhysSimpleReadGCPtr failed for pSrc=%VGv cb=%x\n", pSrc, cb));
 # else /* IN_RING3 */
     if (!PATMIsPatchGCAddr(pVM, pSrc))
     {
-        int rc = PGMPhysReadGCPtr(pVM, pDest, pSrc, cb);
+        int rc = PGMPhysSimpleReadGCPtr(pVM, pDest, pSrc, cb);
         AssertRC(rc);
     }
@@ -2577 +2577 @@
 #endif
     default:
-        /* In X2APIC specification this range is reserved for APIC control. */ 
+        /* In X2APIC specification this range is reserved for APIC control. */
         if ((pRegFrame->ecx >= MSR_IA32_APIC_START) && (pRegFrame->ecx < MSR_IA32_APIC_END))
             rc = PDMApicReadMSR(pVM, VMMGetCpuId(pVM), pRegFrame->ecx, &val);
-        else 
+        else
             /* We should actually trigger a #GP here, but don't as that might cause more trouble. */
             val = 0;
@@ -2586 +2586 @@
     }
     Log(("EMInterpretRdmsr %s (%x) -> val=%VX64\n", emMSRtoString(pRegFrame->ecx), pRegFrame->ecx, val));
-    if (rc == VINF_SUCCESS) 
+    if (rc == VINF_SUCCESS)
     {
         pRegFrame->eax = (uint32_t) val;
@@ -2722 +2722 @@
 
     default:
-        /* In X2APIC specification this range is reserved for APIC control. */ 
+        /* In X2APIC specification this range is reserved for APIC control. */
         if ((pRegFrame->ecx >=  MSR_IA32_APIC_START) && (pRegFrame->ecx <  MSR_IA32_APIC_END))
             return PDMApicWriteMSR(pVM, VMMGetCpuId(pVM), pRegFrame->ecx, val);