===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/gc-7.0-risa.diff,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- OpenXM_contrib2/asir2000/gc-7.0-risa.diff	2013/08/28 06:14:44	1.10
+++ OpenXM_contrib2/asir2000/gc-7.0-risa.diff	2015/08/04 06:46:29	1.11
@@ -1,6 +1,6 @@
-diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc.c
---- gc-7.2alpha6.orig/alloc.c	2011-06-01 00:27:11.000000000 +0900
-+++ gc-7.2alpha6/alloc.c	2012-05-08 01:22:13.000000000 +0900
+diff -urN gc-7.4.2.orig/alloc.c gc-7.4.2/alloc.c
+--- gc-7.4.2.orig/alloc.c	2014-06-03 15:08:01.000000000 +0900
++++ gc-7.4.2/alloc.c	2015-08-04 14:17:41.000000000 +0900
 @@ -121,6 +121,7 @@
  #endif
  
@@ -9,19 +9,16 @@ diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc
  
  GC_INNER int GC_CALLBACK GC_never_stop_func(void)
  {
-@@ -229,9 +230,9 @@
+@@ -228,7 +229,7 @@
      scan_size = 2 * GC_composite_in_use + GC_atomic_in_use / 4
- 		+ total_root_size;
-     if (GC_incremental) {
--        return scan_size / (2 * GC_free_space_divisor);
-+        return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor);
-     } else {
--        return scan_size / GC_free_space_divisor;
-+        return scan_size * GC_free_space_numerator / (2 * GC_free_space_divisor);
+                 + total_root_size;
+     result = scan_size / GC_free_space_divisor;
+-    if (GC_incremental) {
++    if (1 || GC_incremental) {
+       result /= 2;
      }
- }
- 
-@@ -597,6 +598,7 @@
+     return result > 0 ? result : 1;
+@@ -603,6 +604,7 @@
          GET_TIME(start_time);
  #   endif
  
@@ -29,51 +26,51 @@ diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc
      STOP_WORLD();
  #   ifdef THREAD_LOCAL_ALLOC
        GC_world_stopped = TRUE;
-@@ -629,6 +631,7 @@
+@@ -632,6 +634,7 @@
                GC_world_stopped = FALSE;
  #           endif
              START_WORLD();
 +            GC_timerstop();
              return(FALSE);
            }
-           if (GC_mark_some((ptr_t)(&dummy))) break;
-@@ -651,6 +654,7 @@
+           if (GC_mark_some(GC_approx_sp())) break;
+@@ -653,6 +656,7 @@
        GC_world_stopped = FALSE;
  #   endif
      START_WORLD();
 +    GC_timerstop();
  #   ifndef SMALL_CONFIG
-     if (GC_print_stats) {
+       if (GC_PRINT_STATS_FLAG) {
          unsigned long time_diff;
-@@ -796,6 +800,7 @@
-         /* FIXME: Add more checks.				*/
+@@ -836,6 +840,7 @@
+         /* FIXME: Add more checks.                              */
          GC_check_tls();
  #   endif
 +	GC_timerstart();
  
  #   ifndef SMALL_CONFIG
-     if (GC_print_stats)
-@@ -923,6 +928,7 @@
- 	              MS_TIME_DIFF(done_time,finalize_time));
-     }
+       if (GC_print_stats)
+@@ -958,6 +963,7 @@
+                       MS_TIME_DIFF(done_time,finalize_time));
+       }
  #   endif
 +    GC_timerstop();
  }
  
  /* If stop_func == 0 then GC_default_stop_func is used instead.         */
-@@ -1172,6 +1178,9 @@
-          GC_heapsize + expansion_slop - 2*MAXHINCR*HBLKSIZE;
-         if (GC_collect_at_heapsize < GC_heapsize /* wrapped */)
-          GC_collect_at_heapsize = (word)(-1);
+@@ -1215,6 +1221,9 @@
+     if (GC_on_heap_resize)
+       (*GC_on_heap_resize)(GC_heapsize);
+ 
 +#if defined(VISUAL)
 +    SendHeapSize();
 +#endif
      return(TRUE);
  }
  
-@@ -1281,6 +1290,21 @@
+@@ -1334,6 +1343,21 @@
      GC_bool retry = FALSE;
-     
+ 
      if (gran == 0) return(0);
 +#if defined(_MSC_VER)
 +    {
@@ -93,10 +90,10 @@ diff -urN gc-7.2alpha6.orig/alloc.c gc-7.2alpha6/alloc
  
      while (*flh == 0) {
        ENTER_GC();
-diff -urN gc-7.2alpha6.orig/misc.c gc-7.2alpha6/misc.c
---- gc-7.2alpha6.orig/misc.c	2011-06-01 00:27:11.000000000 +0900
-+++ gc-7.2alpha6/misc.c	2012-05-08 01:17:58.000000000 +0900
-@@ -141,6 +141,93 @@
+diff -urN gc-7.4.2.orig/misc.c gc-7.4.2/misc.c
+--- gc-7.4.2.orig/misc.c	2014-06-03 15:08:02.000000000 +0900
++++ gc-7.4.2/misc.c	2015-08-04 14:21:02.000000000 +0900
+@@ -161,6 +161,94 @@
  GC_INNER long GC_large_alloc_warn_interval = GC_LARGE_ALLOC_WARN_INTERVAL;
                          /* Interval between unsuppressed warnings.      */
  
@@ -187,13 +184,14 @@ diff -urN gc-7.2alpha6.orig/misc.c gc-7.2alpha6/misc.c
 +	return gctime;
 +}
 +
- /*ARGSUSED*/
- STATIC void * GC_CALLBACK GC_default_oom_fn(size_t bytes_requested)
++
+ STATIC void * GC_CALLBACK GC_default_oom_fn(
+                                         size_t bytes_requested GC_ATTR_UNUSED)
  {
-diff -urN gc-7.2alpha6.orig/reclaim.c gc-7.2alpha6/reclaim.c
---- gc-7.2alpha6.orig/reclaim.c	2011-06-01 00:27:11.000000000 +0900
-+++ gc-7.2alpha6/reclaim.c	2012-05-08 01:25:00.000000000 +0900
-@@ -590,6 +590,7 @@
+diff -urN gc-7.4.2.orig/reclaim.c gc-7.4.2/reclaim.c
+--- gc-7.4.2.orig/reclaim.c	2014-06-03 15:08:02.000000000 +0900
++++ gc-7.4.2/reclaim.c	2015-08-04 14:12:42.000000000 +0900
+@@ -706,6 +706,7 @@
  
        if (GC_print_stats == VERBOSE)
          GET_TIME(start_time);
@@ -201,17 +199,17 @@ diff -urN gc-7.2alpha6.orig/reclaim.c gc-7.2alpha6/rec
  #   endif
  
      for (kind = 0; kind < GC_n_kinds; kind++) {
-@@ -614,6 +615,7 @@
+@@ -730,6 +731,7 @@
          }
      }
  #   ifndef SMALL_CONFIG
 +      GC_timerstop();
        if (GC_print_stats == VERBOSE) {
          GET_TIME(done_time);
-         GC_log_printf("Disposing of reclaim lists took %lu msecs\n",
-diff -urN gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.2/NT_X64_STATIC_THREADS_MAKEFILE
---- gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE	2012-05-12 02:09:00.000000000 +0900
-+++ gc-7.2/NT_X64_STATIC_THREADS_MAKEFILE	2013-06-13 14:43:07.000000000 +0900
+         GC_verbose_log_printf("Disposing of reclaim lists took %lu msecs\n",
+diff -urN gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE
+--- gc-7.4.2.orig/NT_X64_STATIC_THREADS_MAKEFILE	2014-06-03 15:08:01.000000000 +0900
++++ gc-7.4.2/NT_X64_STATIC_THREADS_MAKEFILE	2015-08-04 14:12:42.000000000 +0900
 @@ -22,13 +22,13 @@
  all: gctest.exe cord\de.exe test_cpp.exe
  
@@ -226,11 +224,11 @@ diff -urN gc-7.2.orig/NT_X64_STATIC_THREADS_MAKEFILE g
 -	$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj
 +	$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.cpp /Fo$*.obj
  
- $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h
+ $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\gc_disclaim.h include\private\msvc_dbg.h
  
-diff -urN gc-7.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.2/NT_STATIC_THREADS_MAKEFILE
---- gc-7.2.orig/NT_STATIC_THREADS_MAKEFILE	2012-05-12 02:09:00.000000000 +0900
-+++ gc-7.2/NT_STATIC_THREADS_MAKEFILE	2013-06-13 17:07:36.000000000 +0900
+diff -urN gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.4.2/NT_STATIC_THREADS_MAKEFILE
+--- gc-7.4.2.orig/NT_STATIC_THREADS_MAKEFILE	2014-06-03 15:08:01.000000000 +0900
++++ gc-7.4.2/NT_STATIC_THREADS_MAKEFILE	2015-08-04 14:12:42.000000000 +0900
 @@ -22,10 +22,10 @@
  all: gctest.exe cord\de.exe test_cpp.exe
  
@@ -242,6 +240,5 @@ diff -urN gc-7.2.orig/NT_STATIC_THREADS_MAKEFILE gc-7.
 -	$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE $*.cpp /Fo$*.obj
 +	$(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.cpp /Fo$*.obj
  
- $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\private\msvc_dbg.h
+ $(OBJS) tests\test.obj: include\private\gc_priv.h include\private\gc_hdrs.h include\gc.h include\private\gcconfig.h include\private\gc_locks.h include\private\gc_pmark.h include\gc_mark.h include\gc_disclaim.h include\private\msvc_dbg.h
  
-