===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/gc_risa.c,v
retrieving revision 1.7
retrieving revision 1.17
diff -u -p -r1.7 -r1.17
--- OpenXM_contrib2/asir2000/parse/gc_risa.c	2009/02/06 08:58:28	1.7
+++ OpenXM_contrib2/asir2000/parse/gc_risa.c	2017/08/30 09:40:30	1.17
@@ -1,17 +1,34 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/parse/gc_risa.c,v 1.6 2009/02/05 11:25:59 ohara Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/gc_risa.c,v 1.16 2015/08/14 13:51:56 fujimoto Exp $ */
 
+#if defined(VISUAL) || defined(__MINGW32__)
+#include "private/gcconfig.h"
+#endif
 #include "gc.h"
 #include <time.h>
+#include <signal.h>
 
 void error(char *);
+void int_handler();
 
 int *StackBottom;
+int in_gc, caught_intr;
 
+void check_caught_intr()
+{
+	if ( caught_intr ) {
+		caught_intr = 0;
+		int_handler(SIGINT);
+	}
+}
+
 void *Risa_GC_malloc(size_t d)
 {
 	void *ret;
 
+	in_gc = 1;
 	ret = (void *)GC_malloc(d);
+	in_gc = 0;
+	check_caught_intr();
 	if ( !ret )
 		error("GC_malloc : failed to allocate memory");
 	return ret;
@@ -21,24 +38,51 @@ void *Risa_GC_malloc_atomic(size_t d)
 {
 	void *ret;
 
+	in_gc = 1;
 	ret = (void *)GC_malloc_atomic(d);
+	in_gc = 0;
+	check_caught_intr();
 	if ( !ret )
 		error("GC_malloc_atomic : failed to allocate memory");
 	return ret;
 }
 
+void *Risa_GC_malloc_atomic_ignore_off_page(size_t d)
+{
+	void *ret;
+
+	in_gc = 1;
+	ret = (void *)GC_malloc_atomic_ignore_off_page(d);
+	in_gc = 0;
+	check_caught_intr();
+	if ( !ret )
+		error("GC_malloc_atomic_ignore_off_page : failed to allocate memory");
+	return ret;
+}
+
 void *Risa_GC_realloc(void *p,size_t d)
 {
 	void *ret;
 
+	in_gc = 1;
 	ret = (void *)GC_realloc(p,d);
+	in_gc = 0;
+	check_caught_intr();
 	if ( !ret )
 		error("GC_realloc : failed to reallocate memory");
 	return ret;
 }
 
-int get_heapsize()
+void Risa_GC_free(void *p)
 {
+	in_gc = 1;
+	GC_free(p);
+	in_gc = 0;
+	check_caught_intr();
+}
+
+size_t get_heapsize()
+{
 	return GC_get_heap_size();
 }
 
@@ -46,10 +90,10 @@ int get_heapsize()
 #define BYTES_TO_WORDS(x)   ((x)>>2)
 #endif
 
-long get_allocwords()
+size_t get_allocwords()
 {
 	size_t n = GC_get_total_bytes();
-	return (long)BYTES_TO_WORDS(n); /* bytes to words */
+	return BYTES_TO_WORDS(n); /* bytes to words */
 }
 
 static double asir_start_time;
@@ -73,7 +117,7 @@ double get_rtime()
 	return get_current_time() - asir_start_time;
 }
 
-#if defined(VISUAL)
+#if defined(VISUAL) || defined(__MINGW32__)
 #include <windows.h>
 
 extern int recv_intr,doing_batch;
@@ -81,10 +125,13 @@ void send_intr();
 
 BOOL set_ctrlc_flag(DWORD type)
 {
-	if ( doing_batch )
+	enter_signal_cs();
+	if ( doing_batch ) {
 		send_intr();
-	else
+	}else {
 		recv_intr = 1;
+	}
+	leave_signal_cs();
 	return TRUE;
 }
 
@@ -182,7 +229,7 @@ double get_clock()
 #endif
 #endif
 
-#if 1
+#if !defined(NO_ASIR_GC)
 extern int GC_free_space_numerator;
 
 void Risa_GC_get_adj(int *nm, int *dn) {
@@ -209,7 +256,7 @@ double GC_get_gctime() {
 }
 #endif
 
-#if defined(MSWIN32) && !defined(VISUAL)
+#if defined(MSWIN32) && !defined(VISUAL) && !defined(__MINGW32__)
 #include <signal.h>
 void process_events() {
 	if ( check_break() )
@@ -242,7 +289,7 @@ void process_events() {
 }
 #endif
 
-#if defined(VISUAL) && !defined(MSWIN32)
+#if (defined(VISUAL) || defined(__MINGW32__)) && !defined(MSWIN32)
 int sigsetmask(mask) int mask; { return 0; }
 
 void process_events() {
@@ -254,6 +301,6 @@ int c;
 #else
 		if ( c == ('c' & 037 ) )
 #endif
-			int_handler();
+			int_handler(SIGINT);
 }
 #endif