Changeset 14969 in vbox for trunk/src/recompiler_new

Timestamp:

Dec 4, 2008 10:57:17 AM (16 years ago)

Author:

vboxsync

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

40333

Message:

VMM support for completing VA in TLB (not much tested)

Location:

trunk/src/recompiler_new

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxREMWrapper.cpp (modified) (3 diffs)
• VBoxRecompiler.c (modified) (2 diffs)
• cpu-all.h (modified) (1 diff)
• exec-all.h (modified) (1 diff)
• exec.c (modified) (3 diffs)

trunk/src/recompiler_new/Makefile.kmk

@@ -70 +70 @@
 #
 $(REM_MOD)_DEFS             = IN_REM_R3 REM_INCLUDE_CPU_H
-$(REM_MOD)_DEFS            += REM_PHYS_ADDR_IN_TLB
+#$(REM_MOD)_DEFS            += REM_PHYS_ADDR_IN_TLB
 $(REM_MOD)_DEFS            += VBOX_WITH_NEW_RECOMPILER
 #$(REM_MOD)_DEFS           += DEBUG_ALL_LOGGING DEBUG_DISAS DEBUG_PCALL DEBUG_EXEC DEBUG_FLUSH DEBUG_IOPORT DEBUG_SIGNAL DEBUG_TLB_CHECK DEBUG_TB_INVALIDATE DEBUG_TLB  # Enables huge amounts of debug logging.

trunk/src/recompiler_new/VBoxREMWrapper.cpp

@@ -718 +718 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(PRTR3PTR), NULL }
 };
+static const REMPARMDESC g_aArgsPGMPhysGCPhys2R3PtrEx[] = 
+{
+    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
+    { REMPARMDESC_FLAGS_GCPHYS,     sizeof(RTGCPHYS), NULL },
+    { REMPARMDESC_FLAGS_GCPTR,      sizeof(RTGCPHYS), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(uint32_t), NULL },
+    { REMPARMDESC_FLAGS_INT,        sizeof(PRTR3PTR), NULL }
+};
 static const REMPARMDESC g_aArgsPGMPhysGCPtr2R3PtrByGstCR3[] =
 {
@@ -804 +812 @@
     { REMPARMDESC_FLAGS_INT,        sizeof(void*), NULL },
     { REMPARMDESC_FLAGS_INT,        sizeof(PRTGCPHYS), NULL }
-};
-static const REMPARMDESC g_aArgsPGMHandlerIsAddressMonitored[] =
-{
-    { REMPARMDESC_FLAGS_INT,        sizeof(PVM), NULL },
-    { REMPARMDESC_FLAGS_INT,        sizeof(RTHCUINTPTR), NULL }
 };
 static const REMPARMDESC g_aArgsRTMemRealloc[] =
@@ -1149 +1152 @@
     { "PGMR3PhysWriteU64",                      (void *)(uintptr_t)&PGMR3PhysWriteU64,              &g_aArgsPGMR3PhysWriteU64[0],               RT_ELEMENTS(g_aArgsPGMR3PhysWriteU32),                 REMFNDESC_FLAGS_RET_VOID,   0,                  NULL },
     { "PGMR3DbgR3Ptr2GCPhys",                   (void *)(uintptr_t)&PGMR3DbgR3Ptr2GCPhys,              &g_aArgsPGMR3DbgR3Ptr2GCPhys[0],               RT_ELEMENTS(g_aArgsPGMR3DbgR3Ptr2GCPhys),                 REMFNDESC_FLAGS_RET_INT,   sizeof(uint64_t),                  NULL },
-    { "PGMHandlerIsAddressMonitored",          (void *)(uintptr_t)&PGMHandlerIsAddressMonitored,              &g_aArgsPGMHandlerIsAddressMonitored[0],               RT_ELEMENTS(g_aArgsPGMHandlerIsAddressMonitored),                 REMFNDESC_FLAGS_RET_INT,   sizeof(bool),                  NULL },
+    { "PGMPhysGCPhys2R3PtrEx",          (void *)(uintptr_t)&PGMPhysGCPhys2R3PtrEx,              &g_aArgsPGMPhysGCPhys2R3PtrEx[0],               RT_ELEMENTS(g_aArgsPGMPhysGCPhys2R3PtrEx),                 REMFNDESC_FLAGS_RET_INT,   sizeof(int),                  NULL },
     { "SSMR3GetGCPtr",                          (void *)(uintptr_t)&SSMR3GetGCPtr,                  &g_aArgsSSMR3GetGCPtr[0],                   RT_ELEMENTS(g_aArgsSSMR3GetGCPtr),                     REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },
     { "SSMR3GetMem",                            (void *)(uintptr_t)&SSMR3GetMem,                    &g_aArgsSSMR3GetMem[0],                     RT_ELEMENTS(g_aArgsSSMR3GetMem),                       REMFNDESC_FLAGS_RET_INT,    sizeof(int),        NULL },

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1390 +1390 @@
 
 #ifndef REM_PHYS_ADDR_IN_TLB
-void* remR3GCPhys2HCVirt(CPUState *env1, target_ulong physAddr)
+void* remR3GCPhys2HCVirt(CPUState *env1, target_ulong physAddr, target_ulong virtAddr)
 {
     void* rv = NULL;
     int rc;
-
-    rc = PGMPhysGCPhys2R3Ptr(env1->pVM, (RTGCPHYS)physAddr, 1, &rv);
+    uint32_t flags = PGMPHYS_TRANSLATION_FLAG_CHECK_PHYS_MONITORED;
+    
+    if (virtAddr != (target_ulong)-1)
+      flags |= PGMPHYS_TRANSLATION_FLAG_CHECK_VIRT_MONITORED;
+
+    rc = PGMPhysGCPhys2R3PtrEx(env1->pVM, (RTGCPHYS)physAddr, (RTGCPTR)virtAddr,
+                               flags, &rv);
+
+    if (rc == VERR_PGM_PHYS_PAGE_RESERVED)
+    {
+      return (void*)-1;
+    }
     Assert (RT_SUCCESS(rc));
 
@@ -1450 +1460 @@
 #endif
 }
-
-#ifndef REM_PHYS_ADDR_IN_TLB
-bool remR3IsMonitored(CPUState *env, RTGCPTR GCPtr)
-{
-     return PGMHandlerIsAddressMonitored(env->pVM, GCPtr);
-}
-#endif
 
 /**

trunk/src/recompiler_new/cpu-all.h

@@ -272 +272 @@
 #ifndef REM_PHYS_ADDR_IN_TLB
 target_ulong remR3HCVirt2GCPhys(CPUState *env1, void *addr);
-void* remR3GCPhys2HCVirt(CPUState *env1, target_ulong physAddr);
+void* remR3GCPhys2HCVirt(CPUState *env1, target_ulong physAddr, target_ulong virtAddr);
 #endif
 

trunk/src/recompiler_new/exec-all.h

@@ -385 +385 @@
 #  if !defined(REM_PHYS_ADDR_IN_TLB)
 target_ulong remR3HCVirt2GCPhys(CPUState *env1, void *addr);
-#if 0
-bool         remR3IsVAMonitored(CPUState *env, RTGCPTR GCPtr);
-bool         remR3IsPAMonitored(CPUState *env, RTGCPHYS GCPhys);
-#else
-bool         remR3IsMonitored(CPUState *env, RTGCPTR GCPtr);
-#endif
 #  endif
 # endif

trunk/src/recompiler_new/exec.c

@@ -2022 +2022 @@
     start1 = start + (unsigned long)phys_ram_base;
 #else
-    start1 = (unsigned long)remR3GCPhys2HCVirt(first_cpu, start);
+    start1 = (unsigned long)remR3GCPhys2HCVirt(first_cpu, start, -1);
 #endif
     for(env = first_cpu; env != NULL; env = env->next_cpu) {
@@ -2171 +2171 @@
     addend = (unsigned long)phys_ram_base + (pd & TARGET_PAGE_MASK);
 #else
-    addend = (unsigned long)remR3GCPhys2HCVirt(env, pd & TARGET_PAGE_MASK);
+    addend = (unsigned long)remR3GCPhys2HCVirt(env, 
+                                               pd & TARGET_PAGE_MASK,
+                                               vaddr & TARGET_PAGE_MASK);
 #endif
     if ((pd & ~TARGET_PAGE_MASK) <= IO_MEM_ROM) {
@@ -2204 +2206 @@
 #ifdef VBOX
 #  if !defined(REM_PHYS_ADDR_IN_TLB)
-    if (remR3IsMonitored(env, vaddr & TARGET_PAGE_MASK))
+    if (addend == (target_phys_addr_t)-1)
     {
          address |= TLB_MMIO;