X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgc-internal.h;h=7de67a13824eef36e2017b6175770444b8d37a53;hb=bfb7c2d573bacfd9c5f3f243b7c1589f81f11406;hp=b2ad82aff8b89f95f54c29dadd25535e31444c2c;hpb=e01e7a01b67b98a47730a08dfa5d0d58518486ea;p=sbcl.git

diff --git a/src/runtime/gc-internal.h b/src/runtime/gc-internal.h
index b2ad82a..7de67a1 100644
--- a/src/runtime/gc-internal.h
+++ b/src/runtime/gc-internal.h
@@ -19,14 +19,24 @@
 /* disabling gc assertions made no discernable difference to GC speed,
  * last I tried it - dan 2003.12.21 */
 #if 1
-#define gc_assert(ex) do { \
-	if (!(ex)) gc_abort(); \
+# define gc_assert(ex)                                                 \
+do {                                                                   \
+    if (!(ex)) gc_abort();                                             \
+} while (0)
+# define gc_assert_verbose(ex, fmt, ...)                               \
+do {                                                                   \
+    if (!(ex)) {                                                       \
+        fprintf(stderr, fmt, ## __VA_ARGS__);                          \
+        gc_abort();                                                    \
+    }                                                                  \
 } while (0)
 #else
-#define gc_assert(ex)
+# define gc_assert(ex)
+# define gc_assert_verbose(ex, fmt, ...)
 #endif
-#define gc_abort() lose("GC invariant lost, file \"%s\", line %d", \
-			__FILE__, __LINE__)
+
+#define gc_abort()                                                     \
+  lose("GC invariant lost, file \"%s\", line %d\n", __FILE__, __LINE__)
 
 #define CEILING(x,y) (((x) + ((y) - 1)) & (~((y) - 1)))
 
@@ -52,14 +62,18 @@ NWORDS(unsigned long x, unsigned long n_bits)
 /* 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 
+ * 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)
+#endif
 
 /* values for the *_alloc_* parameters */
 #define FREE_PAGE_FLAG 0
@@ -78,8 +92,12 @@ 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);
@@ -101,4 +119,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_ */