[kaffe] CVS kaffe (guilhem): Reverted some work-in-progress patch.

[Kaffe CVS]

PatchSet 5467 
Date: 2004/11/20 18:15:05
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Reverted some work-in-progress patch.

Members: 
	ChangeLog:1.3013->1.3014 
	kaffe/kaffevm/kaffe-gc/gc-mem.c:1.16->1.17 
	kaffe/kaffevm/kaffe-gc/gc-refs.c:1.3->1.4 
	kaffe/kaffevm/kaffe-gc/gc-refs.h:1.3->1.4 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3013 kaffe/ChangeLog:1.3014
--- kaffe/ChangeLog:1.3013	Sat Nov 20 18:10:57 2004
+++ kaffe/ChangeLog	Sat Nov 20 18:15:05 2004
@@ -1,3 +1,8 @@
+2004-11-20  Guilhem Lavaux  <guilhem at kaffe.org>
+
+	* kaffe/kaffevm/gc-refs.[ch], kaffe/kaffevm/gc-mem.[ch]:
+	Reverted some work-in-progress patch.
+
 2004-11-20  Djordje Nikolic  <dmn at ict-tower.com>
 
 	* config/powerpc/linux/md.h:
Index: kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c
diff -u kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c:1.16 kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c:1.17
--- kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c:1.16	Sat Nov 20 15:57:44 2004
+++ kaffe/kaffe/kaffevm/kaffe-gc/gc-mem.c	Sat Nov 20 18:15:13 2004
@@ -388,7 +388,6 @@
 			if (blk == 0) {
 				goto out;
 			}
-			assert(*mptr == NULL);
 			blk->next = *mptr;
 			*mptr = blk;
 
Index: kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.c
diff -u kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.c:1.3 kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.c:1.4
--- kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.c:1.3	Sat Nov 20 15:57:44 2004
+++ kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.c	Sat Nov 20 18:15:13 2004
@@ -31,8 +31,6 @@
 typedef struct _refObject {
   const void*		mem;
   unsigned int		ref;
-  void **weakrefs;
-  
   struct _refObject*	next;
 } refObject;
 
@@ -41,26 +39,10 @@
 } refTable;
 
 static refTable			refObjects;
-static weakRefTable             weakRefObjects;
 
 /* This is a bit homemade.  We need a 7-bit hash from the address here */
 #define	REFOBJHASH(V)	((((uintp)(V) >> 2) ^ ((uintp)(V) >> 9))%REFOBJHASHSZ)
 
-static refObject*
-KaffeGC_addRefToTable(Collector *collector, const void* mem)
-{
-  uint32 idx;
-  
-  idx = REFOBJHASH(mem);
-  for (obj = refObjects.hash[idx]; obj != NULL; obj = obj->next) {
-    /* Found it - just return the object */
-    if (obj->mem == mem)
-      return obj;
-  }
-  
-  obj = (refObject *) KGC_malloc(collector, sizeof(refObject
-}
-
 /*
  * Add a persistent reference to an object.
  */
@@ -118,14 +100,6 @@
 
   /* Not found!! */
   return false;
-}
-
-bool KaffeGC_addWeakRef(struct _Collector *collector, void **ref, const void *obj)
-{
-}
-
-bool KaffeGC_rmWeakRef(struct _Collector *collector, void **ref)
-{
 }
 
 /*      
Index: kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.h
diff -u kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.h:1.3 kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.h:1.4
--- kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.h:1.3	Sat Nov 20 15:57:44 2004
+++ kaffe/kaffe/kaffevm/kaffe-gc/gc-refs.h	Sat Nov 20 18:15:13 2004
@@ -22,7 +22,5 @@
 bool KaffeGC_addRef(struct _Collector *collector, const void* mem);
 bool KaffeGC_rmRef(struct _Collector *collector, void* mem);
 void KaffeGC_walkRefs(struct _Collector* collector);
-void KaffeGC_addWeakRef(struct _Collector *collector, void **ref, const void *obj);
-void KaffeGC_rmWeakRef(struct _Collector *collector, void **ref);
 
 #endif /* __gcrefs_h */