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

Class.h (next): Updated documentation.

Browse source 
* java/lang/Class.h (next): Updated documentation.  Renamed to
	'next_or_version'.
	* java/lang/natClassLoader.cc (_Jv_RegisterClasses): Use
	_Jv_CheckABIVersion.
	(_Jv_RegisterClasses_Counted): Likewise.
	(_Jv_RegisterClassHookDefault): Fix starting condition of
	duplicate-checking loop.
	* include/jvm.h (GCJ_VERSION): New define.
	(GCJ_BINARYCOMPAT_ADDITION): Likewise.
	(_Jv_CheckABIVersion): New function.

From-SVN: r94173
This commit is contained in:
Tom Tromey 2005-01-24 19:05:34 +00:00 • committed by Tom Tromey
parent 635b0f2a72
commit 8bf0438795
4 changed files with 43 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libjava/java/lang/natClassLoader.cc
View file

@ -75,7 +75,7 @@ _Jv_FindClassInCache (_Jv_Utf8Const *name)
jint hash = HASH_UTF (name);
jclass klass;
for (klass = loaded_classes[hash]; klass; klass = klass->next)
for (klass = loaded_classes[hash]; klass; klass = klass->next_or_version)
{
if (_Jv_equalUtf8Consts (name, klass->name))
break;
@ -91,11 +91,11 @@ _Jv_UnregisterClass (jclass the_class)
jint hash = HASH_UTF(the_class->name);
jclass *klass = &(loaded_classes[hash]);
for ( ; *klass; klass = &((*klass)->next))
for ( ; *klass; klass = &((*klass)->next_or_version))
{
if (*klass == the_class)
{
*klass = (*klass)->next;
*klass = (*klass)->next_or_version;
break;
}
}
@ -122,7 +122,8 @@ _Jv_RegisterClasses (const jclass *classes)
{
jclass klass = *classes;
(*_Jv_RegisterClassHook) (klass);
if (_Jv_CheckABIVersion ((unsigned long) klass->next_or_version))
(*_Jv_RegisterClassHook) (klass);
}
}
@ -135,7 +136,8 @@ _Jv_RegisterClasses_Counted (const jclass * classes, size_t count)
{
jclass klass = classes[i];
(*_Jv_RegisterClassHook) (klass);
if (_Jv_CheckABIVersion ((unsigned long) klass->next_or_version))
(*_Jv_RegisterClassHook) (klass);
}
}
@ -144,12 +146,10 @@ _Jv_RegisterClassHookDefault (jclass klass)
{
jint hash = HASH_UTF (klass->name);
// The BC ABI makes this check unnecessary: we always resolve all
// data references via the appropriate class loader, so the kludge
// that required this check has gone.
// If the class is already registered, don't re-register it.
jclass check_class = klass->next;
while (check_class != NULL)
for (jclass check_class = loaded_classes[hash];
check_class != NULL;
check_class = check_class->next_or_version)
{
if (check_class == klass)
{
@ -170,14 +170,12 @@ _Jv_RegisterClassHookDefault (jclass klass)
throw new java::lang::VirtualMachineError (str);
}
}
check_class = check_class->next;
}
// FIXME: this is really bogus!
if (! klass->engine)
klass->engine = &_Jv_soleCompiledEngine;
klass->next = loaded_classes[hash];
klass->next_or_version = loaded_classes[hash];
loaded_classes[hash] = klass;
}