[kaffe] CVS kaffe (robilad): unified gd-refs.h again

Kaffe CVS cvs-commits at kaffe.org
Fri Jan 18 14:21:25 PST 2008


PatchSet 7689 
Date: 2008/01/18 22:19:54
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
unified gd-refs.h again

2008-01-18  Dalibor Topic  <robilad at kaffe.org>

        * kaffe/kaffevm/Makefile.am (DIST_SUBDIRS): Removed jni and verifier dirs.
        (libkaffe_la_SOURCES) Added gc-refs-h.

        * kaffe/kaffevm/gc-refs.h: New file. Moved over from ...
        * kaffe/kaffevm/kaffe-gc/gc-refs.h: ... here. Removed.
        * kaffe/kaffevm/boehm-gc/gc-refs.h: Removed.

        * kaffe/kaffevm/boehm-gc/Makefile.am,
        kaffe/kaffevm/kaffe-gc/Makefile.am: (libkaffegc_la_SOURCES) Removed gc-refs.h.

Members: 
	ChangeLog:1.5191->1.5192 
	kaffe/kaffevm/Makefile.am:1.107->1.108 
	kaffe/kaffevm/Makefile.in:1.277->1.278 
	kaffe/kaffevm/gc-refs.h:INITIAL->1.1 
	kaffe/kaffevm/boehm-gc/Makefile.am:1.13->1.14 
	kaffe/kaffevm/boehm-gc/Makefile.in:1.89->1.90 
	kaffe/kaffevm/boehm-gc/gc-refs.h:1.4->1.5(DEAD) 
	kaffe/kaffevm/kaffe-gc/Makefile.am:1.9->1.10 
	kaffe/kaffevm/kaffe-gc/Makefile.in:1.87->1.88 
	kaffe/kaffevm/kaffe-gc/gc-refs.h:1.6->1.7(DEAD) 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.5191 kaffe/ChangeLog:1.5192
--- kaffe/ChangeLog:1.5191	Fri Jan 18 18:49:00 2008
+++ kaffe/ChangeLog	Fri Jan 18 22:19:54 2008
@@ -1,5 +1,17 @@
 2008-01-18  Dalibor Topic  <robilad at kaffe.org>
 
+	* kaffe/kaffevm/Makefile.am (DIST_SUBDIRS): Removed jni and verifier dirs.
+	(libkaffe_la_SOURCES) Added gc-refs-h.
+
+	* kaffe/kaffevm/gc-refs.h: New file. Moved over from ...
+	* kaffe/kaffevm/kaffe-gc/gc-refs.h: ... here. Removed. 
+	* kaffe/kaffevm/boehm-gc/gc-refs.h: Removed. 
+
+	* kaffe/kaffevm/boehm-gc/Makefile.am,
+	kaffe/kaffevm/kaffe-gc/Makefile.am: (libkaffegc_la_SOURCES) Removed gc-refs.h.
+
+2008-01-18  Dalibor Topic  <robilad at kaffe.org>
+
 	* kaffe/kaffevm/Makefile.am (libkaffe_la_SOURCES): Added jni and
 	verifier sources.
 	(SUBDIRS): Removed jni and verifier directories. 
Index: kaffe/kaffe/kaffevm/Makefile.am
diff -u kaffe/kaffe/kaffevm/Makefile.am:1.107 kaffe/kaffe/kaffevm/Makefile.am:1.108
--- kaffe/kaffe/kaffevm/Makefile.am:1.107	Fri Jan 18 18:49:02 2008
+++ kaffe/kaffe/kaffevm/Makefile.am	Fri Jan 18 22:19:56 2008
@@ -10,7 +10,7 @@
 # of this file. 
 
 SUBDIRS = $(ENGINE_NAME) systems $(GC_NAME) gcj
-DIST_SUBDIRS = boehm-gc kaffe-gc intrp jit jit3 systems gcj verifier jni
+DIST_SUBDIRS = boehm-gc kaffe-gc intrp jit jit3 systems gcj
 
 EXTRA_DIST = \
 	kaffe.def \
@@ -111,6 +111,7 @@
 	findInJar.c \
 	fp.c \
 	gc.c \
+	gc-refs.h \
 	hashtab.c \
 	itypes.c \
 	jar.c \
Index: kaffe/kaffe/kaffevm/Makefile.in
diff -u kaffe/kaffe/kaffevm/Makefile.in:1.277 kaffe/kaffe/kaffevm/Makefile.in:1.278
--- kaffe/kaffe/kaffevm/Makefile.in:1.277	Fri Jan 18 18:49:03 2008
+++ kaffe/kaffe/kaffevm/Makefile.in	Fri Jan 18 22:19:56 2008
@@ -361,7 +361,7 @@
 top_srcdir = @top_srcdir@
 with_engine = @with_engine@
 SUBDIRS = $(ENGINE_NAME) systems $(GC_NAME) gcj
-DIST_SUBDIRS = boehm-gc kaffe-gc intrp jit jit3 systems gcj verifier jni
+DIST_SUBDIRS = boehm-gc kaffe-gc intrp jit jit3 systems gcj
 EXTRA_DIST = \
 	kaffe.def \
 	systems/win32/winio.c \
@@ -450,6 +450,7 @@
 	findInJar.c \
 	fp.c \
 	gc.c \
+	gc-refs.h \
 	hashtab.c \
 	itypes.c \
 	jar.c \
===================================================================
Checking out kaffe/kaffe/kaffevm/gc-refs.h
RCS:  /home/cvs/kaffe/kaffe/kaffe/kaffevm/gc-refs.h,v
VERS: 1.1
***************
--- /dev/null	Sun Aug  4 19:57:58 2002
+++ kaffe/kaffe/kaffevm/gc-refs.h	Fri Jan 18 22:21:24 2008
@@ -0,0 +1,30 @@
+/*
+ * gc-refs.h
+ * Manage root set for garbage collector
+ *
+ * Copyright (c) 1996, 1997
+ *      Transvirtual Technologies, Inc.  All rights reserved.
+ *
+ * Copyright (c) 2004
+ *      The Kaffe.org's developers. See ChangeLog for details.
+ *
+ * See the file "license.terms" for information on usage and redistribution 
+ * of this file. 
+ */
+
+#ifndef __gcrefs_h
+#define __gcrefs_h
+
+#include "gtypes.h"
+#include "gc.h"
+
+struct _Collector;
+bool KaffeGC_addRef(struct _Collector *collector, const void* mem);
+bool KaffeGC_rmRef(struct _Collector *collector, void* mem);
+void KaffeGC_walkRefs(struct _Collector* collector);
+bool KaffeGC_addWeakRef(struct _Collector *collector, void *mem, void **obj);
+bool KaffeGC_rmWeakRef(struct _Collector *collector, void *mem, void **obj);
+void KaffeGC_clearWeakRef(struct _Collector *collector, void *mem);
+void KaffeGC_initRefs(void);
+
+#endif /* __gcrefs_h */
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.am
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.13 kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.14
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.am:1.13	Fri Jan 18 03:34:13 2008
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.am	Fri Jan 18 22:19:57 2008
@@ -30,7 +30,6 @@
 	gc2.c \
 	gc2.h \
 	gc-refs.c \
-	gc-refs.h \
 	gc-kaffe.c \
 	gc-kaffe.h
 
Index: kaffe/kaffe/kaffevm/boehm-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.89 kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.90
--- kaffe/kaffe/kaffevm/boehm-gc/Makefile.in:1.89	Fri Jan 18 03:34:13 2008
+++ kaffe/kaffe/kaffevm/boehm-gc/Makefile.in	Fri Jan 18 22:19:57 2008
@@ -313,7 +313,6 @@
 	gc2.c \
 	gc2.h \
 	gc-refs.c \
-	gc-refs.h \
 	gc-kaffe.c \
 	gc-kaffe.h
 
===================================================================
Checking out kaffe/kaffe/kaffevm/boehm-gc/gc-refs.h
RCS:  /home/cvs/kaffe/kaffe/kaffe/kaffevm/boehm-gc/Attic/gc-refs.h,v
VERS: 1.4
***************
--- kaffe/kaffe/kaffevm/boehm-gc/gc-refs.h	Fri Jan 18 22:21:25 2008
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,26 +0,0 @@
-/*
- * gc-refs.h
- * Manage root set for the boehm-weiser garbage collector
- *
- * Copyright (c) 2004
- *      The Kaffe.org's developers. See ChangeLog for details.
- *
- * See the file "license.terms" for information on usage and redistribution 
- * of this file. 
- */
-
-#ifndef __gcrefs_h
-#define __gcrefs_h
-
-#include "gtypes.h"
-#include "gc.h"
-
-struct _Collector;
-bool KaffeGC_addRef(struct _Collector *collector, const void* mem);
-bool KaffeGC_rmRef(struct _Collector *collector, void* mem);
-bool KaffeGC_addWeakRef(struct _Collector *collector, void *mem, void **obj);
-bool KaffeGC_rmWeakRef(struct _Collector *collector, void *mem, void **obj);
-void KaffeGC_clearWeakRef(struct _Collector *collector, void *mem);
-void KaffeGC_initRefs();
-
-#endif /* __gcrefs_h */
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am:1.9 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am:1.10
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am:1.9	Mon Oct  1 14:51:19 2007
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.am	Fri Jan 18 22:19:57 2008
@@ -32,8 +32,7 @@
 	gc-incremental.h \
 	gc-mem.c \
 	gc-mem.h \
-	gc-refs.c \
-	gc-refs.h 
+	gc-refs.c 
 
 libkaffegc_la_DEPENDENCIES = \
         $(top_builddir)/kaffe/kaffevm/systems/$(THREAD_SYSTEM)/libkthread.la
Index: kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in
diff -u kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.87 kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.88
--- kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in:1.87	Sun Jan  6 19:05:24 2008
+++ kaffe/kaffe/kaffevm/kaffe-gc/Makefile.in	Fri Jan 18 22:19:57 2008
@@ -316,8 +316,7 @@
 	gc-incremental.h \
 	gc-mem.c \
 	gc-mem.h \
-	gc-refs.c \
-	gc-refs.h 
+	gc-refs.c 
 
 libkaffegc_la_DEPENDENCIES = \
         $(top_builddir)/kaffe/kaffevm/systems/$(THREAD_SYSTEM)/libkthread.la
===================================================================
Checking out kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.h
RCS:  /home/cvs/kaffe/kaffe/kaffe/kaffevm/kaffe-gc/Attic/gc-refs.h,v
VERS: 1.6
***************
--- kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.h	Fri Jan 18 22:21:25 2008
+++ /dev/null	Sun Aug  4 19:57:58 2002
@@ -1,30 +0,0 @@
-/*
- * gc-refs.h
- * Manage root set for garbage collector
- *
- * Copyright (c) 1996, 1997
- *      Transvirtual Technologies, Inc.  All rights reserved.
- *
- * Copyright (c) 2004
- *      The Kaffe.org's developers. See ChangeLog for details.
- *
- * See the file "license.terms" for information on usage and redistribution 
- * of this file. 
- */
-
-#ifndef __gcrefs_h
-#define __gcrefs_h
-
-#include "gtypes.h"
-#include "gc.h"
-
-struct _Collector;
-bool KaffeGC_addRef(struct _Collector *collector, const void* mem);
-bool KaffeGC_rmRef(struct _Collector *collector, void* mem);
-void KaffeGC_walkRefs(struct _Collector* collector);
-bool KaffeGC_addWeakRef(struct _Collector *collector, void *mem, void **obj);
-bool KaffeGC_rmWeakRef(struct _Collector *collector, void *mem, void **obj);
-void KaffeGC_clearWeakRef(struct _Collector *collector, void *mem);
-void KaffeGC_initRefs(void);
-
-#endif /* __gcrefs_h */




More information about the kaffe mailing list