===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/parse/gc_risa.c,v
retrieving revision 1.3
retrieving revision 1.11
diff -u -p -r1.3 -r1.11
--- OpenXM_contrib2/asir2000/parse/gc_risa.c	2007/11/11 15:54:03	1.3
+++ OpenXM_contrib2/asir2000/parse/gc_risa.c	2012/12/17 07:20:45	1.11
@@ -1,15 +1,24 @@
-#include "private/gc_priv.h"
+/* $OpenXM: OpenXM_contrib2/asir2000/parse/gc_risa.c,v 1.10 2011/05/11 06:03:53 ohara Exp $ */
+
+#if defined(VISUAL)
+#include "private/gcconfig.h"
+#endif
+#include "gc.h"
 #include <time.h>
 
 void error(char *);
 
 int *StackBottom;
+int in_gc, caught_intr;
 
 void *Risa_GC_malloc(size_t d)
 {
 	void *ret;
 
+	in_gc = 1;
 	ret = (void *)GC_malloc(d);
+	in_gc = 0;
+	if ( caught_intr ) { caught_intr = 0; int_handler(); }
 	if ( !ret )
 		error("GC_malloc : failed to allocate memory");
 	return ret;
@@ -19,39 +28,66 @@ void *Risa_GC_malloc_atomic(size_t d)
 {
 	void *ret;
 
+	in_gc = 1;
 	ret = (void *)GC_malloc_atomic(d);
+	in_gc = 0;
+	if ( caught_intr ) { caught_intr = 0; int_handler(); }
 	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;
+	if ( caught_intr ) { caught_intr = 0; int_handler(); }
+	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;
+	if ( caught_intr ) { caught_intr = 0; int_handler(); }
 	if ( !ret )
 		error("GC_realloc : failed to reallocate memory");
 	return ret;
 }
 
-int get_heapsize()
+void Risa_GC_free(void *p)
 {
-	return GC_heapsize;
+	in_gc = 1;
+	GC_free(p);
+	in_gc = 0;
+	if ( caught_intr ) { caught_intr = 0; int_handler(); }
 }
 
-long get_allocwords()
+
+int get_heapsize()
 {
-#if !defined(GC7)
-	return GC_words_allocd_before_gc + GC_words_allocd;
-#else
-	long n = GC_bytes_allocd_before_gc + GC_bytes_allocd;
-	return BYTES_TO_WORDS(n);
+	return GC_get_heap_size();
+}
+
+#if !defined(BYTES_TO_WORDS)
+#define BYTES_TO_WORDS(x)   ((x)>>2)
 #endif
+
+size_t get_allocwords()
+{
+	size_t n = GC_get_total_bytes();
+	return BYTES_TO_WORDS(n); /* bytes to words */
 }
 
-double gctime;
-static double gcstart,asir_start_time;
+static double asir_start_time;
 
 double get_clock(), get_rtime(), get_current_time();
 
@@ -72,8 +108,6 @@ double get_rtime()
 	return get_current_time() - asir_start_time;
 }
 
-#if defined(THINK_C) || defined(__MWERKS__) || defined(VISUAL) || defined(MSWIN32)
-
 #if defined(VISUAL)
 #include <windows.h>
 
@@ -129,7 +163,7 @@ double get_clock()
 	} else
 		return get_current_time();
 }
-#else
+#elif defined(THINK_C) || defined(__MWERKS__) || defined(MSWIN32)
 double get_current_time()
 {
 	return get_clock();
@@ -142,8 +176,6 @@ double get_clock()
 	c = clock();
 	return (double)c/(double)CLOCKS_PER_SEC;
 }
-#endif
-
 #else
 #include <sys/time.h>
 
@@ -170,7 +202,6 @@ double get_clock()
 }
 #else
 
-#include <sys/time.h>
 #include <sys/resource.h>
 
 double get_clock()
@@ -186,13 +217,32 @@ double get_clock()
 #endif
 #endif
 
-void GC_timerstart() {
-	gcstart = get_clock();
+#if !defined(NO_ASIR_GC)
+extern int GC_free_space_numerator;
+
+void Risa_GC_get_adj(int *nm, int *dn) {
+	*nm = GC_free_space_numerator;
+	*dn = GC_free_space_divisor;
 }
 
-void GC_timerstop() {
-	gctime += get_clock() - gcstart;
+void Risa_GC_set_adj(int nm, int dn) {
+	GC_free_space_numerator = nm;
+	GC_free_space_divisor = dn;
 }
+#else
+void Risa_GC_get_adj(int *nm, int *dn) {
+	*nm = 1;
+	*dn = GC_free_space_divisor;
+}
+
+void Risa_GC_set_adj(int nm, int dn) {
+	GC_free_space_divisor = dn/nm;
+}
+
+double GC_get_gctime() {
+	return 0.0;
+}
+#endif
 
 #if defined(MSWIN32) && !defined(VISUAL)
 #include <signal.h>