FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

prims.cc: Some old cleanups.

Browse source 
* libjava/prims.cc: Some old cleanups.  The collector now
	handles test for out of memory.
	* libjava/prims.cc, libjava/gcj/javaprims.h:
	(_Jv_AllocObjectNoInitNoFinalizer, _Jv_AllocObjectNoFinalizer):
	New functions for finalizer-free allocation.
	(jvmpi_notify_alloc): Became separate function.
	* libjava/java/lang/Object.h, libjava/include/jvm.h: Adjust for
	revised vtable layout on IA64.  With TARGET_VTABLE_USES_DESCRIPTORS,
	there is only one extra descriptor.

From-SVN: r48002
This commit is contained in:
Hans Boehm 2001-12-14 18:43:55 +00:00 • committed by Hans Boehm
parent b6bfa8766b
commit 938f37772e
5 changed files with 79 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

20
libjava/include/jvm.h
View file

@ -28,18 +28,12 @@ details. */
struct _Jv_VTable
{
#ifdef __ia64__
jclass clas;
unsigned long : 64;
void *gc_descr;
unsigned long : 64;
typedef struct { void *pc, *gp; } vtable_elt;
#else
jclass clas;
void *gc_descr;
typedef void *vtable_elt;
#endif
jclass clas;
void *gc_descr;
// This must be last, as derived classes "extend" this by
// adding new data members.
@ -48,12 +42,20 @@ struct _Jv_VTable
#ifdef __ia64__
void *get_method(int i) { return &method[i]; }
void set_method(int i, void *fptr) { method[i] = *(vtable_elt *)fptr; }
void *get_finalizer()
{
// We know that get_finalizer is only used for checking whether
// this object needs to have a finalizer registered. So it is
// safe to simply return just the PC component of the vtable
// slot.
return ((vtable_elt *)(get_method(0)))->pc;
}
#else
void *get_method(int i) { return method[i]; }
void set_method(int i, void *fptr) { method[i] = fptr; }
void *get_finalizer() { return get_method(0); }
#endif
void *get_finalizer() { return get_method(0); }
static size_t vtable_elt_size() { return sizeof(vtable_elt); }
static _Jv_VTable *new_vtable (int count);
};