Ticket #860: inlined-checks.patch

chicken.h

@@ -1061 +1061 @@
 #else
 # define C_stack_pointer ((C_word *)C_alloca(0))
 #endif
-#define C_stack_pointer_test       ((C_word *)C_alloca(1))
 #define C_demand_2(n)              (((C_word *)C_fromspace_top + (n)) < (C_word *)C_fromspace_limit)
 #define C_fix(n)                   ((C_word)((C_uword)(n) << C_FIXNUM_SHIFT) | C_FIXNUM_BIT)
 #define C_unfix(x)                 C_CHECKp(x,C_fixnump(C_VAL1(x)),((C_VAL1(x)) >> C_FIXNUM_SHIFT))
@@ -1823 +1822 @@
 C_fctexport void C_unbound_variable(C_word sym);
 C_fctexport C_word C_fcall C_retrieve2(C_word val, char *name) C_regparm;
 C_fctexport void *C_fcall C_retrieve2_symbol_proc(C_word val, char *name) C_regparm;
-C_fctexport int C_in_stackp(C_word x) C_regparm;
-C_fctexport int C_fcall C_in_heapp(C_word x) C_regparm;
-C_fctexport int C_fcall C_in_fromspacep(C_word x) C_regparm;
-C_fctexport int C_fcall C_in_scratchspacep(C_word x) C_regparm;
+C_fctexport C_word C_permanentp(C_word x) C_regparm;
 C_fctexport void C_fcall C_trace(C_char *name) C_regparm;
 C_fctexport C_word C_fcall C_emit_trace_info2(char *raw, C_word x, C_word y, C_word t) C_regparm;
 C_fctexport C_word C_fcall C_u_i_string_hash(C_word str, C_word rnd) C_regparm;
@@ -2192 +2188 @@
   else return *slot = val;
 }
 
-C_inline C_word C_permanentp(C_word x)
-{
-  return C_mk_bool(!C_immediatep(x) && !C_in_stackp(x) && !C_in_heapp(x));
-}
-
-
 C_inline C_word C_flonum(C_word **ptr, double n)
 {
   C_word 

runtime.c

@@ -506 +506 @@
 static WEAK_TABLE_ENTRY *C_fcall lookup_weak_table_entry(C_word item, C_word container) C_regparm;
 static C_cpsproc(values_continuation) C_noret;
 static C_word add_symbol(C_word **ptr, C_word key, C_word string, C_SYMBOL_TABLE *stable);
-static C_regparm int C_fcall C_in_new_heapp(C_word x);
 static C_regparm C_word bignum_times_bignum_unsigned(C_word **ptr, C_word x, C_word y, C_word negp);
 static C_regparm C_word bignum_extract_digits(C_word **ptr, C_word n, C_word x, C_word start, C_word end);
 
@@ -1940 +1939 @@
   return dummy;
 }
 
+/* Inlineable memory region predicates */
+
+C_inline int C_in_stackp(C_word x)
+{
+  C_word *ptr = (C_word *)(C_uword)x;
+
+#if C_STACK_GROWS_DOWNWARD
+  return ptr >= C_stack_pointer && ptr <= stack_bottom;
+#else
+  return ptr < C_stack_pointer && ptr >= stack_bottom;
+#endif
+}
+
+C_inline int C_fcall C_in_heapp(C_word x)
+{
+  C_byte *ptr = (C_byte *)(C_uword)x;
+  return (ptr >= fromspace_start && ptr < C_fromspace_limit) ||
+         (ptr >= tospace_start && ptr < tospace_limit);
+}
+
+/* Only used during major GC (heap realloc) */
+C_inline int C_fcall C_in_new_heapp(C_word x)
+{
+  C_byte *ptr = (C_byte *)(C_uword)x;
+  return (ptr >= new_tospace_start && ptr < new_tospace_limit);
+}
+
+C_inline int C_fcall C_in_fromspacep(C_word x)
+{
+  C_byte *ptr = (C_byte *)(C_uword)x;
+  return (ptr >= fromspace_start && ptr < C_fromspace_limit);
+}
+
+C_inline int C_fcall C_in_scratchspacep(C_word x)
+{
+  C_word *ptr = (C_word *)(C_uword)x;
+  return (ptr >= C_scratchspace_start && ptr < C_scratchspace_limit);
+}
+
+C_regparm C_word C_permanentp(C_word x)
+{
+  return C_mk_bool(!C_immediatep(x) && !C_in_stackp(x) && !C_in_heapp(x));
+}
 
 /* Timing routines: */
 
@@ -2385 +2427 @@
   return sym;
 }
 
-
-C_regparm int C_in_stackp(C_word x)
-{
-  C_word *ptr = (C_word *)(C_uword)x;
-
-#if C_STACK_GROWS_DOWNWARD
-  return ptr >= C_stack_pointer_test && ptr <= stack_bottom;
-#else
-  return ptr < C_stack_pointer_test && ptr >= stack_bottom;
-#endif
-}
-
-
-C_regparm int C_fcall C_in_heapp(C_word x)
-{
-  C_byte *ptr = (C_byte *)(C_uword)x;
-  return (ptr >= fromspace_start && ptr < C_fromspace_limit) ||
-         (ptr >= tospace_start && ptr < tospace_limit);
-}
-
-/* Only used during major GC (heap realloc) */
-static C_regparm int C_fcall C_in_new_heapp(C_word x)
-{
-  C_byte *ptr = (C_byte *)(C_uword)x;
-  return (ptr >= new_tospace_start && ptr < new_tospace_limit);
-}
-
-C_regparm int C_fcall C_in_fromspacep(C_word x)
-{
-  C_byte *ptr = (C_byte *)(C_uword)x;
-  return (ptr >= fromspace_start && ptr < C_fromspace_limit);
-}
-
-C_regparm int C_fcall C_in_scratchspacep(C_word x)
-{
-  C_word *ptr = (C_word *)(C_uword)x;
-  return (ptr >= C_scratchspace_start && ptr < C_scratchspace_limit);
-}
-
 /* Cons the rest-aguments together: */
 
 C_regparm C_word C_fcall C_build_rest(C_word **ptr, C_word c, C_word n, C_word *av)