vbox的更動 15761 路徑 trunk/src/recompiler_new

時間撮記:

2008-12-25 下午09:07:53 (16 年 以前)

作者:

vboxsync

訊息:

REM: implemented fully working VA in TLB, enabled by default, cleanups

位置:

trunk/src/recompiler_new

檔案:

• Makefile.kmk (修改) (4 筆差異)
• VBoxRecompiler.c (修改) (2 筆差異)
• exec.c (修改) (4 筆差異)
• tcg/x86_64/tcg-target.c (修改) (1 筆差異)

trunk/src/recompiler_new/Makefile.kmk

@@ -107 +107 @@
 endif # !win
 $(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.
@@ -117 +117 @@
 endif
 
-$(REM_MOD)_INCS            = \
-        Sun \
-        target-i386 \
-        tcg \
-        fpu \
-        $(PATH_$(REM_MOD)) \
-        $(PATH_ROOT)/src/VBox/VMM \
+$(REM_MOD)_INCS            =            \
+        Sun                             \
+        target-i386                     \
+        tcg                             \
+        fpu                             \
+        $(PATH_$(REM_MOD))              \
+        $(PATH_ROOT)/src/VBox/VMM       \
         .
 
-$(REM_MOD)_SOURCES         = \
-        VBoxRecompiler.c \
-        cpu-exec.c \
-        exec.c \
-        translate-all.c \
-        host-utils.c \
-        cutils.c \
-        tcg/tcg.c \
-        tcg/tcg-dyngen.c \
-        tcg/tcg-runtime.c \
-        fpu/softfloat-native.c \
-        target-i386/op_helper.c \
-        target-i386/helper.c \
+$(REM_MOD)_SOURCES         =            \
+        VBoxRecompiler.c                \
+        cpu-exec.c                      \
+        exec.c                          \
+        translate-all.c                 \
+        host-utils.c                    \
+        cutils.c                        \
+        tcg/tcg.c                       \
+        tcg/tcg-dyngen.c                \
+        tcg/tcg-runtime.c               \
+        fpu/softfloat-native.c          \
+        target-i386/op_helper.c         \
+        target-i386/helper.c            \
         target-i386/translate.c
 
@@ -213 +213 @@
 
 ifdef VBOX_USE_REM64
-## @todo Note to self: One should be the default config (VBoxREM) with a NAME, the 64 bit varian should be done like here.
  DLLS += VBoxREM32
  VBoxREM32_EXTENDS    = VBoxREM
@@ -287 +286 @@
 testmath_DEFS          += VBOX_WITH_NEW_RECOMPILER
 testmath_SOURCES        = Sun/testmath.c
-#testmath_SOURCES        += $(PATH_LIB)/RuntimeR3NoCRTGCC$(VBOX_SUFF_LIB)
 
 

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -1298 +1298 @@
 {
     void *pv;
-    int rc = PGMR3PhysTlbGCPhys2Ptr(env1->pVM, physAddr, true /*fWritable*/, &pv);
+    int rc;
+
+    /* Address must be aligned enough to fiddle with lower bits */
+    Assert((physAddr & 0x3) == 0);
+
+    rc = PGMR3PhysTlbGCPhys2Ptr(env1->pVM, physAddr, true /*fWritable*/, &pv);
     Assert(   rc == VINF_SUCCESS
            || rc == VINF_PGM_PHYS_TLB_CATCH_WRITE
@@ -1308 +1313 @@
         return (void *)((uintptr_t)pv | 2);
     return pv;
+    //return (void *)((uintptr_t)pv | 2);
 }
 

trunk/src/recompiler_new/exec.c

@@ -2153 +2153 @@
     int i;
     target_phys_addr_t iotlb;
+#if defined(VBOX) && !defined(REM_PHYS_ADDR_IN_TLB)
+    int read_mods = 0, write_mods = 0, code_mods = 0;
+#endif
 
     p = phys_page_find(paddr >> TARGET_PAGE_BITS);
@@ -2182 +2185 @@
                                                !!(prot & PAGE_WRITE));
 #endif
+
     if ((pd & ~TARGET_PAGE_MASK) <= IO_MEM_ROM) {
         /* Normal RAM.  */
@@ -2201 +2205 @@
     code_address = address;
 
-#ifdef VBOX
-#  if !defined(REM_PHYS_ADDR_IN_TLB)
-    if (addend & 0x2)
+#if defined(VBOX) && !defined(REM_PHYS_ADDR_IN_TLB)
+    if (addend & 0x3)
     {
-        /* catch write */
+        if (addend & 0x2)
+        {
+            /* catch write */
+            if ((pd & ~TARGET_PAGE_MASK) <= IO_MEM_ROM)
+                write_mods |= TLB_MMIO;
+        }
+        else if (addend & 0x1)
+        {
+            /* catch all */
+            if ((pd & ~TARGET_PAGE_MASK) <= IO_MEM_ROM)
+            {
+                read_mods |= TLB_MMIO;
+                write_mods |= TLB_MMIO;
+                code_mods |= TLB_MMIO;
+            }
+        }
+        if ((iotlb & ~TARGET_PAGE_MASK) == 0)
+            iotlb = env->pVM->rem.s.iHandlerMemType  + paddr;
         addend &= ~(target_ulong)0x3;
-        if ((pd & ~TARGET_PAGE_MASK) <= IO_MEM_ROM)
-        {
-/** @todo improve this, it's only avoid code reads right now! */
-            address |= TLB_MMIO;
-            iotlb = env->pVM->rem.s.iHandlerMemType + paddr;
-        }
-    }
-    else if (addend & 0x1)
-    {
-        /* catch all */
-        addend &= ~(target_ulong)0x3;
-        if ((pd & ~TARGET_PAGE_MASK) <= IO_MEM_ROM)
-        {
-            address |= TLB_MMIO;
-            code_address |= TLB_MMIO;
-            iotlb = env->pVM->rem.s.iHandlerMemType + paddr;
-        }
-    }
-#  endif
+    }
 #endif
 
@@ -2268 +2270 @@
         te->addr_write = -1;
     }
+
+#if defined(VBOX) && !defined(REM_PHYS_ADDR_IN_TLB)
+    if (prot & PAGE_READ)
+        te->addr_read |= read_mods;
+    if (prot & PAGE_EXEC)
+        te->addr_code |= code_mods;
+    if (prot & PAGE_WRITE)
+        te->addr_write |= write_mods;
+#endif
+
 #ifdef VBOX
     /* inform raw mode about TLB page change */

trunk/src/recompiler_new/tcg/x86_64/tcg-target.c

@@ -601 +601 @@
 #if defined(VBOX) && defined(REM_PHYS_ADDR_IN_TLB)
 static void *vbox_ld_helpers[] = {
-    remR3PhysReadU8,
-    remR3PhysReadU16,
-    remR3PhysReadU32,
-    remR3PhysReadU64,
-    remR3PhysReadS8,
-    remR3PhysReadS16,
-    remR3PhysReadS32,
-    remR3PhysReadS64,
+    __ldub_vbox_phys,
+    __lduw_vbox_phys,
+    __ldul_vbox_phys,
+    __ldq_vbox_phys,
+    __ldb_vbox_phys,
+    __ldw_vbox_phys,
+    __ldl_vbox_phys,
+    __ldq_vbox_phys,
 };
 
 static void *vbox_st_helpers[] = {
-    remR3PhysWriteU8,
-    remR3PhysWriteU16,
-    remR3PhysWriteU32,
-    remR3PhysWriteU64
+    __stb_vbox_phys,
+    __stw_vbox_phys,
+    __stl_vbox_phys,
+    __stq_vbox_phys
 };