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

diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h
index 6f75ae1..e257afb 100644
--- a/src/runtime/gencgc-internal.h
+++ b/src/runtime/gencgc-internal.h
@@ -19,6 +19,9 @@
 #ifndef _GENCGC_INTERNAL_H_
 #define _GENCGC_INTERNAL_H_
 
+#include "gencgc-alloc-region.h"
+#include "genesis/code.h"
+
 void gc_free_heap(void);
 inline int find_page_index(void *);
 inline void *page_address(int);
@@ -42,7 +45,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,
@@ -75,27 +78,8 @@ struct page {
 /* 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;
 
-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);