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

diff --git a/src/runtime/gc-internal.h b/src/runtime/gc-internal.h
index 8928f2b..114f514 100644
--- a/src/runtime/gc-internal.h
+++ b/src/runtime/gc-internal.h
@@ -33,9 +33,18 @@
 static inline unsigned int
 NWORDS(unsigned int x, unsigned int n_bits)
 {
-    unsigned int elements_per_word = N_WORD_BITS/n_bits;
+    /* A good compiler should be able to constant-fold this whole thing,
+       even with the conditional. */
+    if(n_bits <= N_WORD_BITS) {
+        unsigned int elements_per_word = N_WORD_BITS/n_bits;
 
-    return CEILING(x, elements_per_word)/elements_per_word;
+        return CEILING(x, elements_per_word)/elements_per_word;
+    }
+    else {
+        /* FIXME: should have some sort of assertion that N_WORD_BITS
+           evenly divides n_bits */
+        return x * (n_bits/N_WORD_BITS);
+    }
 }
 
 /* FIXME: Shouldn't this be defined in sbcl.h? */
@@ -71,6 +80,8 @@ lispobj *search_read_only_space(void *pointer);
 lispobj *search_static_space(void *pointer);
 lispobj *search_dynamic_space(void *pointer);
 
+#include "fixnump.h"
+
 /* Scan an area looking for an object which encloses the given pointer.
  * Return the object start on success or NULL on failure. */
 static lispobj *
@@ -82,8 +93,8 @@ search_space(lispobj *start, size_t words, lispobj *pointer)
 
 	/* 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)
+	    || (fixnump(thing))
+	    || (widetag_of(thing) == CHARACTER_WIDETAG)
 	    || (widetag_of(thing) == UNBOUND_MARKER_WIDETAG))
 	    count = 2;
 	else