X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgencgc-internal.h;h=b9966e70ead87154dd7eccc6701f8175eb61a0db;hb=380ea897e2c12a01547f918f73e8a1db0a3a0373;hp=18dc9fbdb1c47316827f4941577f377cf87706f5;hpb=1b64697e4e8a85ff8f11f5c05de71687dc5ad2e2;p=sbcl.git

diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h
index 18dc9fb..b9966e7 100644
--- a/src/runtime/gencgc-internal.h
+++ b/src/runtime/gencgc-internal.h
@@ -19,11 +19,19 @@
 #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);
+inline long find_page_index(void *);
+inline void *page_address(long);
 int gencgc_handle_wp_violation(void *);
-lispobj *search_dynamic_space(lispobj *);
 
 struct page {
 
@@ -42,7 +50,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,
@@ -61,61 +69,45 @@ struct page {
      * than the actual bytes used for pages within the current
      * allocation regions. It should be 0 for all unallocated pages (not
      * hard to achieve). */
-    int  bytes_used;
+    long  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. */
-    int  first_object_offset;
+    /* 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;
 };
 
 /* values for the page.allocated field */
 
 
 /* the number of pages needed for the dynamic space - rounding up */
-#define NUM_PAGES ((DYNAMIC_SPACE_SIZE+4095)/4096)
-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;
+#define NUM_PAGES ((DYNAMIC_SPACE_SIZE+PAGE_BYTES-1)/PAGE_BYTES)
 
-extern void *current_region_free_pointer;
-extern void *current_region_end_addr;
+extern struct page page_table[NUM_PAGES];
 
 
-void  gencgc_pickup_dynamic(void);
+/* forward declarations */
 
 void sniff_code_object(struct code *code, unsigned displacement);
 void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code);
 
-int  update_x86_dynamic_space_free_pointer(void);
+long  update_x86_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, int space)
+space_matches_p(lispobj obj, long space)
 {
-    int page_index=(void*)obj - (void *)DYNAMIC_SPACE_START;
+    long page_index=(void*)obj - (void *)DYNAMIC_SPACE_START;
     return ((page_index >= 0)
-	    && ((page_index = ((unsigned int)page_index)/4096) < NUM_PAGES)
+	    && ((page_index =
+		 ((unsigned long)page_index)/PAGE_BYTES) < NUM_PAGES)
 	    && (page_table[page_index].gen == space));
 }