Changeset 14277

Timestamp:

11/20/08 19:14:47 (2 months ago)

Author:

vboxsync

Message:

Implemented support for virtual addresses in TLB, improves performance greatly,
but not fully functional as breaks some sync checks, so disabled.
To enable - comment out $(REM_MOD)_DEFS += REM_PHYS_ADDR_IN_TLB
in Makefile.kmk

Files:

• trunk/src/recompiler_new/Sun/config.h (modified) (1 diff)
• trunk/src/recompiler_new/VBoxRecompiler.c (modified) (3 diffs)
• trunk/src/recompiler_new/cpu-all.h (modified) (4 diffs)
• trunk/src/recompiler_new/exec.c (modified) (7 diffs)

trunk/src/recompiler_new/Sun/config.h

@@ -38 +38 @@
-/* Uncomment to see generated code */
-/* #define DEBUG_DISAS */
+
+#if 0 /*defined(RT_ARCH_AMD64) && defined(VBOX_STRICT)*/
+# define VBOX_CHECK_ADDR(ptr) do { if ((uintptr_t)(ptr) >= _4G) __asm__("int3"); } while (0)
+#else
+# define VBOX_CHECK_ADDR(ptr) do { } while (0)
+#endif

trunk/src/recompiler_new/VBoxRecompiler.c

@@ -29 +29 @@
-#include "exec-all.h"
-#include "config.h"
+#include "cpu-all.h"
-
-void cpu_exec_init_all(unsigned long tb_size);
@@ -2785 +2786 @@
-    Assert(!pVM->rem.s.fIgnoreAll);
-    pVM->rem.s.fIgnoreAll = true;
-#ifdef REM_PHYS_ADDR_IN_TLB
-    cpu_register_physical_memory(GCPhys, cb, GCPhys);
-#else
-    cpu_register_physical_memory(GCPhys, cb, pvRam);
-#endif
-
-    Assert(pVM->rem.s.fIgnoreAll);
-    pVM->rem.s.fIgnoreAll = false;
@@ -3087 +3083 @@
-    AssertFatalFailed();
-}
-
-
-/** Validate the physical address passed to the read functions.
- * Useful for finding non-guest-ram reads/writes.  */
-#if 0 //1 /* disable if it becomes bothersome... */
-# define VBOX_CHECK_ADDR(GCPhys) AssertMsg(PGMPhysIsGCPhysValid(cpu_single_env->pVM, (GCPhys)), ("%RGp\n", (GCPhys)))
-#else
-# define VBOX_CHECK_ADDR(GCPhys) do { } while (0)
-#endif
-
-/**

trunk/src/recompiler_new/cpu-all.h

@@ -247 +247 @@
- *   kernel : kernel mode access using soft MMU
- */
+
-#ifdef VBOX
+#ifndef VBOX_WITH_NEW_PHYS_CODE
+void     remR3GrowDynRange(unsigned long physaddr);
+#endif
-
-void     remR3PhysRead(RTGCPHYS SrcGCPhys, void *pvDst, unsigned cb);
@@ -264 +268 @@
-void     remR3PhysWriteU64(RTGCPHYS DstGCPhys, uint64_t val);
-
-VBOX_WITH_NEW_PHYS_CODE
-void     remR3GrowDynRange(unsigned long phys
-
-if 0 /*defined(RT_ARCH_AMD64) && defined(VBOX_STRICT)*/
-
-lse
-
-endif
+REM_PHYS_ADDR_IN_TLB
+target_ulong remR3HCVirt2GCPhys(CPUState *env1, void *
+
+endif
+
+ndif /* VBOX */
+
+if defined(VBOX) && defined(REM_PHYS_ADDR_IN_TLB)
-
-DECLINLINE(int) ldub_p(void *ptr)
@@ -373 +377 @@
-}
-
-VBOX
+(VBOX && REM_PHYS_ADDR_IN_TLB)
-
-static inline int ldub_p(void *ptr)
@@ -909 +913 @@
-#define g2h(x) ((void *)((unsigned long)(x) + GUEST_BASE))
-#define h2g(x) ((target_ulong)(x - GUEST_BASE))
-
-#define saddr(x) g2h(x)
-#define laddr(x) g2h(x)

trunk/src/recompiler_new/exec.c

@@ -2069 +2069 @@
-            tlb_entry->addend - (unsigned long)phys_ram_base;
-#else
-tlb_entry->addr_write & TARGET_PAGE_MASK) + tlb_entry->addend
+void*)((tlb_entry->addr_write & TARGET_PAGE_MASK) + tlb_entry->addend)
-#endif
-        if (!cpu_physical_memory_is_dirty(ram_addr)) {
@@ -2701 +2701 @@
-    unsigned long ram_addr;
-    int dirty_flags;
-&& defined(REM_PHYS_ADDR_IN_TLB)
+
-    ram_addr = addr;
- !defined(VBOX)
+
-    ram_addr = addr - (unsigned long)phys_ram_base;
-#else
-    ram_addr = remR3HCVirt2GCPhys(first_cpu, (void *)addr);
-#endif
-#ifdef VBOX
@@ -2725 +2723 @@
-#endif
-    }
+#if defined(VBOX) && !defined(REM_PHYS_ADDR_IN_TLB)
+    remR3PhysWriteU8(addr, val);
+#else
-    stb_p((uint8_t *)(long)addr, val);
+#endif
-#ifdef USE_KQEMU
-    if (cpu_single_env->kqemu_enabled &&
@@ -2746 +2748 @@
-    unsigned long ram_addr;
-    int dirty_flags;
-&& defined(REM_PHYS_ADDR_IN_TLB)
+
-    ram_addr = addr;
-if !defined(VBOX)
+se
-    ram_addr = addr - (unsigned long)phys_ram_base;
-#else
-    ram_addr = remR3HCVirt2GCPhys(first_cpu, (void *)addr);
-#endif
-#ifdef VBOX
@@ -2770 +2770 @@
-#endif
-    }
+#if defined(VBOX) && !defined(REM_PHYS_ADDR_IN_TLB)
+    remR3PhysWriteU16(addr, val);
+#else
-    stw_p((uint8_t *)(long)addr, val);
+#endif
+
-#ifdef USE_KQEMU
-    if (cpu_single_env->kqemu_enabled &&
@@ -2791 +2796 @@
-    unsigned long ram_addr;
-    int dirty_flags;
-&& defined(REM_PHYS_ADDR_IN_TLB)
+
-    ram_addr = addr;
-if !defined(VBOX)
+se
-    ram_addr = addr - (unsigned long)phys_ram_base;
-#else
-    ram_addr = remR3HCVirt2GCPhys(first_cpu, (void *)addr);
-#endif
-#ifdef VBOX
@@ -2815 +2818 @@
-#endif
-    }
+#if defined(VBOX) && !defined(REM_PHYS_ADDR_IN_TLB)
+    remR3PhysWriteU32(addr, val);
+#else
-    stl_p((uint8_t *)(long)addr, val);
+#endif
-#ifdef USE_KQEMU
-    if (cpu_single_env->kqemu_enabled &&