X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgencgc-internal.h;h=574b1985569b8fbd490f212f389dcdb36f99b788;hb=f0cb0cf9c0fe1b6fce5d10dbd34a0b7b249c4ae8;hp=84178ad5094518d64993f5dfdfd31e88f33f2c6f;hpb=9effe671fd4baacd924b58a25dac89587d38eb27;p=sbcl.git

diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h
index 84178ad..574b198 100644
--- a/src/runtime/gencgc-internal.h
+++ b/src/runtime/gencgc-internal.h
@@ -25,11 +25,23 @@
 #include "genesis/code.h"
 
 void gc_free_heap(void);
-inline page_index_t find_page_index(void *);
-inline void *page_address(page_index_t);
+extern page_index_t find_page_index(void *);
+extern void *page_address(page_index_t);
 int gencgc_handle_wp_violation(void *);
 
 
+#if GENCGC_CARD_BYTES > USHRT_MAX
+# if GENCGC_CARD_BYTES > UINT_MAX
+#   error "GENCGC_CARD_BYTES unexpectedly large."
+# else
+#   define PAGE_BYTES_FMT "u"
+    typedef unsigned int page_bytes_t;
+# endif
+#else
+# define PAGE_BYTES_FMT "hu"
+  typedef unsigned short page_bytes_t;
+#endif
+
 /* Note that this structure is also used from Lisp-side in
  * src/code/room.lisp, and the Lisp-side structure layout is currently
  * not groveled from C code but hardcoded. Any changes to the
@@ -39,23 +51,23 @@ int gencgc_handle_wp_violation(void *);
  * output the C version in genesis. -- JES, 2006-12-30.
  */
 struct page {
-    /* This is the offset from the start of the page to the start of
-     * the alloc_region which contains/contained it.
+    /* This is the offset from the first byte of some object in memory
+     * prior to and no closer than the start of the page to the start
+     * of the page.  Lower values here are better, 0 is ideal.  This
+     * is useful for determining where to start when scanning forward
+     * through a heap page (either for conservative root validation or
+     * for scavenging).
      */
-    unsigned long region_start_offset;
+    os_vm_size_t scan_start_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).
      */
-#if PAGE_BYTES > USHRT_MAX
-    unsigned int bytes_used;
-#else
-    unsigned short bytes_used;
-#endif
+    page_bytes_t bytes_used;
 
-    unsigned
+    unsigned char
         /* This is set when the page is write-protected. This should
          * always reflect the actual write_protect status of a page.
          * (If the page is written into, we catch the exception, make
@@ -67,10 +79,13 @@ struct page {
          * written during a GC. */
         write_protected_cleared :1,
         /*  000 free
-         *  10? boxed data
-         *  11? boxed code
-         *  01? unboxed data
-         *  ??1 open region
+         *  ?01 boxed data
+         *  ?10 unboxed data
+         *  ?11 code
+         *  1?? open region
+         *
+         * Constants for this field are defined in gc-internal.h, the
+         * xxx_PAGE_FLAG definitions.
          *
          * If the page is free the following slots are invalid, except
          * for the bytes_used which must be zero. */
@@ -101,11 +116,12 @@ extern struct page *page_table;
 
 
 /* forward declarations */
-
-void sniff_code_object(struct code *code, unsigned long displacement);
+#ifdef LISP_FEATURE_X86
+void sniff_code_object(struct code *code, os_vm_size_t displacement);
 void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code);
+#endif
 
-long update_dynamic_space_free_pointer(void);
+sword_t update_dynamic_space_free_pointer(void);
 void gc_alloc_update_page_tables(int page_type_flag, struct alloc_region *alloc_region);
 void gc_alloc_update_all_page_tables(void);
 void gc_set_region_empty(struct alloc_region *region);
@@ -119,7 +135,7 @@ space_matches_p(lispobj obj, generation_index_t space)
 {
     if (obj >= DYNAMIC_SPACE_START) {
         page_index_t page_index=((pointer_sized_uint_t)obj
-                                 - DYNAMIC_SPACE_START) / PAGE_BYTES;
+                                 - DYNAMIC_SPACE_START) / GENCGC_CARD_BYTES;
         return ((page_index < page_table_pages) &&
                 (page_table[page_index].gen == space));
     } else {