Changeset 14755 in vbox for trunk/src/recompiler_new

Timestamp:

Nov 28, 2008 2:58:01 AM (16 years ago)

Author:

vboxsync

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

40070

Message:

#1865: Converted 4 PGM*2HC* conversion functions to RTR3PTR.

Location:

trunk/src/recompiler_new

Files:

• VBoxREMWrapper.cpp (modified) (5 diffs)
• VBoxRecompiler.c (modified) (6 diffs)

trunk/src/recompiler_new/VBoxREMWrapper.cpp

@@ -711 +711 @@
     { REMPARMDESC_FLAGS_GCPTR,      sizeof(RTGCPTR), NULL }
 };
-static const REMPARMDESC g_aArgsPGMPhysGCPhys2HCPtr[] =
+static const REMPARMDESC g_aArgsPGMPhysGCPhys2R3Ptr[] =
 {
     { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
     { REMPARMDESC_FLAGS_GCPHYS,     sizeof(RTGCPHYS), NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(RTUINT), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(PRTHCPTR), NULL }
-};
-static const REMPARMDESC g_aArgsPGMPhysGCPtr2HCPtrByGstCR3[] =
+    { REMPARMDESC_FLAGS_INT,        sizeof(PRTR3PTR), NULL }
+};
+static const REMPARMDESC g_aArgsPGMPhysGCPtr2R3PtrByGstCR3[] =
 {
     { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
@@ -724 +724 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(uint64_t), NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(unsigned), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(PRTHCPTR), NULL }
+    { REMPARMDESC_FLAGS_INT,        sizeof(PRTR3PTR), NULL }
 };
 static const REMPARMDESC g_aArgsPGM3PhysGrowRange[] =
@@ -803 +803 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(void*), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(PRTGCPHYS), NULL }   
+    { REMPARMDESC_FLAGS_INT,        sizeof(PRTGCPHYS), NULL }
 };
 static const REMPARMDESC g_aArgsPGMHandlerIsAddressMonitored[] =
@@ -1128 +1128 @@
     { "PGMGstGetPage",                          (void *)(uintptr_t)&PGMGstGetPage,                  &g_aArgsPGMGstGetPage[0],                   RT_ELEMENTS(g_aArgsPGMGstGetPage),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "PGMInvalidatePage",                      (void *)(uintptr_t)&PGMInvalidatePage,              &g_aArgsPGMInvalidatePage[0],               RT_ELEMENTS(g_aArgsPGMInvalidatePage),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
-    { "PGMPhysGCPhys2HCPtr",                    (void *)(uintptr_t)&PGMPhysGCPhys2HCPtr,            &g_aArgsPGMPhysGCPhys2HCPtr[0],             RT_ELEMENTS(g_aArgsPGMPhysGCPhys2HCPtr),               REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
-    { "PGMPhysGCPtr2HCPtrByGstCR3",             (void *)(uintptr_t)&PGMPhysGCPtr2HCPtrByGstCR3,     &g_aArgsPGMPhysGCPtr2HCPtrByGstCR3[0],      RT_ELEMENTS(g_aArgsPGMPhysGCPtr2HCPtrByGstCR3),        REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
+    { "PGMPhysGCPhys2R3Ptr",                    (void *)(uintptr_t)&PGMPhysGCPhys2R3Ptr,            &g_aArgsPGMPhysGCPhys2R3Ptr[0],             RT_ELEMENTS(g_aArgsPGMPhysGCPhys2R3Ptr),               REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
+    { "PGMPhysGCPtr2R3PtrByGstCR3",             (void *)(uintptr_t)&PGMPhysGCPtr2R3PtrByGstCR3,     &g_aArgsPGMPhysGCPtr2R3PtrByGstCR3[0],      RT_ELEMENTS(g_aArgsPGMPhysGCPtr2R3PtrByGstCR3),        REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
 #ifndef VBOX_WITH_NEW_PHYS_CODE
     { "PGM3PhysGrowRange",                      (void *)(uintptr_t)&PGM3PhysGrowRange,              &g_aArgsPGM3PhysGrowRange[0],               RT_ELEMENTS(g_aArgsPGM3PhysGrowRange),                 REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
@@ -1180 +1180 @@
     { "VMR3ReqCall",                            (void *)(uintptr_t)&VMR3ReqCall,                    &g_aArgsVMR3ReqCall[0],                     RT_ELEMENTS(g_aArgsVMR3ReqCall),                       REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "VMR3ReqFree",                            (void *)(uintptr_t)&VMR3ReqFree,                    &g_aArgsVMR3ReqFree[0],                     RT_ELEMENTS(g_aArgsVMR3ReqFree),                       REMFNDESC_FLAGS_RET_INT | REMFNDESC_FLAGS_ELLIPSIS, sizeof(int), NULL },
-    { "VMR3GetVMCPUId",                         (void *)(uintptr_t)&VMR3GetVMCPUId,                 &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },    
+    { "VMR3GetVMCPUId",                         (void *)(uintptr_t)&VMR3GetVMCPUId,                 &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "VMR3GetVMCPUNativeThread",               (void *)(uintptr_t)&VMR3GetVMCPUNativeThread,       &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(void *),     NULL },
 //    { "",                        (void *)(uintptr_t)&,                &g_aArgsVM[0],                              RT_ELEMENTS(g_aArgsVM),                                REMFNDESC_FLAGS_RET_INT,    sizeof(int),   NULL },

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1395 +1395 @@
     int rc;
 
-    rc = PGMPhysGCPhys2HCPtr(env1->pVM, (RTGCPHYS)physAddr, 1, &rv);
+    rc = PGMPhysGCPhys2R3Ptr(env1->pVM, (RTGCPHYS)physAddr, 1, &rv);
     Assert (RT_SUCCESS(rc));
 
@@ -3571 +3571 @@
 
         /* convert eip to physical address. */
-        rc = PGMPhysGCPtr2HCPtrByGstCR3(env->pVM,
+        rc = PGMPhysGCPtr2R3PtrByGstCR3(env->pVM,
                                         GCPtrPC,
                                         env->cr[3],
@@ -3587 +3587 @@
     {
         /* physical address */
-        rc = PGMPhysGCPhys2HCPtr(env->pVM, (RTGCPHYS)GCPtrPC, nrInstructions * 16,
+        rc = PGMPhysGCPhys2R3Ptr(env->pVM, (RTGCPHYS)GCPtrPC, nrInstructions * 16,
                                  (void**)&pvPC);
         if (RT_FAILURE(rc))
@@ -3672 +3672 @@
     {
         /* convert eip to physical address. */
-        int rc = PGMPhysGCPtr2HCPtrByGstCR3(pVM,
+        int rc = PGMPhysGCPtr2R3PtrByGstCR3(pVM,
                                             GCPtrPC,
                                             env->cr[3],
@@ -3689 +3689 @@
 
         /* physical address */
-        int rc = PGMPhysGCPhys2HCPtr(pVM, (RTGCPHYS)GCPtrPC, 16, (void**)&pvPC);
+        int rc = PGMPhysGCPhys2R3Ptr(pVM, (RTGCPHYS)GCPtrPC, 16, (void**)&pvPC);
         if (RT_FAILURE(rc))
             return false;
@@ -4222 +4222 @@
 }
 
-uint64_t cpu_rdmsr(CPUX86State *env, uint32_t msr) 
-{ 
-    return CPUMGetGuestMsr(env->pVM, msr); 
-} 
-
-void cpu_wrmsr(CPUX86State *env, uint32_t msr, uint64_t val) 
-{ 
-    CPUMSetGuestMsr(env->pVM, msr, val); 
-} 
+uint64_t cpu_rdmsr(CPUX86State *env, uint32_t msr)
+{
+    return CPUMGetGuestMsr(env->pVM, msr);
+}
+
+void cpu_wrmsr(CPUX86State *env, uint32_t msr, uint64_t val)
+{
+    CPUMSetGuestMsr(env->pVM, msr, val);
+}
 /* -+- I/O Ports -+- */