Changeset 17420 in vbox for trunk

Timestamp:

Mar 5, 2009 7:41:58 PM (16 years ago)

Author:

vboxsync

Message:

REM: fix problem in REM codegen buffer size initialization, leading to very small (1M) code buffer. Now use 8M always.

Location:

trunk/src/recompiler_new

Files:

• cpu-all.h (modified) (1 diff)
• exec.c (modified) (4 diffs)

trunk/src/recompiler_new/cpu-all.h

@@ -1186 +1186 @@
 extern RTGCPHYS phys_ram_size;
 /** This is required for bounds checking the phys_ram_dirty accesses. */
-extern uint32_t phys_ram_dirty_size;
+extern RTGCPHYS phys_ram_dirty_size;
 #endif /* VBOX */
 #if !defined(VBOX)

trunk/src/recompiler_new/exec.c

@@ -138 +138 @@
 /* we have memory ranges (the high PC-BIOS mapping) which
    causes some pages to fall outside the dirty map here. */
-uint32_t phys_ram_dirty_size;
+RTGCPHYS phys_ram_dirty_size;
 #endif /* VBOX */
 #if !defined(VBOX)
@@ -468 +468 @@
 
 #ifdef VBOX
-/** @todo nike: isn't 32M too much ? */
-#endif
+/*
+ * We don't need such huge codegen buffer size, as execute most of the code
+ * in raw or hwacc mode
+ */
+#define DEFAULT_CODE_GEN_BUFFER_SIZE (8 * 1024 * 1024)
+#else
 #define DEFAULT_CODE_GEN_BUFFER_SIZE (32 * 1024 * 1024)
+#endif
 
 #if defined(CONFIG_USER_ONLY)
@@ -491 +496 @@
     code_gen_buffer_size = DEFAULT_CODE_GEN_BUFFER_SIZE;
     map_exec(code_gen_buffer, code_gen_buffer_size);
+#else
+#ifdef VBOX
+    /* We cannot use phys_ram_size here, as it's 0 now,
+     * it only gets initialized once RAM registration callback
+     * (REMR3NotifyPhysRamRegister()) called.
+     */
+    code_gen_buffer_size = DEFAULT_CODE_GEN_BUFFER_SIZE;
 #else
     code_gen_buffer_size = tb_size;
@@ -501 +513 @@
         code_gen_buffer_size = (unsigned long)(phys_ram_size / 4);
 #endif
+
     }
     if (code_gen_buffer_size < MIN_CODE_GEN_BUFFER_SIZE)
         code_gen_buffer_size = MIN_CODE_GEN_BUFFER_SIZE;
+#endif /* VBOX */
+
     /* The code gen buffer location may have constraints depending on
        the host cpu and OS */