X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgc-internal.h;h=72222bd78af1fe5715ce6f564ccef51e141767ba;hb=ee5629ee974ee8ce7a1cb245a99e94f8943ffd90;hp=56dfcfae0a6f7edbf2f395645fb73e32c457cb22;hpb=fee931bde89778322557461356580752bc819cbf;p=sbcl.git

diff --git a/src/runtime/gc-internal.h b/src/runtime/gc-internal.h
index 56dfcfa..72222bd 100644
--- a/src/runtime/gc-internal.h
+++ b/src/runtime/gc-internal.h
@@ -17,9 +17,14 @@
 #define _GC_INTERNAL_H_
 
 #include <genesis/simple-fun.h>
+#include "thread.h"
 
 /* disabling gc assertions made no discernable difference to GC speed,
- * last I tried it - dan 2003.12.21 */
+ * last I tried it - dan 2003.12.21
+ *
+ * And it's unsafe to do so while things like gc_assert(0 ==
+ * thread_mutex_lock(&allocation_lock)) exist. - MG 2009-01-13
+ */
 #if 1
 # define gc_assert(ex)                                                 \
 do {                                                                   \
@@ -72,6 +77,7 @@ NWORDS(unsigned long x, unsigned long n_bits)
 #define BOXED_PAGE_FLAG 1
 #define UNBOXED_PAGE_FLAG 2
 #define OPEN_REGION_PAGE_FLAG 4
+#define CODE_PAGE_FLAG        (BOXED_PAGE_FLAG|UNBOXED_PAGE_FLAG)
 
 #define ALLOC_BOXED 0
 #define ALLOC_UNBOXED 1
@@ -88,7 +94,7 @@ gc_general_alloc(long nbytes, int page_type_flag, int quick_p)
     struct alloc_region *my_region;
     if (UNBOXED_PAGE_FLAG == page_type_flag) {
         my_region = &unboxed_region;
-    } else if (BOXED_PAGE_FLAG == page_type_flag) {
+    } else if (BOXED_PAGE_FLAG & page_type_flag) {
         my_region = &boxed_region;
     } else {
         lose("bad page type flag: %d", page_type_flag);
@@ -96,7 +102,7 @@ gc_general_alloc(long nbytes, int page_type_flag, int quick_p)
     return gc_alloc_with_region(nbytes, page_type_flag, my_region, quick_p);
 }
 #else
-void *gc_general_alloc(long nbytes,int page_type_flag,int quick_p);
+extern void *gc_general_alloc(long nbytes,int page_type_flag,int quick_p);
 #endif
 
 extern long (*scavtab[256])(lispobj *where, lispobj object);
@@ -107,7 +113,7 @@ extern struct weak_pointer *weak_pointers; /* in gc-common.c */
 extern struct hash_table *weak_hash_tables; /* in gc-common.c */
 
 extern void scavenge(lispobj *start, long n_words);
-extern void scavenge_interrupt_contexts(void);
+extern void scavenge_interrupt_contexts(struct thread *thread);
 extern void scav_weak_hash_tables(void);
 extern void scan_weak_hash_tables(void);
 extern void scan_weak_pointers(void);
@@ -116,6 +122,7 @@ lispobj  copy_large_unboxed_object(lispobj object, long nwords);
 lispobj  copy_unboxed_object(lispobj object, long nwords);
 lispobj  copy_large_object(lispobj object, long nwords);
 lispobj  copy_object(lispobj object, long nwords);
+lispobj  copy_code_object(lispobj object, long nwords);
 
 lispobj *search_read_only_space(void *pointer);
 lispobj *search_static_space(void *pointer);
@@ -123,6 +130,10 @@ lispobj *search_dynamic_space(void *pointer);
 
 lispobj *gc_search_space(lispobj *start, size_t words, lispobj *pointer);
 
+extern int looks_like_valid_lisp_pointer_p(lispobj *pointer, lispobj *start_addr);
+
+extern void scrub_control_stack();
+
 #include "fixnump.h"
 
 #ifdef LISP_FEATURE_GENCGC