Changeset 13813 in vbox

Timestamp:

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

Author:

vboxsync

svn:sync-xref-src-repo-rev:

38804

Message:

#1865: Final VMM cleanups.

Location:

trunk

Files:

• include/VBox/vmm.h (modified) (2 diffs)
• include/iprt/initterm.h (modified) (3 diffs)
• src/VBox/Runtime/gc/initterm-gc.cpp (modified) (4 diffs)
• src/VBox/VMM/EM.cpp (modified) (1 diff)
• src/VBox/VMM/VMM.cpp (modified) (6 diffs)
• src/VBox/VMM/VMMGC/VMMGC.cpp (modified) (4 diffs)
• src/VBox/VMM/VMMGC/VMMGC.def (modified) (1 diff)
• src/VBox/VMM/VMMGC/VMMGC.mac (modified) (1 diff)
• src/VBox/VMM/VMMGC/VMMGC99.asm (modified) (1 diff)
• src/VBox/VMM/VMMGC/VMMGCA.asm (modified) (1 diff)
• src/VBox/VMM/VMMGC/VMMGCBuiltin.def (modified) (1 diff)
• src/VBox/VMM/VMMGuruMeditation.cpp (modified) (1 diff)
• src/VBox/VMM/VMMInternal.h (modified) (3 diffs)
• src/VBox/VMM/VMMR0/VMMR0.cpp (modified) (6 diffs)
• src/VBox/VMM/VMMSwitcher.cpp (modified) (1 diff)
• src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac (modified) (2 diffs)
• src/VBox/VMM/VMMTests.cpp (modified) (11 diffs)
• src/VBox/VMM/testcase/tstMicro.cpp (modified) (8 diffs)
• src/VBox/VMM/testcase/tstMicro.h (modified) (1 diff)
• src/VBox/VMM/testcase/tstMicro.mac (modified) (1 diff)
• src/VBox/VMM/testcase/tstMicroGCA.asm (modified) (3 diffs)

trunk/include/VBox/vmm.h

@@ -129 +129 @@
 VMMR3DECL(void)     VMMR3Relocate(PVM pVM, RTGCINTPTR offDelta);
 VMMR3DECL(int)      VMMR3UpdateLoggers(PVM pVM);
-VMMR3DECL(const char *) VMMR3GetGCAssertMsg1(PVM pVM);
-VMMR3DECL(const char *) VMMR3GetGCAssertMsg2(PVM pVM);
+VMMR3DECL(const char *) VMMR3GetRZAssertMsg1(PVM pVM);
+VMMR3DECL(const char *) VMMR3GetRZAssertMsg2(PVM pVM);
 VMMR3DECL(int)      VMMR3GetImportRC(PVM pVM, const char *pszSymbol, PRTRCPTR pRCPtrValue);
 VMMR3DECL(int)      VMMR3SelectSwitcher(PVM pVM, VMMSWITCHER enmSwitcher);
@@ -136 +136 @@
 VMMR3DECL(int)      VMMR3RawRunGC(PVM pVM);
 VMMR3DECL(int)      VMMR3HwAccRunGC(PVM pVM);
-VMMR3DECL(int)      VMMR3CallGC(PVM pVM, RTRCPTR GCPtrEntry, unsigned cArgs, ...);
-VMMR3DECL(int)      VMMR3CallGCV(PVM pVM, RTRCPTR GCPtrEntry, unsigned cArgs, va_list args);
+VMMR3DECL(int)      VMMR3CallRC(PVM pVM, RTRCPTR RCPtrEntry, unsigned cArgs, ...);
+VMMR3DECL(int)      VMMR3CallRCV(PVM pVM, RTRCPTR RCPtrEntry, unsigned cArgs, va_list args);
 VMMR3DECL(int)      VMMR3ResumeHyper(PVM pVM);
 VMMR3DECL(void)     VMMR3FatalDump(PVM pVM, int rcErr);

trunk/include/iprt/initterm.h

@@ -82 +82 @@
 RTR3DECL(int) RTR3InitAndSUPLibWithProgramPath(const char *pszProgramPath);
 
-/** 
+/**
  * Initializes the runtime library and possibly also SUPLib too.
- * 
+ *
  * Avoid this interface, it's not considered stable.
- * 
+ *
  * @returns IPRT status code.
  * @param   iVersion        The interface version. Must be 0 atm.
@@ -119 +119 @@
 #ifdef IN_GC
 /**
- * Initalizes the guest context runtime library.
+ * Initializes the raw-mode context runtime library.
  *
  * @returns iprt status code.
@@ -125 +125 @@
  * @param   u64ProgramStartNanoTS  The startup timestamp.
  */
-RTGCDECL(int) RTGCInit(uint64_t u64ProgramStartNanoTS);
+RTGCDECL(int) RTRCInit(uint64_t u64ProgramStartNanoTS);
 
 /**
- * Terminates the guest context runtime library.
+ * Terminates the raw-mode context runtime library.
  */
-RTGCDECL(void) RTGCTerm(void);
+RTGCDECL(void) RTRCTerm(void);
 #endif
 

trunk/src/VBox/Runtime/gc/initterm-gc.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT - Init Guest Context.
+ * IPRT - Init Raw-mode Context.
  */
 
@@ -64 +64 @@
 
 /**
- * Initalizes the guest context runtime library. 
+ * Initializes the raw-mode context runtime library.
  *
  * @returns iprt status code.
@@ -70 +70 @@
  * @param   u64ProgramStartNanoTS  The startup timestamp.
  */
-RTGCDECL(int) RTGCInit(uint64_t u64ProgramStartNanoTS)
+RTGCDECL(int) RTRCInit(uint64_t u64ProgramStartNanoTS)
 {
     /*
@@ -85 +85 @@
 
 /**
- * Terminates the guest context runtime library.
+ * Terminates the raw-mode context runtime library.
  */
-RTGCDECL(void) RTGCTerm(void)
+RTGCDECL(void) RTRCTerm(void)
 {
     /* do nothing */

trunk/src/VBox/VMM/EM.cpp

@@ -664 +664 @@
 
             case VINF_EM_DBG_HYPER_ASSERTION:
-                RTPrintf("\nVINF_EM_DBG_HYPER_ASSERTION:\n%s%s\n", VMMR3GetGCAssertMsg1(pVM), VMMR3GetGCAssertMsg2(pVM));
-                rc = DBGFR3EventAssertion(pVM, DBGFEVENT_ASSERTION_HYPER, VMMR3GetGCAssertMsg1(pVM), VMMR3GetGCAssertMsg2(pVM));
+                RTPrintf("\nVINF_EM_DBG_HYPER_ASSERTION:\n%s%s\n", VMMR3GetRZAssertMsg1(pVM), VMMR3GetRZAssertMsg2(pVM));
+                rc = DBGFR3EventAssertion(pVM, DBGFEVENT_ASSERTION_HYPER, VMMR3GetRZAssertMsg1(pVM), VMMR3GetRZAssertMsg2(pVM));
                 break;
 

trunk/src/VBox/VMM/VMM.cpp

@@ -743 +743 @@
 
 /**
- * Gets the pointer to g_szRTAssertMsg1 in GC.
- * @returns Pointer to VMMGC::g_szRTAssertMsg1.
- *          Returns NULL if not present.
+ * Gets the pointer to a buffer containing the R0/RC AssertMsg1 output.
+ *
+ * @returns Pointer to the buffer.
  * @param   pVM         The VM handle.
  */
-VMMR3DECL(const char *) VMMR3GetGCAssertMsg1(PVM pVM)
-{
-    RTGCPTR32 GCPtr;
-    int rc = PDMR3LdrGetSymbolRC(pVM, NULL, "g_szRTAssertMsg1", &GCPtr);
+VMMR3DECL(const char *) VMMR3GetRZAssertMsg1(PVM pVM)
+{
+    if (HWACCMIsEnabled(pVM))
+        return pVM->vmm.s.szRing0AssertMsg1;
+
+    RTRCPTR RCPtr;
+    int rc = PDMR3LdrGetSymbolRC(pVM, NULL, "g_szRTAssertMsg1", &RCPtr);
     if (VBOX_SUCCESS(rc))
-        return (const char *)MMHyperGC2HC(pVM, GCPtr);
+        return (const char *)MMHyperRCToR3(pVM, RCPtr);
+
     return NULL;
 }
@@ -759 +763 @@
 
 /**
- * Gets the pointer to g_szRTAssertMsg2 in GC.
- * @returns Pointer to VMMGC::g_szRTAssertMsg2.
- *          Returns NULL if not present.
+ * Gets the pointer to a buffer containing the R0/RC AssertMsg2 output.
+ *
+ * @returns Pointer to the buffer.
  * @param   pVM         The VM handle.
  */
-VMMR3DECL(const char *) VMMR3GetGCAssertMsg2(PVM pVM)
-{
-    RTGCPTR32 GCPtr;
-    int rc = PDMR3LdrGetSymbolRC(pVM, NULL, "g_szRTAssertMsg2", &GCPtr);
+VMMR3DECL(const char *) VMMR3GetRZAssertMsg2(PVM pVM)
+{
+    if (HWACCMIsEnabled(pVM))
+        return pVM->vmm.s.szRing0AssertMsg2;
+
+    RTRCPTR RCPtr;
+    int rc = PDMR3LdrGetSymbolRC(pVM, NULL, "g_szRTAssertMsg2", &RCPtr);
     if (VBOX_SUCCESS(rc))
-        return (const char *)MMHyperGC2HC(pVM, GCPtr);
+        return (const char *)MMHyperRCToR3(pVM, RCPtr);
+
     return NULL;
 }
@@ -1139 +1147 @@
 }
 
-/**
- * Calls GC a function.
+
+/**
+ * Calls a RC function.
  *
  * @param   pVM         The VM handle.
- * @param   GCPtrEntry  The GC function address.
+ * @param   RCPtrEntry  The address of the RC function.
  * @param   cArgs       The number of arguments in the ....
  * @param   ...         Arguments to the function.
  */
-VMMR3DECL(int) VMMR3CallGC(PVM pVM, RTRCPTR GCPtrEntry, unsigned cArgs, ...)
+VMMR3DECL(int) VMMR3CallRC(PVM pVM, RTRCPTR RCPtrEntry, unsigned cArgs, ...)
 {
     va_list args;
     va_start(args, cArgs);
-    int rc = VMMR3CallGCV(pVM, GCPtrEntry, cArgs, args);
+    int rc = VMMR3CallRCV(pVM, RCPtrEntry, cArgs, args);
     va_end(args);
     return rc;
@@ -1158 +1167 @@
 
 /**
- * Calls GC a function.
+ * Calls a RC function.
  *
  * @param   pVM         The VM handle.
- * @param   GCPtrEntry  The GC function address.
+ * @param   RCPtrEntry  The address of the RC function.
  * @param   cArgs       The number of arguments in the ....
  * @param   args        Arguments to the function.
  */
-VMMR3DECL(int) VMMR3CallGCV(PVM pVM, RTRCPTR GCPtrEntry, unsigned cArgs, va_list args)
-{
-    Log2(("VMMR3CallGCV: GCPtrEntry=%VRv cArgs=%d\n", GCPtrEntry, cArgs));
+VMMR3DECL(int) VMMR3CallRCV(PVM pVM, RTRCPTR RCPtrEntry, unsigned cArgs, va_list args)
+{
+    Log2(("VMMR3CallGCV: RCPtrEntry=%VRv cArgs=%d\n", RCPtrEntry, cArgs));
 
     /*
@@ -1181 +1190 @@
 
     CPUMPushHyper(pVM, cArgs * sizeof(RTGCUINTPTR32));                          /* stack frame size */
-    CPUMPushHyper(pVM, GCPtrEntry);                                             /* what to call */
+    CPUMPushHyper(pVM, RCPtrEntry);                                             /* what to call */
     CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnCallTrampolineRC);
 
@@ -1238 +1247 @@
 VMMR3DECL(int) VMMR3ResumeHyper(PVM pVM)
 {
-    Log(("VMMR3ResumeHyper: eip=%VGv esp=%VGv\n", CPUMGetHyperEIP(pVM), CPUMGetHyperESP(pVM)));
+    Log(("VMMR3ResumeHyper: eip=%VRv esp=%VRv\n", CPUMGetHyperEIP(pVM), CPUMGetHyperESP(pVM)));
 
     /*

trunk/src/VBox/VMM/VMMGC/VMMGC.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * VMM - Guest Context.
+ * VMM - Raw-mode Context.
  */
 
@@ -68 +68 @@
     {
         /*
-         * Init GC modules.
+         * Init RC modules.
          */
         case VMMGC_DO_VMMGC_INIT:
@@ -87 +87 @@
             va_end(va);
 
-            int rc = RTGCInit(u64TS);
+            int rc = RTRCInit(u64TS);
             Log(("VMMGCEntry: VMMGC_DO_VMMGC_INIT - uArg=%u (svn revision) u64TS=%RX64; rc=%Rrc\n", uArg, u64TS, rc));
             AssertRCReturn(rc, rc);
@@ -162 +162 @@
 
 /**
- * Internal GC logger worker: Flush logger.
+ * Internal RC logger worker: Flush logger.
  *
  * @returns VINF_SUCCESS.

trunk/src/VBox/VMM/VMMGC/VMMGC.def

@@ -1 +1 @@
 ;; @file
-; VMM Guest Context DLL - Definition file.
+; VMM Raw-mode Context DLL - Definition file.
 
 ;

trunk/src/VBox/VMM/VMMGC/VMMGC.mac

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; VMMGC - Guest Context Assembly Macros.
+; VMMGC - Raw-mode Context Assembly Macros.
 ;
 

trunk/src/VBox/VMM/VMMGC/VMMGC99.asm

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; VMMGC0 - The first object module in the link.
+; VMMGC99 - The last object module in the link.
 ;
 

trunk/src/VBox/VMM/VMMGC/VMMGCA.asm

@@ -1 +1 @@
 ; $Id$
 ;; @file
-; VMMGC - Guest Context Virtual Machine Monitor assembly routines.
+; VMMGC - Raw-mode Context Virtual Machine Monitor assembly routines.
 ;
 

trunk/src/VBox/VMM/VMMGC/VMMGCBuiltin.def

@@ +1 @@
+; $Id$
 ;; @file
+; VMM Raw-mode Context Builtin DLL - Definition file for generating import library.
 ;
-; VMM Guest Context Builtin DLL - Definition file for generating import library.
 
 ; Copyright (C) 2006-2007 Sun Microsystems, Inc.

trunk/src/VBox/VMM/VMMGuruMeditation.cpp

@@ -231 +231 @@
         {
             bool fIsRing0 = rcErr == VERR_VMM_RING0_ASSERTION;
-            const char *pszMsg1 = fIsRing0 ? pVM->vmm.s.szRing0AssertMsg1 : VMMR3GetGCAssertMsg1(pVM);
+            const char *pszMsg1 = VMMR3GetRZAssertMsg1(pVM);
             while (pszMsg1 && *pszMsg1 == '\n')
                 pszMsg1++;
-            const char *pszMsg2 = fIsRing0 ? pVM->vmm.s.szRing0AssertMsg2 : VMMR3GetGCAssertMsg2(pVM);
+            const char *pszMsg2 = VMMR3GetRZAssertMsg2(pVM);
             while (pszMsg2 && *pszMsg2 == '\n')
                 pszMsg2++;

trunk/src/VBox/VMM/VMMInternal.h

@@ -88 +88 @@
 
 /**
- * The ring-0 logger instance.
- * We need to be able to find the VM handle from the logger instance.
+ * The ring-0 logger instance wrapper.
+ *
+ * We need to be able to find the VM handle from the logger instance, so we wrap
+ * it in this structure.
  */
 typedef struct VMMR0LOGGER
@@ -102 +104 @@
     uint32_t                    u32Alignment;
 #endif
-    /** The ring-0 logger instance. This extends beyond the size.*/
+    /** The ring-0 logger instance. This extends beyond the size.  */
     RTLOGGER                    Logger;
-} VMMR0LOGGER, *PVMMR0LOGGER;
+} VMMR0LOGGER;
+/** Pointer to a ring-0 logger instance wrapper. */
+typedef VMMR0LOGGER *PVMMR0LOGGER;
 
 
@@ -113 +117 @@
 typedef struct VMMR0JMPBUF
 {
-    /** Tranditional jmp_buf stuff
+    /** Traditional jmp_buf stuff
      * @{ */
 #if HC_ARCH_BITS == 32

trunk/src/VBox/VMM/VMMR0/VMMR0.cpp

@@ -19 +19 @@
  * additional information or have any questions.
  */
-
 
 /*******************************************************************************
@@ -450 +449 @@
 }
 #endif /* VBOX_WITH_STATISTICS */
-
 
 
@@ -1058 +1056 @@
 
 
-
 /**
  * Internal R0 logger worker: Flush logger.
@@ -1112 +1109 @@
 
 
-
 /**
  * Jump back to ring-3 if we're the EMT and the longjmp is armed.
@@ -1139 +1135 @@
 #endif
 }
-
 
 
@@ -1211 +1206 @@
 }
 
-

trunk/src/VBox/VMM/VMMSwitcher.cpp

@@ -25 +25 @@
 #define LOG_GROUP LOG_GROUP_VMM
 #include <VBox/vmm.h>
-#include <VBox/vmapi.h>
 #include <VBox/pgm.h>
-#include <VBox/cfgm.h>
-#include <VBox/pdmqueue.h>
-#include <VBox/pdmapi.h>
-#include <VBox/cpum.h>
+#include <VBox/selm.h>
 #include <VBox/mm.h>
-#include <VBox/iom.h>
-#include <VBox/trpm.h>
-#include <VBox/selm.h>
-#include <VBox/em.h>
 #include <VBox/sup.h>
-#include <VBox/dbgf.h>
-#include <VBox/csam.h>
-#include <VBox/patm.h>
-#include <VBox/rem.h>
-#include <VBox/ssm.h>
-#include <VBox/tm.h>
 #include "VMMInternal.h"
 #include "VMMSwitcher/VMMSwitcher.h"
 #include <VBox/vm.h>
+#include <VBox/dis.h>
 
 #include <VBox/err.h>
 #include <VBox/param.h>
-#include <VBox/version.h>
-#include <VBox/x86.h>
-#include <VBox/hwaccm.h>
 #include <iprt/assert.h>
 #include <iprt/alloc.h>
 #include <iprt/asm.h>
-#include <iprt/time.h>
-#include <iprt/stream.h>
 #include <iprt/string.h>
-#include <iprt/stdarg.h>
 #include <iprt/ctype.h>
-
-
-
-/** The saved state version. */
-#define VMM_SAVED_STATE_VERSION     3
 
 

trunk/src/VBox/VMM/VMMSwitcher/VMMSwitcher.mac

@@ -20 +20 @@
 ;
 
-%ifndef __VMMSwitcher_mac__
-%define __VMMSwitcher_mac__
+%ifndef ___VMMSwitcher_mac
+%define ___VMMSwitcher_mac
 
 %include "iprt/asmdefs.mac"
@@ -140 +140 @@
 %endif
 
-%endif ; !__VMMSwitcher_mac__
+%endif ; !___VMMSwitcher_mac
 

trunk/src/VBox/VMM/VMMTests.cpp

@@ -56 +56 @@
 static int vmmR3DoGCTest(PVM pVM, VMMGCOPERATION enmTestcase, unsigned uVariation)
 {
-    RTGCPTR32 GCPtrEP;
-    int rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
+    RTRCPTR RCPtrEP;
+    int rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     if (VBOX_FAILURE(rc))
         return rc;
@@ -67 +67 @@
     CPUMPushHyper(pVM, enmTestcase);
     CPUMPushHyper(pVM, pVM->pVMGC);
-    CPUMPushHyper(pVM, 3 * sizeof(RTGCPTR32));  /* stack frame size */
-    CPUMPushHyper(pVM, GCPtrEP);                /* what to call */
+    CPUMPushHyper(pVM, 3 * sizeof(RTRCPTR));    /* stack frame size */
+    CPUMPushHyper(pVM, RCPtrEP);                /* what to call */
     CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnCallTrampolineRC);
     rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN);
@@ -93 +93 @@
     RTPrintf("VMM: testing 0%x / %d - %s\n", u8Trap, uVariation, pszDesc);
 
-    RTGCPTR32 GCPtrEP;
-    int rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
+    RTRCPTR RCPtrEP;
+    int rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     if (VBOX_FAILURE(rc))
         return rc;
@@ -104 +104 @@
     CPUMPushHyper(pVM, u8Trap + VMMGC_DO_TESTCASE_TRAP_FIRST);
     CPUMPushHyper(pVM, pVM->pVMGC);
-    CPUMPushHyper(pVM, 3 * sizeof(RTGCPTR32));  /* stack frame size */
-    CPUMPushHyper(pVM, GCPtrEP);                /* what to call */
+    CPUMPushHyper(pVM, 3 * sizeof(RTRCPTR));    /* stack frame size */
+    CPUMPushHyper(pVM, RCPtrEP);                /* what to call */
     CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnCallTrampolineRC);
     rc = SUPCallVMMR0Fast(pVM->pVMR0, VMMR0_DO_RAW_RUN);
@@ -128 +128 @@
     else if (pszFaultEIP)
     {
-        RTGCPTR32 GCPtrFault;
-        int rc2 = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, pszFaultEIP, &GCPtrFault);
+        RTRCPTR RCPtrFault;
+        int rc2 = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, pszFaultEIP, &RCPtrFault);
         if (VBOX_FAILURE(rc2))
             RTPrintf("VMM: FAILURE - Failed to resolve symbol '%s', %Vrc!\n", pszFaultEIP, rc);
-        else if (GCPtrFault != CPUMGetHyperEIP(pVM))
-        {
-            RTPrintf("VMM: FAILURE - EIP=%VGv expected %VGv (%s)\n", CPUMGetHyperEIP(pVM), GCPtrFault, pszFaultEIP);
+        else if (RCPtrFault != CPUMGetHyperEIP(pVM))
+        {
+            RTPrintf("VMM: FAILURE - EIP=%VGv expected %VGv (%s)\n", CPUMGetHyperEIP(pVM), RCPtrFault, pszFaultEIP);
             fDump = true;
         }
@@ -183 +183 @@
      * Setup stack for calling VMMGCEntry().
      */
-    RTGCPTR32 GCPtrEP;
-    int rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
+    RTRCPTR RCPtrEP;
+    int rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     if (VBOX_SUCCESS(rc))
     {
-        RTPrintf("VMM: VMMGCEntry=%VGv\n", GCPtrEP);
+        RTPrintf("VMM: VMMGCEntry=%VGv\n", RCPtrEP);
 
         /*
@@ -245 +245 @@
         /* a bad one at VMMGCEntry */
         RTPrintf("VMM: testing hardware bp at VMMGCEntry (hit)\n");
-        DBGFR3AddrFromFlat(pVM, &Addr, GCPtrEP);
+        DBGFR3AddrFromFlat(pVM, &Addr, RCPtrEP);
         RTUINT iBp1;
         rc = DBGFR3BpSetReg(pVM, &Addr, 0,  ~(uint64_t)0, X86_DR7_RW_EO, 1, &iBp1);
@@ -338 +338 @@
         CPUMPushHyper(pVM, VMMGC_DO_TESTCASE_HYPER_INTERRUPT);
         CPUMPushHyper(pVM, pVM->pVMGC);
-        CPUMPushHyper(pVM, 3 * sizeof(RTGCPTR32));  /* stack frame size */
-        CPUMPushHyper(pVM, GCPtrEP);                /* what to call */
+        CPUMPushHyper(pVM, 3 * sizeof(RTRCPTR));    /* stack frame size */
+        CPUMPushHyper(pVM, RCPtrEP);                /* what to call */
         CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnCallTrampolineRC);
         Log(("trampoline=%x\n", pVM->vmm.s.pfnCallTrampolineRC));
@@ -400 +400 @@
             CPUMPushHyper(pVM, VMMGC_DO_TESTCASE_NOP);
             CPUMPushHyper(pVM, pVM->pVMGC);
-            CPUMPushHyper(pVM, 3 * sizeof(RTGCPTR32));    /* stack frame size */
-            CPUMPushHyper(pVM, GCPtrEP);                /* what to call */
+            CPUMPushHyper(pVM, 3 * sizeof(RTRCPTR));    /* stack frame size */
+            CPUMPushHyper(pVM, RCPtrEP);                /* what to call */
             CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnCallTrampolineRC);
 
@@ -494 +494 @@
      * Setup stack for calling VMMGCEntry().
      */
-    RTGCPTR32 GCPtrEP;
-    rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &GCPtrEP);
+    RTRCPTR RCPtrEP;
+    rc = PDMR3LdrGetSymbolRC(pVM, VMMGC_MAIN_MODULE_NAME, "VMMGCEntry", &RCPtrEP);
     if (VBOX_SUCCESS(rc))
     {
-        RTPrintf("VMM: VMMGCEntry=%VGv\n", GCPtrEP);
+        RTPrintf("VMM: VMMGCEntry=%VGv\n", RCPtrEP);
 
         CPUMQueryHyperCtxPtr(pVM, &pHyperCtx);
@@ -527 +527 @@
             CPUMPushHyper(pVM, VMMGC_DO_TESTCASE_HWACCM_NOP);
             CPUMPushHyper(pVM, pVM->pVMGC);
-            CPUMPushHyper(pVM, 3 * sizeof(RTGCPTR32));    /* stack frame size */
-            CPUMPushHyper(pVM, GCPtrEP);                /* what to call */
+            CPUMPushHyper(pVM, 3 * sizeof(RTRCPTR));    /* stack frame size */
+            CPUMPushHyper(pVM, RCPtrEP);                /* what to call */
             CPUMSetHyperEIP(pVM, pVM->vmm.s.pfnCallTrampolineRC);
 

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);
     }

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

@@ -75 +75 @@
 typedef struct TSTMICRO
 {
-    /** The GC address of this structure. */
-    RTGCPTR     GCPtr;
+    /** The RC address of this structure. */
+    RTRCPTR     RCPtr;
     /** Just for proper alignment. */
-    RTGCPTR     GCPtrStack;
+    RTRCPTR     RCPtrStack;
 
     /** TSC sampled right before leaving R0. */

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

@@ -25 +25 @@
 
 struc TSTMICRO
-    .GCPtr                   resd 1
-    .GCPtrStack              resd 1
+    .RCPtr                   resd 1
+    .RCPtrStack              resd 1
     .u64TSCR0Start           resq 1
     .u64TSCRxStart           resq 1

trunk/src/VBox/VMM/testcase/tstMicroGCA.asm

@@ -303 +303 @@
     mov     ds, eax
     push    dword 01069h                ; ss
-    push    dword [ebx + TSTMICRO.GCPtrStack] ; esp
+    push    dword [ebx + TSTMICRO.RCPtrStack] ; esp
     push    dword 0000h                 ; eflags
     push    dword 01061h                ; cs
@@ -343 +343 @@
     mov     ds, eax
     push    0206ah                      ; ss
-    push    dword [ebx + TSTMICRO.GCPtrStack] ; esp
+    push    dword [ebx + TSTMICRO.RCPtrStack] ; esp
     push    dword 0000h                 ; eflags
     push    02062h                      ; cs
@@ -383 +383 @@
     mov     ds, eax
     push    0306bh                      ; ss
-    push    dword [ebx + TSTMICRO.GCPtrStack] ; esp
+    push    dword [ebx + TSTMICRO.RCPtrStack] ; esp
     push    dword 0000h                 ; eflags
     push    03063h                      ; cs