ggc-page.c (alloc_page): Round up allocation size to one page.

        * ggc-page.c (alloc_page): Round up allocation size to one page.
        Set e->order on extra pages.

From-SVN: r38990

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e5d71d94b56c2485b987c49316cbfcef3ecd038e..dab14f20414c0538b0aedcd0524ec97a206af275 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-01-13  Richard Henderson  <rth@redhat.com>
+
+       * ggc-page.c (alloc_page): Round up allocation size to one page.
+       Set e->order on extra pages.
+
 2001-01-13  Richard Henderson  <rth@redhat.com>
 
        * genrecog.c (nodes_identical): Expand commentary.

diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index b5c6d57be74784b8b92fca21d33e117717e9b517..fa66aa49937b94052a8d785d1b9e0ff3d5d620e5 100644 (file)
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -517,6 +517,8 @@ alloc_page (order)
   bitmap_size = BITMAP_SIZE (num_objects + 1);
   page_entry_size = sizeof (page_entry) - sizeof (long) + bitmap_size;
   entry_size = num_objects * OBJECT_SIZE (order);
+  if (entry_size < G.pagesize)
+    entry_size = G.pagesize;
 
   entry = NULL;
   page = NULL;
@@ -549,14 +551,15 @@ alloc_page (order)
       struct page_entry *e, *f = G.free_pages;
       int i;
 
-      page = alloc_anon (NULL, entry_size * GGC_QUIRE_SIZE);
+      page = alloc_anon (NULL, G.pagesize * GGC_QUIRE_SIZE);
       /* This loop counts down so that the chain will be in ascending
         memory order.  */
       for (i = GGC_QUIRE_SIZE - 1; i >= 1; i--)
        {
-         e = (struct page_entry *) xcalloc (1, sizeof (struct page_entry));
-         e->bytes = entry_size;
-         e->page = page + i*entry_size;
+         e = (struct page_entry *) xcalloc (1, page_entry_size);
+         e->order = order;
+         e->bytes = G.pagesize;
+         e->page = page + (i << G.lg_pagesize);
          e->next = f;
          f = e;
        }