Changeset 13813 in vbox for trunk/src/VBox/VMM/testcase/tstMicro.cpp

Timestamp:

Nov 4, 2008 9:55:34 PM (16 years ago)

Author:

vboxsync

Message:

#1865: Final VMM cleanups.

File:

• trunk/src/VBox/VMM/testcase/tstMicro.cpp (modified) (8 diffs)

trunk/src/VBox/VMM/testcase/tstMicro.cpp

@@ -209 +209 @@
         return rc;
     }
-    RTGCPTR32 GCPtrEntry;
-    rc = PDMR3LdrGetSymbolRC(pVM, "tstMicroGC.gc", "tstMicroGC", &GCPtrEntry);
+    RTRCPTR RCPtrEntry;
+    rc = PDMR3LdrGetSymbolRC(pVM, "tstMicroGC.gc", "tstMicroGC", &RCPtrEntry);
     if (VBOX_FAILURE(rc))
     {
@@ -216 +216 @@
         return rc;
     }
-    RTGCPTR32 GCPtrStart;
-    rc = PDMR3LdrGetSymbolRC(pVM, "tstMicroGC.gc", "tstMicroGCAsmStart", &GCPtrStart);
+    RTRCPTR RCPtrStart;
+    rc = PDMR3LdrGetSymbolRC(pVM, "tstMicroGC.gc", "tstMicroGCAsmStart", &RCPtrStart);
     if (VBOX_FAILURE(rc))
     {
@@ -223 +223 @@
         return rc;
     }
-    RTGCPTR32 GCPtrEnd;
-    rc = PDMR3LdrGetSymbolRC(pVM, "tstMicroGC.gc", "tstMicroGCAsmEnd", &GCPtrEnd);
+    RTRCPTR RCPtrEnd;
+    rc = PDMR3LdrGetSymbolRC(pVM, "tstMicroGC.gc", "tstMicroGCAsmEnd", &RCPtrEnd);
     if (VBOX_FAILURE(rc))
     {
@@ -241 +241 @@
         return rc;
     }
-    pTst->GCPtr = MMHyperHC2GC(pVM, pTst);
-    pTst->GCPtrStack = MMHyperHC2GC(pVM, &pTst->au8Stack[sizeof(pTst->au8Stack) - 32]);
+    pTst->RCPtr = MMHyperR3ToRC(pVM, pTst);
+    pTst->RCPtrStack = MMHyperR3ToRC(pVM, &pTst->au8Stack[sizeof(pTst->au8Stack) - 32]);
 
     /* the page must be writable from user mode */
-    rc = PGMMapModifyPage(pVM, pTst->GCPtr, sizeof(*pTst), X86_PTE_US | X86_PTE_RW, ~(uint64_t)(X86_PTE_US | X86_PTE_RW));
+    rc = PGMMapModifyPage(pVM, pTst->RCPtr, sizeof(*pTst), X86_PTE_US | X86_PTE_RW, ~(uint64_t)(X86_PTE_US | X86_PTE_RW));
     if (VBOX_FAILURE(rc))
     {
@@ -253 +253 @@
 
     /* all the code must be executable from R3. */
-    rc = PGMMapModifyPage(pVM, GCPtrStart, GCPtrEnd - GCPtrStart + PAGE_SIZE, X86_PTE_US, ~(uint64_t)X86_PTE_US);
+    rc = PGMMapModifyPage(pVM, RCPtrStart, RCPtrEnd - RCPtrStart + PAGE_SIZE, X86_PTE_US, ~(uint64_t)X86_PTE_US);
     if (VBOX_FAILURE(rc))
     {
@@ -265 +265 @@
      * Disassemble the assembly...
      */
-    RTGCPTR GCPtr = GCPtrStart;
-    while (GCPtr < GCPtrEnd)
+    RTGCPTR GCPtr = RCPtrStart;
+    while (GCPtr < RCPtrEnd)
     {
         size_t  cb = 0;
@@ -298 +298 @@
         for (int c = 0; c < 100; c++)
         {
-            int rc2 = VMMR3CallGC(pVM, GCPtrEntry, 2, pTst->GCPtr, enmTest);
+            int rc2 = VMMR3CallRC(pVM, RCPtrEntry, 2, pTst->RCPtr, enmTest);
             if (VBOX_SUCCESS(rc2))
             {
@@ -327 +327 @@
     {
         TSTMICROTEST enmTest = (TSTMICROTEST)i;
-        rc = VMMR3CallGC(pVM, GCPtrEntry, 2, pTst->GCPtr, enmTest);
+        rc = VMMR3CallRC(pVM, RCPtrEntry, 2, pTst->RCPtr, enmTest);
         PrintResultTrap(pTst, enmTest, rc);
     }