X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fgc-internal.h;h=c9d1911246bbe365960783b906076228e5415728;hb=f59d43f28fb757db168e46399b7c8ab04cc6620b;hp=7de67a13824eef36e2017b6175770444b8d37a53;hpb=1479483c5f40fc470053da0fc5cd8e42fc77676e;p=sbcl.git

diff --git a/src/runtime/gc-internal.h b/src/runtime/gc-internal.h
index 7de67a1..c9d1911 100644
--- a/src/runtime/gc-internal.h
+++ b/src/runtime/gc-internal.h
@@ -16,6 +16,8 @@
 #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 */
 #if 1
@@ -59,20 +61,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 */