Commit 73068e36 by Andreas Tobler Committed by Tom Tromey

nogc.cc: Remove warnings.

2002-01-26 Andreas Tobler <a.tobler@schweiz.ch>

	* nogc.cc: Remove warnings.
	(_Jv_GCRegisterDisappearingLink, _Jv_GCCanReclaimSoftReference):
	New functions.

From-SVN: r49273
parent 45a2b4f7
2002-01-26 Andreas Tobler <a.tobler@schweiz.ch>
* nogc.cc: Remove warnings.
(_Jv_GCRegisterDisappearingLink, _Jv_GCCanReclaimSoftReference):
New functions.
2002-01-25 Bryce McKinlay <bryce@waitaki.otago.ac.nz> 2002-01-25 Bryce McKinlay <bryce@waitaki.otago.ac.nz>
* java/awt/image/MemoryImageSource.java (newPixels(byte[], ColorModel, * java/awt/image/MemoryImageSource.java (newPixels(byte[], ColorModel,
......
// nogc.cc - Implement null garbage collector. // 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. This file is part of libgcj.
...@@ -20,7 +20,7 @@ details. */ ...@@ -20,7 +20,7 @@ details. */
static long total = 0; static long total = 0;
void * void *
_Jv_BuildGCDescr(jclass klass) _Jv_BuildGCDescr(jclass)
{ {
return 0; return 0;
} }
...@@ -39,7 +39,7 @@ void * ...@@ -39,7 +39,7 @@ void *
_Jv_AllocPtrFreeObj (jsize size, jclass klass) _Jv_AllocPtrFreeObj (jsize size, jclass klass)
{ {
total += size; total += size;
ptr_t obj = malloc (size, 1); void *obj = calloc (size, 1);
if (!obj) _Jv_ThrowNoMemory(); if (!obj) _Jv_ThrowNoMemory();
*((_Jv_VTable **) obj) = klass->vtable; *((_Jv_VTable **) obj) = klass->vtable;
return obj; return obj;
...@@ -59,7 +59,7 @@ void * ...@@ -59,7 +59,7 @@ void *
_Jv_AllocBytes (jsize size) _Jv_AllocBytes (jsize size)
{ {
total += size; total += size;
ptr_t obj = calloc (size, 1); void *obj = calloc (size, 1);
if (!obj) _Jv_ThrowNoMemory(); if (!obj) _Jv_ThrowNoMemory();
return obj; return obj;
} }
...@@ -112,12 +112,12 @@ _Jv_GCFreeMemory (void) ...@@ -112,12 +112,12 @@ _Jv_GCFreeMemory (void)
} }
void void
_Jv_GCSetInitialHeapSize (size_t size) _Jv_GCSetInitialHeapSize (size_t)
{ {
} }
void void
_Jv_GCSetMaximumHeapSize (size_t size) _Jv_GCSetMaximumHeapSize (size_t)
{ {
} }
...@@ -136,11 +136,23 @@ _Jv_InitGC (void) ...@@ -136,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 #ifdef JV_HASH_SYNCHRONIZATION
void * void *
_Jv_AllocTraceOne (jsize size /* includes vtable slot */) _Jv_AllocTraceOne (jsize size /* includes vtable slot */)
{ {
ptr_t obj = calloc(size, 1); void *obj = calloc(size, 1);
if (!obj) _Jv_ThrowNoMemory(); if (!obj) _Jv_ThrowNoMemory();
return result; return result;
} }
...@@ -148,7 +160,7 @@ _Jv_AllocTraceOne (jsize size /* includes vtable slot */) ...@@ -148,7 +160,7 @@ _Jv_AllocTraceOne (jsize size /* includes vtable slot */)
void * void *
_Jv_AllocTraceTwo (jsize size /* includes vtable slot */) _Jv_AllocTraceTwo (jsize size /* includes vtable slot */)
{ {
ptr_t obj = calloc(size, 1); void *obj = calloc(size, 1);
if (!obj) _Jv_ThrowNoMemory(); if (!obj) _Jv_ThrowNoMemory();
return result; return result;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment