X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgc-internal.h;h=8928f2bbc7e81b9380e306cdda0f6edf881dc9e0;hb=cf4cb9554515c59eddbde38d1cf236339c37f55f;hp=28d0efc8a052fff6491f382a64cd6d5ebe06627b;hpb=a6bda328d1a33a5ad328ec97bed83d5c49c530e0;p=sbcl.git

diff --git a/src/runtime/gc-internal.h b/src/runtime/gc-internal.h
index 28d0efc..8928f2b 100644
--- a/src/runtime/gc-internal.h
+++ b/src/runtime/gc-internal.h
@@ -29,7 +29,14 @@
 			__FILE__, __LINE__)
 
 #define CEILING(x,y) (((x) + ((y) - 1)) & (~((y) - 1)))
-#define NWORDS(x,y) (CEILING((x),(y)) / (y))
+
+static inline unsigned int
+NWORDS(unsigned int x, unsigned int n_bits)
+{
+    unsigned int elements_per_word = N_WORD_BITS/n_bits;
+
+    return CEILING(x, elements_per_word)/elements_per_word;
+}
 
 /* FIXME: Shouldn't this be defined in sbcl.h? */
 #define FUN_RAW_ADDR_OFFSET (6*sizeof(lispobj) - FUN_POINTER_LOWTAG)
@@ -60,6 +67,44 @@ lispobj  copy_unboxed_object(lispobj object, int nwords);
 lispobj  copy_large_object(lispobj object, int nwords);
 lispobj  copy_object(lispobj object, int nwords);
 
+lispobj *search_read_only_space(void *pointer);
+lispobj *search_static_space(void *pointer);
+lispobj *search_dynamic_space(void *pointer);
+
+/* Scan an area looking for an object which encloses the given pointer.
+ * Return the object start on success or NULL on failure. */
+static lispobj *
+search_space(lispobj *start, size_t words, lispobj *pointer)
+{
+    while (words > 0) {
+	size_t count = 1;
+	lispobj thing = *start;
+
+	/* If thing is an immediate then this is a cons. */
+	if (is_lisp_pointer(thing)
+	    || ((thing & 3) == 0) /* fixnum */
+	    || (widetag_of(thing) == BASE_CHAR_WIDETAG)
+	    || (widetag_of(thing) == UNBOUND_MARKER_WIDETAG))
+	    count = 2;
+	else
+	    count = (sizetab[widetag_of(thing)])(start);
+
+	/* Check whether the pointer is within this object. */
+	if ((pointer >= start) && (pointer < (start+count))) {
+	    /* found it! */
+	    /*FSHOW((stderr,"/found %x in %x %x\n", pointer, start, thing));*/
+	    return(start);
+	}
+
+	/* Round up the count. */
+	count = CEILING(count,2);
+
+	start += count;
+	words -= count;
+    }
+    return (NULL);
+}
+
 #ifdef LISP_FEATURE_GENCGC
 #include "gencgc-internal.h"
 #else