Changeset 18598 in vbox for trunk/src/recompiler_new

Timestamp:

Apr 1, 2009 2:38:44 PM (16 years ago)

Author:

vboxsync

Message:

REM: Spelled out the level 0 map in phys_page_find_alloc to avoid confusion. (The original source would add another level 1 map if TARGET_PHYS_ADDR_SPACE_BITS > 32.) Made the L0 a static array like l0_map.

File:

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

trunk/src/recompiler_new/exec.c

@@ -185 +185 @@
 #endif
 #ifdef VBOX
-/* Note: Not for PhysPageDesc, only to speed up page_flush_tb. */
 #define L0_BITS (TARGET_PHYS_ADDR_SPACE_BITS - 32)
 #endif
@@ -205 +204 @@
 #ifndef VBOX
 static PageDesc *l1_map[L1_SIZE];
-#else
-static l0_map_max_used = 0;
+static PhysPageDesc **l1_phys_map;
+#else
+static unsigned l0_map_max_used = 0;
 static PageDesc **l0_map[L0_SIZE];
-#endif
-static PhysPageDesc **l1_phys_map;
+static void **l0_phys_map[L0_SIZE];
+#endif
 
 #if !defined(CONFIG_USER_ONLY)
@@ -320 +320 @@
         qemu_host_page_bits++;
     qemu_host_page_mask = ~(qemu_host_page_size - 1);
+#ifndef VBOX
     l1_phys_map = qemu_vmalloc(L1_SIZE * sizeof(void *));
     memset(l1_phys_map, 0, L1_SIZE * sizeof(void *));
+#endif
 #ifdef VBOX
     /* We use other means to set reserved bit on our pages */
@@ -446 +448 @@
     PhysPageDesc *pd;
 
+#ifndef VBOX
     p = (void **)l1_phys_map;
 #if TARGET_PHYS_ADDR_SPACE_BITS > 32
@@ -463 +466 @@
     }
 #endif
+#else  /* VBOX */
+    /* level 0 lookup and lazy allocation. */
+    if (RT_UNLIKELY(index >= (target_ulong)L2_SIZE * L1_SIZE * L0_SIZE))
+        return NULL;
+    p = l0_phys_map[index >> (L1_BITS + L2_BITS)];
+    if (RT_UNLIKELY(!p)) {
+        if (!alloc)
+            return NULL;
+        p = qemu_vmalloc(sizeof(PhysPageDesc **) * L0_SIZE);
+        memset(p, 0, sizeof(PhysPageDesc **) * L0_SIZE);
+        l0_phys_map[index >> (L1_BITS + L2_BITS)] = (PhysPageDesc **)p;
+    }
+
+    /* level 1 lookup and lazy allocation. */
+#endif /* VBOX */
     lp = p + ((index >> L2_BITS) & (L1_SIZE - 1));
     pd = *lp;