Changeset 18349 in vbox for trunk/src/recompiler_new

Timestamp:

Mar 26, 2009 7:48:09 PM (16 years ago)

Author:

vboxsync

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

45133

Message:

REM: Corrected L1_BITS (crashed in tb_alloc_page during ubuntu 8.10/64 boot with ~11GBs ).

File:

• trunk/src/recompiler_new/exec.c (modified) (2 diffs)

trunk/src/recompiler_new/exec.c

@@ -182 +182 @@
 #define L1_BITS (TARGET_VIRT_ADDR_SPACE_BITS - L2_BITS - TARGET_PAGE_BITS)
 #else
+# ifdef VBOX /* > 4GB please. */
+#define L1_BITS (TARGET_PHYS_ADDR_SPACE_BITS - L2_BITS - TARGET_PAGE_BITS)
+# else
 #define L1_BITS (32 - L2_BITS - TARGET_PAGE_BITS)
+# endif
 #endif
 
@@ -348 +352 @@
     /* Host memory outside guest VM.  For 32-bit targets we have already
        excluded high addresses.  */
+# ifndef VBOX
     if (index > ((target_ulong)L2_SIZE * L1_SIZE))
         return NULL;
+# else  /* VBOX */
+    AssertMsgReturn(index < (target_ulong)L2_SIZE * L1_SIZE,
+                    ("index=%RGp >= %RGp; L1_SIZE=%#x L2_SIZE=%#x\n",
+                     (RTGCPHYS)index, (RTGCPHYS)L2_SIZE * L1_SIZE, L1_SIZE, L2_SIZE),
+                    NULL);
+# endif /* VBOX */
+
 #endif
     return &l1_map[index >> L2_BITS];