projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.10.32:
[sbcl.git]
/
src
/
runtime
/
gencgc-internal.h
diff --git
a/src/runtime/gencgc-internal.h
b/src/runtime/gencgc-internal.h
index
f402282
..
9ff5a19
100644
(file)
--- a/
src/runtime/gencgc-internal.h
+++ b/
src/runtime/gencgc-internal.h
@@
-22,6
+22,12
@@
#include "gencgc-alloc-region.h"
#include "genesis/code.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);
void gc_free_heap(void);
inline int find_page_index(void *);
inline void *page_address(int);
@@
-66,9
+72,10
@@
struct page {
* hard to achieve). */
int bytes_used;
* 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;
};
int first_object_offset;
};
@@
-76,11
+83,11
@@
struct page {
\f
/* the number of pages needed for the dynamic space - rounding up */
\f
/* 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];
\f
extern struct page page_table[NUM_PAGES];
\f
-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);
void sniff_code_object(struct code *code, unsigned displacement);
void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code);
@@
-96,7
+103,8
@@
space_matches_p(lispobj obj, int space)
{
int page_index=(void*)obj - (void *)DYNAMIC_SPACE_START;
return ((page_index >= 0)
{
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));
}
&& (page_table[page_index].gen == space));
}