#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);
int gencgc_handle_wp_violation(void *);
-lispobj *search_dynamic_space(lispobj *);
\f
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,
* 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;
};
\f
/* 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];
-\f
-/* 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];
\f
-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);
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
*/
{
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));
}