Revert "Avoid page_set_flags() assert in qemu-user host page protection code"

This reverts commit 01c0bef1625d8e5d6d5c6abaf413214d667615ad.

(breaks build on 32-bit hosts)

diff --git a/exec.c b/exec.c
index a6d3bad7472c294587dd70d761f36f5d0b194122..76163aa87f43034d771178be909a1fb5b48a5f0d 100644 (file)
--- a/exec.c
+++ b/exec.c
@@ -307,14 +307,13 @@ static void page_init(void)
 
                     if (h2g_valid(endaddr)) {
                         endaddr = h2g(endaddr);
+                        page_set_flags(startaddr, endaddr, PAGE_RESERVED);
                     } else {
 #if TARGET_ABI_BITS <= L1_MAP_ADDR_SPACE_BITS
                         endaddr = ~0ul;
-#else
-                        endaddr = ((abi_ulong)1 << L1_MAP_ADDR_SPACE_BITS) - 1;
+                        page_set_flags(startaddr, endaddr, PAGE_RESERVED);
 #endif
                     }
-                    page_set_flags(startaddr, endaddr, PAGE_RESERVED);
                 }
             }
             free(freep);
@@ -325,7 +324,11 @@ static void page_init(void)
 
         last_brk = (unsigned long)sbrk(0);
 
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
+        f = fopen("/compat/linux/proc/self/maps", "r");
+#else
         f = fopen("/proc/self/maps", "r");
+#endif
         if (f) {
             mmap_lock();
 
@@ -341,11 +344,7 @@ static void page_init(void)
                     if (h2g_valid(endaddr)) {
                         endaddr = h2g(endaddr);
                     } else {
-#if TARGET_ABI_BITS <= L1_MAP_ADDR_SPACE_BITS
                         endaddr = ~0ul;
-#else
-                        endaddr = ((abi_ulong)1 << L1_MAP_ADDR_SPACE_BITS) - 1;
-#endif
                     }
                     page_set_flags(startaddr, endaddr, PAGE_RESERVED);
                 }