yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PR libgcj/12016, PR libgcj/18405, PR libgcj/17738:

Browse Source 
* java/lang/Package.java (getPackages): Use VMClassLoader when
	appropriate.
	(getPackage): Likewise.
	* prims.cc (_Jv_CreateJavaVM): Call
	_Jv_RegisterBootstrapPackages.
	* include/jvm.h (_Jv_RegisterBootstrapPackages): Declare.
	* java/lang/VMClassLoader.java (getPackage): Rewrote.
	(getPackages): Likewise.
	(definedPackages): New field.
	(definePackageForNative): New method.
	* java/lang/Class.h (_Jv_FindClassInCache): Updated.
	* java/lang/natVMClassLoader.cc (loadClass): Updated.
	* defineclass.cc (handleClassBegin): Use
	ClassLoader.findLoadedClass.
	* java/lang/natClassLoader.cc (_Jv_RegisterInitiatingLoader):
	Rewrote.
	(struct _Jv_LoaderInfo): Removed.
	(initiated_classes): Likewise.
	(_Jv_UnregisterClass): Don't use initiated_classes.
	(_Jv_FindClassInCache): Likewise.  Removed 'loader' argument.
	(_Jv_FindClass): Register classes found during boostrap.
	(BOOTSTRAP_CLASS_LIST_SIZE): New define.
	(bootstrap_class_list): New global.
	(bootstrap_index): Likewise.
	(_Jv_RegisterBootstrapPackages): New function.
	* gnu/gcj/runtime/natVMClassLoader.cc (findClass): Call
	definePackageForNative.
	(findClass): Updated.
	* gnu/gcj/runtime/VMClassLoader.java (definePackageForNative):
	New method.

From-SVN: r93155
This commit is contained in:
Tom Tromey
2005-01-10 19:39:26 +00:00
committed by Tom Tromey
parent 2f2bc52472
commit 3fd8010046
11 changed files with 159 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/gnu/gcj/runtime/VMClassLoader.java
+22 -1
View File
@@ -1,4 +1,4 @@
/* Copyright (C) 1999, 2001, 2002, 2003, 2004 Free Software Foundation
/* Copyright (C) 1999, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
This file is part of libgcj.
@@ -118,6 +118,27 @@ public final class VMClassLoader extends java.net.URLClassLoader
instance.init();
}
// Define a package for something loaded natively.
void definePackageForNative(String className)
{
int lastDot = className.lastIndexOf('.');
if (lastDot != -1)
{
String packageName = className.substring(0, lastDot);
if (getPackage(packageName) == null)
{
// FIXME: this assumes we're defining the core, which
// isn't necessarily so. We could detect this and set up
// appropriately. We could also look at a manifest file
// compiled into the .so.
definePackage(packageName, "Java Platform API Specification",
"GNU", "1.4", "gcj", "GNU",
null, // FIXME: gcj version.
null);
}
}
}
// This keeps track of shared libraries we've already tried to load.
private HashSet tried_libraries = new HashSet();
libjava/gnu/gcj/runtime/natVMClassLoader.cc
+7 -5
View File
@@ -1,6 +1,6 @@
// Native code for VMClassLoader
/* Copyright (C) 2002, 2003 Free Software Foundation
/* Copyright (C) 2002, 2003, 2005 Free Software Foundation
This file is part of libgcj.
@@ -24,7 +24,7 @@ jclass
gnu::gcj::runtime::VMClassLoader::findClass (jstring name)
{
_Jv_Utf8Const *name_u = _Jv_makeUtf8Const (name);
jclass klass = _Jv_FindClassInCache (name_u, 0);
jclass klass = _Jv_FindClassInCache (name_u);
if (! klass && lib_control != LIB_NEVER)
{
@@ -65,12 +65,14 @@ gnu::gcj::runtime::VMClassLoader::findClass (jstring name)
so_base_name = so_base_name->substring (0, nd);
if (loaded)
klass = _Jv_FindClassInCache (name_u, 0);
klass = _Jv_FindClassInCache (name_u);
}
}
// Now try loading using the interpreter.
if (! klass)
// Either define the package, or try loading using the interpreter.
if (klass)
definePackageForNative(name);
else
klass = java::net::URLClassLoader::findClass (name);
return klass;