Remove stubborn.c file

(code refactoring)

* BCC_MAKEFILE (XXXOBJS): Remove XXXstubborn.obj entry.
* CMakeLists.txt (SRC): Remove stubborn.c entry.
* Makefile.am (libgc_la_SOURCES): Likewise.
* Makefile.direct (CSRCS): Likewise.
* PCR-Makefile (CSRC): Likewise.
* build/s60v3/libgc.mmp (SOURCE): Likewise.
* doc/README.Mac (Files to build the GC libraries): Likewise.
* Makefile.direct (OBJS): Remove stubborn.o entry.
* PCR-Makefile (COBJ): Likewise.
* SMakefile.amiga (OBJS): Likewise.
* digimars.mak (OBJS): Likewise.
* NT_MAKEFILE (OBJS): Remove stubborn.obj entry.
* OS2_MAKEFILE (OBJS): Likewise.
* WCC_MAKEFILE (OBJS): Likewise.
* SMakefile.amiga (stubborn.o): Remove rule.
* digimars.mak (stubborn.obj): Likewise.
* extra/gc.c: Do not include stubborn.c.
* gc.mak: Remove rules for stubborn.obj and stubborn.sbr.
* mallocx.c [MANUAL_VDB] (GC_dirty): Move the function declaration from
stubborn.c.
* mallocx.c (GC_malloc_stubborn, GC_change_stubborn,
GC_end_stubborn_change): Move the function implementation from
stubborn.c.
* stubborn.c: Delete file.

diff --git a/BCC_MAKEFILE b/BCC_MAKEFILE
index 777e01f..0b3def4 100644 (file)
--- a/BCC_MAKEFILE
+++ b/BCC_MAKEFILE
@@ -32,7 +32,7 @@ defines= -DALL_INTERIOR_POINTERS -DNO_GETENV -DJAVA_FINALIZATION -DENABLE_DISCLA
 XXXOBJS= XXXalloc.obj XXXreclaim.obj XXXallchblk.obj XXXmisc.obj \\r
     XXXmach_dep.obj XXXos_dep.obj XXXmark_rts.obj XXXheaders.obj XXXmark.obj \\r
     XXXobj_map.obj XXXblacklst.obj XXXfinalize.obj XXXnew_hblk.obj \\r
-    XXXdbg_mlc.obj XXXmalloc.obj XXXstubborn.obj XXXdyn_load.obj \\r
+    XXXdbg_mlc.obj XXXmalloc.obj XXXdyn_load.obj \\r
     XXXtypd_mlc.obj XXXptr_chck.obj XXXgc_cpp.obj XXXmallocx.obj \\r
     XXXfnlz_mlc.obj\r
 \r

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0d84cd..72b32a3 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,8 +50,8 @@ INCLUDE_DIRECTORIES(libatomic_ops/src)
 
 SET(SRC alloc.c reclaim.c allchblk.c misc.c mach_dep.c os_dep.c
         mark_rts.c headers.c mark.c obj_map.c blacklst.c finalize.c
-        new_hblk.c dbg_mlc.c malloc.c stubborn.c dyn_load.c
-        typd_mlc.c ptr_chck.c mallocx.c)
+        new_hblk.c dbg_mlc.c malloc.c dyn_load.c typd_mlc.c ptr_chck.c
+        mallocx.c)
 SET(LIBS)
 OPTION(enable_threads "TODO" NO)
 IF(enable_threads)

diff --git a/Makefile.am b/Makefile.am
index 04d0475..2914ce9 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,7 +72,7 @@ libgc_la_SOURCES = \
     allchblk.c alloc.c blacklst.c dbg_mlc.c \
     dyn_load.c finalize.c gc_dlopen.c gcj_mlc.c headers.c \
     mach_dep.c malloc.c mallocx.c mark.c mark_rts.c misc.c new_hblk.c \
-    obj_map.c os_dep.c ptr_chck.c reclaim.c specific.c stubborn.c typd_mlc.c
+    obj_map.c os_dep.c ptr_chck.c reclaim.c specific.c typd_mlc.c
 
 # C Library: Architecture Dependent
 # ---------------------------------

diff --git a/Makefile.direct b/Makefile.direct
index 80d4b9c..cb44008 100644 (file)
--- a/Makefile.direct
+++ b/Makefile.direct
@@ -80,14 +80,14 @@ RANLIB= ranlib
 
 OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o \
   headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dbg_mlc.o  \
-  malloc.o stubborn.o checksums.o pthread_support.o pthread_stop_world.o \
+  malloc.o checksums.o pthread_support.o pthread_stop_world.o \
   darwin_stop_world.o typd_mlc.o ptr_chck.o mallocx.o gcj_mlc.o specific.o \
   gc_dlopen.o backgraph.o win32_threads.o pthread_start.o \
   thread_local_alloc.o fnlz_mlc.o atomic_ops.o atomic_ops_sysdeps.o
 
 CSRCS= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c \
   headers.c mark.c obj_map.c blacklst.c finalize.c \
-  new_hblk.c dyn_load.c dbg_mlc.c malloc.c stubborn.c \
+  new_hblk.c dyn_load.c dbg_mlc.c malloc.c \
   checksums.c pthread_support.c pthread_stop_world.c darwin_stop_world.c \
   typd_mlc.c ptr_chck.c mallocx.c gcj_mlc.c specific.c gc_dlopen.c \
   backgraph.c win32_threads.c pthread_start.c thread_local_alloc.c fnlz_mlc.c

diff --git a/NT_MAKEFILE b/NT_MAKEFILE
index 6958c82..5c5a538 100644 (file)
--- a/NT_MAKEFILE
+++ b/NT_MAKEFILE
@@ -54,7 +54,7 @@ LINK_GC=link $(ldebug) $(LINK_DLL_FLAGS)
 AO_SRC_DIR=libatomic_ops/src
 AO_INCLUDE_DIR=$(AO_SRC_DIR)
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj stubborn.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj dyn_load.obj typd_mlc.obj ptr_chck.obj gc_cpp.obj mallocx.obj win32_threads.obj extra\msvc_dbg.obj thread_local_alloc.obj
 
 all: gctest.exe cord\de.exe test_cpp.exe
 

diff --git a/OS2_MAKEFILE b/OS2_MAKEFILE
index 4fde31c..400fa73 100644 (file)
--- a/OS2_MAKEFILE
+++ b/OS2_MAKEFILE
@@ -5,7 +5,7 @@
 
 # Significantly revised for GC version 4.4 by Mark Boulter (Jan 1994).
 
-OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj stubborn.obj typd_mlc.obj ptr_chck.obj mallocx.obj
+OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj obj_map.obj blacklst.obj finalize.obj new_hblk.obj dbg_mlc.obj fnlz_mlc.obj malloc.obj typd_mlc.obj ptr_chck.obj mallocx.obj
 
 CORDOBJS= cord\cordbscs.obj cord\cordxtra.obj cord\cordprnt.obj
 

diff --git a/PCR-Makefile b/PCR-Makefile
index de26a9a..4af42ed 100644 (file)
--- a/PCR-Makefile
+++ b/PCR-Makefile
@@ -32,9 +32,9 @@ LDFLAGS = $(CONFIG_LDFLAGS)
 # Fix to point to local pcr installation directory.
 PCRDIR= ..
 
-COBJ= alloc.o reclaim.o allchblk.o misc.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o extra/pcr_interface.o extra/real_malloc.o dyn_load.o dbg_mlc.o fnlz_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o
+COBJ= alloc.o reclaim.o allchblk.o misc.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o extra/pcr_interface.o extra/real_malloc.o dyn_load.o dbg_mlc.o fnlz_mlc.o malloc.o checksums.o typd_mlc.o ptr_chck.o mallocx.o
 
-CSRC= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c blacklst.c finalize.c new_hblk.c extra/pcr_interface.c extra/real_malloc.c dyn_load.c dbg_mlc.c fnlz_mlc.c malloc.c stubborn.c checksums.c typd_mlc.c ptr_chck.c mallocx.c
+CSRC= reclaim.c allchblk.c misc.c alloc.c mach_dep.c os_dep.c mark_rts.c headers.c mark.c obj_map.c blacklst.c finalize.c new_hblk.c extra/pcr_interface.c extra/real_malloc.c dyn_load.c dbg_mlc.c fnlz_mlc.c malloc.c checksums.c typd_mlc.c ptr_chck.c mallocx.c
 
 SHELL= /bin/sh
 

diff --git a/SMakefile.amiga b/SMakefile.amiga
index 86fc0c2..5e27b22 100644 (file)
--- a/SMakefile.amiga
+++ b/SMakefile.amiga
@@ -72,7 +72,7 @@ cord/cordtest: cord/cordtest.o cord/cord$(CPU).lib gc$(CPU).lib
 
 #------------------LIBBING----------------------------
 
-OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dyn_load.o dbg_mlc.o malloc.o stubborn.o checksums.o typd_mlc.o ptr_chck.o mallocx.o fnlz_mlc.o
+OBJS= alloc.o reclaim.o allchblk.o misc.o mach_dep.o os_dep.o mark_rts.o headers.o mark.o obj_map.o blacklst.o finalize.o new_hblk.o dyn_load.o dbg_mlc.o malloc.o checksums.o typd_mlc.o ptr_chck.o mallocx.o fnlz_mlc.o
 
 gc$(CPU).lib: $(OBJS)
        $(LIBER) gc$(CPU).lib r $(OBJS)
@@ -139,9 +139,6 @@ malloc.o : malloc.c $(INC)
 mallocx.o : mallocx.c $(INC)
        $(CC) mallocx.c $(SCOPT)
 
-stubborn.o : stubborn.c $(INC)
-       $(CC) stubborn.c $(SCOPT)
-
 checksums.o : checksums.c $(INC)
        $(CC) checksums.c $(SCOPT)
 

diff --git a/WCC_MAKEFILE b/WCC_MAKEFILE
index cc2c556..48ba59a 100644 (file)
--- a/WCC_MAKEFILE
+++ b/WCC_MAKEFILE
@@ -74,7 +74,7 @@ TEST_CXXFLAGS= $(TEST_CFLAGS)
 OBJS= alloc.obj reclaim.obj allchblk.obj misc.obj &
       mach_dep.obj os_dep.obj mark_rts.obj headers.obj mark.obj &
       obj_map.obj blacklst.obj finalize.obj new_hblk.obj &
-      dbg_mlc.obj malloc.obj stubborn.obj dyn_load.obj &
+      dbg_mlc.obj malloc.obj dyn_load.obj &
       typd_mlc.obj ptr_chck.obj mallocx.obj fnlz_mlc.obj
 
 all: gc.lib gctest.exe test_cpp.exe

diff --git a/build/s60v3/libgc.mmp b/build/s60v3/libgc.mmp
index e074fd2..7fee8ad 100644 (file)
--- a/build/s60v3/libgc.mmp
+++ b/build/s60v3/libgc.mmp
@@ -54,7 +54,6 @@ SOURCE          os_dep.c
 SOURCE          extra/symbian.cpp
 SOURCE          ptr_chck.c
 SOURCE          reclaim.c
-SOURCE          stubborn.c
 SOURCE          typd_mlc.c
 
 /*

diff --git a/digimars.mak b/digimars.mak
index c360aa7..2d30d36 100644 (file)
--- a/digimars.mak
+++ b/digimars.mak
@@ -36,7 +36,6 @@ OBJS= \
        os_dep.obj\\r
        ptr_chck.obj\\r
        reclaim.obj\\r
-       stubborn.obj\\r
        typd_mlc.obj\\r
        win32_threads.obj\r
 \r
@@ -87,6 +86,5 @@ obj_map.obj: obj_map.c
 os_dep.obj: os_dep.c\r
 ptr_chck.obj: ptr_chck.c\r
 reclaim.obj: reclaim.c\r
-stubborn.obj: stubborn.c\r
 typd_mlc.obj: typd_mlc.c\r
 win32_threads.obj: win32_threads.c\r

diff --git a/doc/README.Mac b/doc/README.Mac
index fd972cf..848c1bc 100644 (file)
--- a/doc/README.Mac
+++ b/doc/README.Mac
@@ -196,7 +196,7 @@ struct gc_private_assert_intsize_{ char x[ sizeof(int)>=4 ? 1 : 0 ]; };
 #endif
 ---- ( cut here ) ----  end of gc_prefix_common.h  -----------------
 
-Files to  build the GC libraries:
+Files to build the GC libraries:
 --------------------------------
     allchblk.c
     alloc.c
@@ -217,7 +217,6 @@ Files to  build the GC libraries:
     os_dep.c   -- contains MacOS code
     ptr_chck.c
     reclaim.c
-    stubborn.c
     typd_mlc.c
     gc++.cc    -- this is 'gc_cpp.cc' with less 'inline' and
                -- throw std::bad_alloc when out of memory

diff --git a/extra/gc.c b/extra/gc.c
index b8e5a95..5cd3f7b 100644 (file)
--- a/extra/gc.c
+++ b/extra/gc.c
@@ -44,7 +44,6 @@
 #include "../new_hblk.c"
 #include "../obj_map.c"
 #include "../ptr_chck.c"
-#include "../stubborn.c"
 
 #include "gc_inline.h"
 #include "../allchblk.c"

diff --git a/gc.mak b/gc.mak
index c4072a5..987dbb5 100644 (file)
--- a/gc.mak
+++ b/gc.mak
@@ -104,8 +104,6 @@ CLEAN :
        -@erase ".\Release\ptr_chck.sbr"
        -@erase ".\Release\reclaim.obj"
        -@erase ".\Release\reclaim.sbr"
-       -@erase ".\Release\stubborn.obj"
-       -@erase ".\Release\stubborn.sbr"
        -@erase ".\Release\typd_mlc.obj"
        -@erase ".\Release\typd_mlc.sbr"
        -@erase ".\Release\win32_threads.obj"
@@ -179,7 +177,6 @@ BSC32_SBRS=\
        ".\Release\os_dep.sbr"\
        ".\Release\ptr_chck.sbr"\
        ".\Release\reclaim.sbr"\
-       ".\Release\stubborn.sbr"\
        ".\Release\typd_mlc.sbr"\
        ".\Release\msvc_dbg.copied.sbr"\
        ".\Release\win32_threads.sbr"
@@ -219,7 +216,6 @@ LINK32_OBJS=\
        ".\Release\os_dep.obj"\
        ".\Release\ptr_chck.obj"\
        ".\Release\reclaim.obj"\
-       ".\Release\stubborn.obj"\
        ".\Release\typd_mlc.obj"\
        ".\Release\msvc_dbg.copied.obj"\
        ".\Release\win32_threads.obj"
@@ -295,8 +291,6 @@ CLEAN :
        -@erase ".\Debug\ptr_chck.sbr"
        -@erase ".\Debug\reclaim.obj"
        -@erase ".\Debug\reclaim.sbr"
-       -@erase ".\Debug\stubborn.obj"
-       -@erase ".\Debug\stubborn.sbr"
        -@erase ".\Debug\typd_mlc.obj"
        -@erase ".\Debug\typd_mlc.sbr"
        -@erase ".\Debug\vc40.idb"
@@ -372,7 +366,6 @@ BSC32_SBRS=\
        ".\Debug\os_dep.sbr"\
        ".\Debug\ptr_chck.sbr"\
        ".\Debug\reclaim.sbr"\
-       ".\Debug\stubborn.sbr"\
        ".\Debug\typd_mlc.sbr"\
        ".\Debug\msvc_dbg.copied.sbr"\
        ".\Debug\win32_threads.sbr"
@@ -412,7 +405,6 @@ LINK32_OBJS=\
        ".\Debug\os_dep.obj"\
        ".\Debug\ptr_chck.obj"\
        ".\Debug\reclaim.obj"\
-       ".\Debug\stubborn.obj"\
        ".\Debug\typd_mlc.obj"\
        ".\Debug\msvc_dbg.copied.obj"\
        ".\Debug\win32_threads.obj"
@@ -1246,54 +1238,6 @@ NODEP_CPP_ALLCH=\
 ################################################################################
 # Begin Source File
 
-SOURCE=.\stubborn.c
-
-!IF  "$(CFG)" == "gc - Win32 Release"
-
-DEP_CPP_STUBB=\
-       ".\include\private\gcconfig.h"\
-       ".\include\gc.h"\
-       ".\include\private\gc_hdrs.h"\
-       ".\include\private\gc_priv.h"\
-       {$(INCLUDE)}"\sys\TYPES.H"\
-
-NODEP_CPP_STUBB=\
-       ".\th\PCR_Th.h"\
-       ".\th\PCR_ThCrSec.h"\
-       ".\th\PCR_ThCtl.h"\
-
-
-".\Release\stubborn.obj" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-".\Release\stubborn.sbr" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-
-!ELSEIF  "$(CFG)" == "gc - Win32 Debug"
-
-DEP_CPP_STUBB=\
-       ".\include\private\gcconfig.h"\
-       ".\include\gc.h"\
-       ".\include\private\gc_hdrs.h"\
-       ".\include\private\gc_priv.h"\
-       {$(INCLUDE)}"\sys\TYPES.H"\
-
-NODEP_CPP_STUBB=\
-       ".\th\PCR_Th.h"\
-       ".\th\PCR_ThCrSec.h"\
-       ".\th\PCR_ThCtl.h"\
-
-
-".\Debug\stubborn.obj" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-".\Debug\stubborn.sbr" : $(SOURCE) $(DEP_CPP_STUBB) "$(INTDIR)"
-
-
-!ENDIF
-
-# End Source File
-################################################################################
-# Begin Source File
-
 SOURCE=.\obj_map.c
 
 !IF  "$(CFG)" == "gc - Win32 Release"

diff --git a/mallocx.c b/mallocx.c
index 29167eb..f937683 100644 (file)
--- a/mallocx.c
+++ b/mallocx.c
@@ -600,3 +600,24 @@ GC_API GC_ATTR_MALLOC char * GC_CALL GC_strndup(const char *str, size_t size)
     return copy;
   }
 #endif /* GC_REQUIRE_WCSDUP */
+
+GC_API void * GC_CALL GC_malloc_stubborn(size_t lb)
+{
+  return GC_malloc(lb);
+}
+
+GC_API void GC_CALL GC_change_stubborn(const void *p GC_ATTR_UNUSED)
+{
+  /* Empty. */
+}
+
+#if defined(MANUAL_VDB)
+  void GC_dirty(ptr_t p);
+#endif
+
+GC_API void GC_CALL GC_end_stubborn_change(const void *p GC_ATTR_UNUSED)
+{
+# ifdef MANUAL_VDB
+    GC_dirty((ptr_t)p);
+# endif
+}

diff --git a/stubborn.c b/stubborn.c
deleted file mode 100644 (file)
index efa2c51..0000000
--- a/stubborn.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 1988, 1989 Hans-J. Boehm, Alan J. Demers
- * Copyright (c) 1991-1994 by Xerox Corporation.  All rights reserved.
- *
- * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
- * OR IMPLIED.  ANY USE IS AT YOUR OWN RISK.
- *
- * Permission is hereby granted to use or copy this program
- * for any purpose,  provided the above notices are retained on all copies.
- * Permission to modify the code and to distribute modified code is granted,
- * provided the above notices are retained, and a notice that the code was
- * modified is included with the above copyright notice.
- */
-
-#include "private/gc_priv.h"
-
-#if defined(MANUAL_VDB)
-
-  /* Stubborn object (hard to change, nearly immutable) allocation.     */
-  /* This interface is deprecated.  We mostly emulate it using          */
-  /* MANUAL_VDB.  But that imposes the additional constraint that       */
-  /* written, but not yet GC_dirty()ed objects must be referenced       */
-  /* by a stack.                                                        */
-
-  void GC_dirty(ptr_t p);
-#endif
-
-GC_API void * GC_CALL GC_malloc_stubborn(size_t lb)
-{
-  return(GC_malloc(lb));
-}
-
-GC_API void GC_CALL GC_end_stubborn_change(const void *p GC_ATTR_UNUSED)
-{
-# ifdef MANUAL_VDB
-    GC_dirty((ptr_t)p);
-# endif
-}
-
-GC_API void GC_CALL GC_change_stubborn(const void *p GC_ATTR_UNUSED)
-{
-  /* Empty. */
-}