X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=libjava%2Fnogc.cc;h=e81fbe18714cd7bb2d676c3ebfaccbaed0eb9655;hb=e998b30fd130bc2764de87643e2a483c6d3ba92b;hp=daf279c8f8559ec32ce814d04b22f947db00bfa5;hpb=c4ceee8556eb7c729912e12f422143ec5a2ed8a3;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/libjava/nogc.cc b/libjava/nogc.cc
index daf279c8f85..e81fbe18714 100644
--- a/libjava/nogc.cc
+++ b/libjava/nogc.cc
@@ -1,6 +1,6 @@
 // nogc.cc - Implement null garbage collector.
 
-/* Copyright (C) 1998, 1999, 2000, 2001  Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002  Free Software Foundation
 
    This file is part of libgcj.
 
@@ -19,13 +19,11 @@ details.  */
 // Total amount of memory allocated.
 static long total = 0;
 
-#ifdef INTERPRETER
 void *
-_Jv_BuildGCDescr(jclass klass)
+_Jv_BuildGCDescr(jclass)
 {
   return 0;
 }
-#endif
 
 void *
 _Jv_AllocObj (jsize size, jclass klass)
@@ -41,7 +39,7 @@ void *
 _Jv_AllocPtrFreeObj (jsize size, jclass klass)
 {
   total += size;
-  ptr_t obj = malloc (size, 1);
+  void *obj = calloc (size, 1);
   if (!obj) _Jv_ThrowNoMemory();
   *((_Jv_VTable **) obj) = klass->vtable;
   return obj;
@@ -61,7 +59,7 @@ void *
 _Jv_AllocBytes (jsize size)
 {
   total += size;
-  ptr_t obj = calloc (size, 1);
+  void *obj = calloc (size, 1);
   if (!obj) _Jv_ThrowNoMemory();
   return obj;
 }
@@ -114,12 +112,12 @@ _Jv_GCFreeMemory (void)
 }
 
 void
-_Jv_GCSetInitialHeapSize (size_t size)
+_Jv_GCSetInitialHeapSize (size_t)
 {
 }
 
 void
-_Jv_GCSetMaximumHeapSize (size_t size)
+_Jv_GCSetMaximumHeapSize (size_t)
 {
 }
 
@@ -138,11 +136,23 @@ _Jv_InitGC (void)
 {
 }
 
+void
+_Jv_GCRegisterDisappearingLink (jobject *)
+{
+}
+
+jboolean
+_Jv_GCCanReclaimSoftReference (jobject)
+{
+  // For now, always reclaim soft references.  FIXME.
+  return true;
+}
+
 #ifdef JV_HASH_SYNCHRONIZATION
 void *
 _Jv_AllocTraceOne (jsize size /* includes vtable slot */) 
 {
-  ptr_t obj = calloc(size, 1);
+  void *obj = calloc(size, 1);
   if (!obj) _Jv_ThrowNoMemory();
   return result;
 }
@@ -150,7 +160,7 @@ _Jv_AllocTraceOne (jsize size /* includes vtable slot */)
 void *
 _Jv_AllocTraceTwo (jsize size /* includes vtable slot */) 
 {
-  ptr_t obj = calloc(size, 1);
+  void *obj = calloc(size, 1);
   if (!obj) _Jv_ThrowNoMemory();
   return result;
 }