X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgencgc-internal.h;h=b8beae0023c428de945b92cb89bef885795807c1;hb=40588bcc85ce25d24d59becf96576cc7c89a3c95;hp=5da7981129e76154eb4f71a5e0c8030a8fa1d949;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git

diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h
index 5da7981..b8beae0 100644
--- a/src/runtime/gencgc-internal.h
+++ b/src/runtime/gencgc-internal.h
@@ -19,21 +19,39 @@
 #ifndef _GENCGC_INTERNAL_H_
 #define _GENCGC_INTERNAL_H_
 
+#include <limits.h>
+#include "gc.h"
 #include "gencgc-alloc-region.h"
 #include "genesis/code.h"
 
-/* Size of a page, in bytes. FIXME: needs to be conditionalized per
- * architecture, preferably by someone with a clue as to what page
- * sizes are on archs other than x86 and PPC - Patrik */
-#define PAGE_BYTES 4096
-
+#define PAGE_BYTES GENCGC_PAGE_SIZE
 
 void gc_free_heap(void);
-inline long find_page_index(void *);
-inline void *page_address(long);
+inline page_index_t find_page_index(void *);
+inline void *page_address(page_index_t);
 int gencgc_handle_wp_violation(void *);
 
 struct page {
+    /* The name of this field is not well-chosen for its actual use.
+     * This is the offset from the start of the page to the start
+     * of the alloc_region which contains/contained it.  It's negative or 0
+     */
+    long  first_object_offset;
+
+    /* the number of bytes of this page that are used. This may be less
+     * than the actual bytes used for pages within the current
+     * allocation regions. It should be 0 for all unallocated pages (not
+     * hard to achieve).
+     *
+     * Currently declared as an unsigned short to make the struct size
+     * smaller. This means that GENCGC-PAGE-SIZE is constrained to fit
+     * inside a short.
+     */
+    unsigned short bytes_used;
+
+#if USHRT_MAX < PAGE_BYTES
+#error "PAGE_BYTES too large"
+#endif
 
     unsigned
         /* This is set when the page is write-protected. This should
@@ -57,54 +75,45 @@ struct page {
         /* If the page is part of a large object then this flag is
          * set. No other objects should be allocated to these pages.
          * This is only valid when the page is allocated. */
-        large_object :1;
+        large_object :1,
+        /* True if the page is known to contain only zeroes. */
+        need_to_zero :1;
 
     /* the generation that this page belongs to. This should be valid
      * for all pages that may have objects allocated, even current
      * allocation region pages - this allows the space of an object to
      * be easily determined. */
-    int  gen;
-
-    /* the number of bytes of this page that are used. This may be less
-     * than the actual bytes used for pages within the current
-     * allocation regions. It should be 0 for all unallocated pages (not
-     * hard to achieve). */
-    long  bytes_used;
-
-    /* The name of this field is not well-chosen for its actual use.
-     * This is the offset from the start of the page to the start
-     * of the alloc_region which contains/contained it.  It's negative or 0
-     */
-    long  first_object_offset;
+    generation_index_t gen;
 };
 
+
 /* values for the page.allocated field */
 
 
 /* the number of pages needed for the dynamic space - rounding up */
-#define NUM_PAGES ((DYNAMIC_SPACE_SIZE+PAGE_BYTES-1)/PAGE_BYTES)
+#define NUM_PAGES ((page_index_t) ((DYNAMIC_SPACE_SIZE+PAGE_BYTES-1)/PAGE_BYTES))
 
 extern struct page page_table[NUM_PAGES];
 
 
 /* forward declarations */
 
-void sniff_code_object(struct code *code, unsigned displacement);
+void sniff_code_object(struct code *code, unsigned long displacement);
 void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code);
 
-long  update_x86_dynamic_space_free_pointer(void);
-void  gc_alloc_update_page_tables(int unboxed,
-                                  struct alloc_region *alloc_region);
+long update_dynamic_space_free_pointer(void);
+void gc_alloc_update_page_tables(int unboxed,
+                                 struct alloc_region *alloc_region);
 void gc_alloc_update_all_page_tables(void);
 void gc_set_region_empty(struct alloc_region *region);
 
 /*
  * predicates
  */
-static inline int
-space_matches_p(lispobj obj, long space)
+static inline boolean
+space_matches_p(lispobj obj, generation_index_t space)
 {
-    long page_index=(void*)obj - (void *)DYNAMIC_SPACE_START;
+    page_index_t page_index=(void*)obj - (void *)DYNAMIC_SPACE_START;
     return ((page_index >= 0)
             && ((page_index =
                  ((unsigned long)page_index)/PAGE_BYTES) < NUM_PAGES)
@@ -123,6 +132,7 @@ new_space_p(lispobj obj)
     return space_matches_p(obj,new_space);
 }
 
-
+extern page_index_t last_free_page;
+extern boolean gencgc_partial_pickup;
 
 #endif