Move GC_register_disclaim_proc to fnlz_mlc

* misc.c (GC_register_disclaim_proc): Move definition to fnlz_mlc.c
(to minimize linked code size in case "disclaim" finalization is
unused).
* misc.c: Do not include gc_disclaim.h.
* fnlz_mlc.c (GC_register_disclaim_proc): Add GC_ASSERT for kind
passed by the client.

diff --git a/fnlz_mlc.c b/fnlz_mlc.c
index 8626b0f36ea87da240851c8ac536084783dd8fcd..b43569a0305d993b23449d8f264cae0c4922fb16 100644 (file)
--- a/fnlz_mlc.c
+++ b/fnlz_mlc.c
@@ -71,6 +71,16 @@ GC_API void GC_CALL GC_init_finalized_malloc(void)
     UNLOCK();
 }
 
+GC_API void GC_CALL GC_register_disclaim_proc(int kind, GC_disclaim_proc proc,
+                                              void *cd,
+                                              int mark_unconditionally)
+{
+    GC_ASSERT((unsigned)kind < MAXOBJKINDS);
+    GC_obj_kinds[kind].ok_disclaim_proc = proc;
+    GC_obj_kinds[kind].ok_disclaim_cd = cd;
+    GC_obj_kinds[kind].ok_mark_unconditionally = (GC_bool)mark_unconditionally;
+}
+
 #ifdef THREAD_LOCAL_ALLOC
   STATIC void * GC_core_finalized_malloc(size_t lb,
                                 const struct GC_finalizer_closure *fclos)

diff --git a/misc.c b/misc.c
index 3cc29b6bb58e3e902bc5aa5b252b9532edeacb5c..19ddb8be7db39c3bcfd55572f0da8d9d71e3036f 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -15,10 +15,6 @@
 
 #include "private/gc_pmark.h"
 
-#ifdef ENABLE_DISCLAIM
-#  include "gc_disclaim.h"
-#endif
-
 #include <stdio.h>
 #include <limits.h>
 #include <stdarg.h>
@@ -1479,7 +1475,7 @@ GC_API void ** GC_CALL GC_new_free_list(void)
 }
 
 GC_API unsigned GC_CALL GC_new_kind_inner(void **fl, GC_word descr,
-                                        int adjust, int clear)
+                                          int adjust, int clear)
 {
     unsigned result = GC_n_kinds++;
 
@@ -1527,18 +1523,6 @@ GC_API unsigned GC_CALL GC_new_proc(GC_mark_proc proc)
     return result;
 }
 
-#ifdef ENABLE_DISCLAIM
-  GC_API void GC_CALL GC_register_disclaim_proc(int kind,
-                                                GC_disclaim_proc proc,
-                                                void *cd,
-                                                int mark_unconditionally)
-  {
-    GC_obj_kinds[kind].ok_disclaim_proc = proc;
-    GC_obj_kinds[kind].ok_disclaim_cd = cd;
-    GC_obj_kinds[kind].ok_mark_unconditionally = (GC_bool)mark_unconditionally;
-  }
-#endif /* ENABLE_DISCLAIM */
-
 GC_API void * GC_CALL GC_call_with_stack_base(GC_stack_base_func fn, void *arg)
 {
     int dummy;