X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgencgc-internal.h;h=9ff5a19c14aef971a0ea88541d131fd26ec372f9;hb=f73c1f391342c797b8daebe4e8c27e5923341b6d;hp=6f75ae143ab4bfcce4bf2ff44e337f03ee3a760a;hpb=9f10bc102adce15a820027777a03e49a7b7623da;p=sbcl.git

diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h
index 6f75ae1..9ff5a19 100644
--- a/src/runtime/gencgc-internal.h
+++ b/src/runtime/gencgc-internal.h
@@ -19,6 +19,15 @@
 #ifndef _GENCGC_INTERNAL_H_
 #define _GENCGC_INTERNAL_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
+
+
 void gc_free_heap(void);
 inline int find_page_index(void *);
 inline void *page_address(int);
@@ -42,7 +51,7 @@ struct page {
          * for boxed objects; 2 for unboxed objects. If the page is
          * free the following slots are invalid (well the bytes_used
          * must be 0). */
-	allocated :2,
+	allocated :3,
 	/* If this page should not be moved during a GC then this flag
          * is set. It's only valid during a GC for allocated pages. */
 	dont_move :1,
@@ -63,9 +72,10 @@ struct page {
      * hard to achieve). */
     int  bytes_used;
 
-    /* It is important to know the offset to the first object in the
-     * page. Currently it's only important to know if an object starts
-     * at the beginning of the page in which case the offset would be 0. */
+    /* 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
+     */
     int  first_object_offset;
 };
 
@@ -73,29 +83,11 @@ struct page {
 
 
 /* the number of pages needed for the dynamic space - rounding up */
-#define NUM_PAGES ((DYNAMIC_SPACE_SIZE+4095)/4096)
+#define NUM_PAGES ((DYNAMIC_SPACE_SIZE+PAGE_BYTES-1)/PAGE_BYTES)
+
 extern struct page page_table[NUM_PAGES];
-
-/* Abstract out the data for an allocation region allowing a single
- * routine to be used for allocation and closing. */
-struct alloc_region {
-
-    /* These two are needed for quick allocation. */
-    void  *free_pointer;
-    void  *end_addr; /* pointer to the byte after the last usable byte */
-
-    /* These are needed when closing the region. */
-    int  first_page;
-    int  last_page;
-    void  *start_addr;
-};
 
-extern struct alloc_region  boxed_region;
-extern struct alloc_region  unboxed_region;
-extern int from_space, new_space;
-extern struct weak_pointer *weak_pointers;
 
-void  gencgc_pickup_dynamic(void);
 
 void sniff_code_object(struct code *code, unsigned displacement);
 void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code);
@@ -111,7 +103,8 @@ space_matches_p(lispobj obj, int space)
 {
     int page_index=(void*)obj - (void *)DYNAMIC_SPACE_START;
     return ((page_index >= 0)
-	    && ((page_index = ((unsigned int)page_index)/4096) < NUM_PAGES)
+	    && ((page_index =
+		 ((unsigned int)page_index)/PAGE_BYTES) < NUM_PAGES)
 	    && (page_table[page_index].gen == space));
 }