1.0.21.5: fix WITH-PACKAGE-ITERATOR error signaling

[sbcl.git] / src / runtime / gencgc-internal.h

diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h
index b8beae0..94e3f09 100644 (file)
--- a/src/runtime/gencgc-internal.h
+++ b/src/runtime/gencgc-internal.h
@@ -24,33 +24,35 @@
 #include "gencgc-alloc-region.h"
 #include "genesis/code.h"
 
-#define PAGE_BYTES GENCGC_PAGE_SIZE
-
 void gc_free_heap(void);
 inline page_index_t find_page_index(void *);
 inline void *page_address(page_index_t);
 int gencgc_handle_wp_violation(void *);
 \f
+
+/* 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
+ * structure layout need to be also made there.
+ *
+ * FIXME: We should probably just define this structure in Lisp, and
+ * output the C version in genesis. -- JES, 2006-12-30.
+ */
 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
+    /* This is the offset from the start of the page to the start of
+     * the alloc_region which contains/contained it.
      */
-    long  first_object_offset;
+    unsigned long region_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).
-     *
-     * 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.
      */
+#if PAGE_BYTES > USHRT_MAX
+    unsigned int bytes_used;
+#else
     unsigned short bytes_used;
-
-#if USHRT_MAX < PAGE_BYTES
-#error "PAGE_BYTES too large"
 #endif
 
     unsigned
@@ -90,10 +92,8 @@ struct page {
 /* values for the page.allocated field */
 
 \f
-/* the number of pages needed for the dynamic space - rounding up */
-#define NUM_PAGES ((page_index_t) ((DYNAMIC_SPACE_SIZE+PAGE_BYTES-1)/PAGE_BYTES))
-
-extern struct page page_table[NUM_PAGES];
+extern page_index_t page_table_pages;
+extern struct page *page_table;
 
 \f
 /* forward declarations */
@@ -110,14 +110,18 @@ void gc_set_region_empty(struct alloc_region *region);
 /*
  * predicates
  */
+
 static inline boolean
 space_matches_p(lispobj obj, generation_index_t space)
 {
-    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)
-            && (page_table[page_index].gen == space));
+    if (obj >= DYNAMIC_SPACE_START) {
+        page_index_t page_index=((pointer_sized_uint_t)obj
+                                 - DYNAMIC_SPACE_START) / PAGE_BYTES;
+        return ((page_index < page_table_pages) &&
+                (page_table[page_index].gen == space));
+    } else {
+        return 0;
+    }
 }
 
 static inline boolean