#define CEILING(x,y) (((x) + ((y) - 1)) & (~((y) - 1)))
-static inline unsigned int
-NWORDS(unsigned int x, unsigned int n_bits)
+static inline unsigned long
+NWORDS(unsigned long x, unsigned long 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;
+ unsigned long 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? */
+
+/* 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
+ */
+
#define FUN_RAW_ADDR_OFFSET (6*sizeof(lispobj) - FUN_POINTER_LOWTAG)
/* values for the *_alloc_* parameters */
#define ALLOC_UNBOXED 1
#define ALLOC_QUICK 1
-void *gc_general_alloc(int nbytes,int unboxed_p,int quick_p);
+void *gc_general_alloc(long nbytes,int unboxed_p,int quick_p);
-extern int (*scavtab[256])(lispobj *where, lispobj object);
+extern long (*scavtab[256])(lispobj *where, lispobj object);
extern lispobj (*transother[256])(lispobj object);
-extern int (*sizetab[256])(lispobj *where);
+extern long (*sizetab[256])(lispobj *where);
extern struct weak_pointer *weak_pointers; /* in gc-common.c */
extern void scavenge(lispobj *start, long n_words);
extern void scan_weak_pointers(void);
-lispobj copy_large_unboxed_object(lispobj object, int nwords);
-lispobj copy_unboxed_object(lispobj object, int nwords);
-lispobj copy_large_object(lispobj object, int nwords);
-lispobj copy_object(lispobj object, int nwords);
+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 *search_read_only_space(void *pointer);
lispobj *search_static_space(void *pointer);
if (is_lisp_pointer(thing)
|| (fixnump(thing))
|| (widetag_of(thing) == CHARACTER_WIDETAG)
+#if N_WORD_BITS == 64
+ || (widetag_of(thing) == SINGLE_FLOAT_WIDETAG)
+#endif
|| (widetag_of(thing) == UNBOUND_MARKER_WIDETAG))
count = 2;
else