=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/gc-7.0-risa.diff,v retrieving revision 1.9 retrieving revision 1.16 diff -u -p -r1.9 -r1.16 --- OpenXM_contrib2/asir2000/gc-7.0-risa.diff 2013/06/13 08:10:10 1.9 +++ OpenXM_contrib2/asir2000/gc-7.0-risa.diff 2018/09/13 19:20:47 1.16 @@ -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-25 16:00:00.000000000 +0900 @@ -121,6 +121,7 @@ #endif @@ -9,19 +9,18 @@ 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 @@ +@@ -227,8 +228,8 @@ + total_root_size = 2 * stack_size + GC_root_size; 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) { ++ result = scan_size * GC_free_space_numerator / GC_free_space_divisor; ++ 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,74 +28,61 @@ 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 @@ + START_WORLD(); ++ GC_timerstop(); + return(FALSE); + } + 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 @@ - GC_bool retry = FALSE; - - if (gran == 0) return(0); -+#if defined(_MSC_VER) -+ { -+#include -+ extern int recv_intr; -+ if ( recv_intr ) { -+ if ( recv_intr == 1 ) { -+ recv_intr = 0; -+ int_handler(); -+ } else { -+ recv_intr = 0; -+ ox_usr1_handler(0); -+ } -+ } -+ } -+#endif +@@ -1276,7 +1285,7 @@ + } + } - 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 @@ +- blocks_to_get = GC_heapsize/(HBLKSIZE*GC_free_space_divisor) ++ blocks_to_get = GC_heapsize * GC_free_space_numerator /(HBLKSIZE*GC_free_space_divisor) + + needed_blocks; + if (blocks_to_get > MAXHINCR) { + word slop; +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 +173,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,47 +188,41 @@ 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 -@@ -22,13 +22,13 @@ - all: gctest.exe cord\de.exe test_cpp.exe + 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 +@@ -3,7 +3,10 @@ - .c.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 $*.c /Fo$*.obj /wd4701 -+ $(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 $*.c /Fo$*.obj /wd4701 - # Disable "may not be initialized" warnings. They're too approximate. - # Disable crt security warnings, since unfortunately they warn about all sorts - # of safe uses of strncpy. It would be nice to leave the rest enabled. + MY_CPU=AMD64 + CPU=$(MY_CPU) +-!include ++cc=cl ++cdebug=-Ox -DNDEBUG ++cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_AMD64_=1 -DWIN64 -D_WIN64 -DWIN32 -D_WIN32 -D_WINNT -DLARGE_CONFIG ++cvarsmt= -D_MT -MT - .cpp.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 $*.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 + # Make sure that .cc is not viewed as a suffix. It is for VC++2005, but + # not earlier versions. We can deal with either, but not inconsistency. +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 +@@ -3,7 +3,10 @@ - $(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 + MY_CPU=X86 + CPU=$(MY_CPU) +-!include ++cc=cl ++cdebug=-Ox -DNDEBUG ++cflags=-c -nologo -GS -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -D_X86_=1 -DWIN32 -D_WIN32 -W3 -D_WINNT -DLARGE_CONFIG ++cvarsmt= -D_MT -MT -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 -@@ -22,10 +22,10 @@ - all: gctest.exe cord\de.exe test_cpp.exe - - .c.obj: -- $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -DPARALLEL_MARK -D_CRT_SECURE_NO_DEPRECATE $*.c /Fo$*.obj -+ $(cc) $(cdebug) $(cflags) $(cvarsmt) -Iinclude -I$(AO_INCLUDE_DIR) -DALL_INTERIOR_POINTERS -DGC_NOT_DLL -DGC_THREADS -DTHREAD_LOCAL_ALLOC -DPARALLEL_MARK -D_CRT_SECURE_NO_DEPRECATE -DLARGE_CONFIG $*.c /Fo$*.obj - - .cpp.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 $*.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 - - + # Make sure that .cc is not viewed as a suffix. It is for VC++2005, but + # not earlier versions. We can deal with either, but not inconsistency.