X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fruntime%2Fgencgc-internal.h;h=94e3f09689b3c6b1bfc4184f784d88c0b020acfe;hb=666a3a77ee04225cf861ed8e1e7f378b8438d925;hp=f8289876ccd4df4541284a2c9daf7dcbc33fe757;hpb=28d21e7a698484a39c4909b0cb3119eda6db6a38;p=sbcl.git

diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h
index f828987..94e3f09 100644
--- a/src/runtime/gencgc-internal.h
+++ b/src/runtime/gencgc-internal.h
@@ -110,14 +110,18 @@ void gc_set_region_empty(struct alloc_region *region);
 /*
  * predicates
  */
+
 static inline boolean
 space_matches_p(lispobj obj, generation_index_t space)
 {
-    page_index_t page_index=(void*)obj - (void *)DYNAMIC_SPACE_START;
-    return ((page_index >= 0)
-            && ((page_index =
-                 ((unsigned long)page_index)/PAGE_BYTES) < page_table_pages)
-            && (page_table[page_index].gen == space));
+    if (obj >= DYNAMIC_SPACE_START) {
+        page_index_t page_index=((pointer_sized_uint_t)obj
+                                 - DYNAMIC_SPACE_START) / PAGE_BYTES;
+        return ((page_index < page_table_pages) &&
+                (page_table[page_index].gen == space));
+    } else {
+        return 0;
+    }
 }
 
 static inline boolean