1.0.29.32: SCRUB-CONTROL-STACK related changes

[sbcl.git] / src / runtime / gc-internal.h

diff --git a/src/runtime/gc-internal.h b/src/runtime/gc-internal.h
index 6645871..3d43fab 100644 (file)
--- a/src/runtime/gc-internal.h
+++ b/src/runtime/gc-internal.h
@@ -16,8 +16,14 @@
 #ifndef _GC_INTERNAL_H_
 #define _GC_INTERNAL_H_
 
+#include <genesis/simple-fun.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 {                                                                   \
@@ -59,20 +65,10 @@ NWORDS(unsigned long x, unsigned long n_bits)
 
 /* FIXME: Shouldn't this be defined in sbcl.h? */
 
-/* FIXME (1) this could probably be defined using something like
- *  sizeof(lispobj)*floor(sizeof(struct simple_fun)/sizeof(lispobj))
- *    -  FUN_POINTER_LOWTAG
- * as I'm reasonably sure that simple_fun->code must always be the
- * last slot in the object
-
- * FIXME (2) it also appears in purify.c, and it has a different value
- * for SPARC users in that bit
- */
-
 #if defined(LISP_FEATURE_SPARC)
 #define FUN_RAW_ADDR_OFFSET 0
 #else
-#define FUN_RAW_ADDR_OFFSET (6*sizeof(lispobj) - FUN_POINTER_LOWTAG)
+#define FUN_RAW_ADDR_OFFSET (offsetof(struct simple_fun, code) - FUN_POINTER_LOWTAG)
 #endif
 
 /* values for the *_alloc_* parameters */
@@ -80,27 +76,52 @@ 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
 #define ALLOC_QUICK 1
 
-void *gc_general_alloc(long nbytes,int unboxed_p,int quick_p);
+#ifdef LISP_FEATURE_GENCGC
+#include "gencgc-alloc-region.h"
+void *
+gc_alloc_with_region(long nbytes,int page_type_flag, struct alloc_region *my_region,
+                     int quick_p);
+static inline void *
+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) {
+        my_region = &boxed_region;
+    } else {
+        lose("bad page type flag: %d", page_type_flag);
+    }
+    return gc_alloc_with_region(nbytes, page_type_flag, my_region, quick_p);
+}
+#else
+extern void *gc_general_alloc(long nbytes,int page_type_flag,int quick_p);
+#endif
 
 extern long (*scavtab[256])(lispobj *where, lispobj object);
 extern lispobj (*transother[256])(lispobj object);
 extern long (*sizetab[256])(lispobj *where);
 
 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 scav_weak_hash_tables(void);
+extern void scan_weak_hash_tables(void);
 extern void scan_weak_pointers(void);
 
 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);
@@ -108,6 +129,8 @@ lispobj *search_dynamic_space(void *pointer);
 
 lispobj *gc_search_space(lispobj *start, size_t words, lispobj *pointer);
 
+extern void scrub_control_stack();
+
 #include "fixnump.h"
 
 #ifdef LISP_FEATURE_GENCGC
@@ -116,4 +139,10 @@ lispobj *gc_search_space(lispobj *start, size_t words, lispobj *pointer);
 #include "cheneygc-internal.h"
 #endif
 
+#if N_WORD_BITS == 32
+# define SIMPLE_ARRAY_WORD_WIDETAG SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG
+#elif N_WORD_BITS == 64
+# define SIMPLE_ARRAY_WORD_WIDETAG SIMPLE_ARRAY_UNSIGNED_BYTE_64_WIDETAG
+#endif
+
 #endif /* _GC_INTERNAL_H_ */