diff options
| author | Tom Tromey <tromey@redhat.com> | 2005-01-10 19:39:26 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2005-01-10 19:39:26 +0000 |
| commit | 3fd8010046b910ac2477b0feb22f187b653655d1 (patch) | |
| tree | 966d2f436ef2b2ebadf80447ac97eca99afd09f7 /libjava/gnu/gcj/runtime/natVMClassLoader.cc | |
| parent | 2f2bc52472b9fee4d0dd20044e9d41ece39ba4cb (diff) | |
| download | gcc-3fd8010046b910ac2477b0feb22f187b653655d1.zip gcc-3fd8010046b910ac2477b0feb22f187b653655d1.tar.gz gcc-3fd8010046b910ac2477b0feb22f187b653655d1.tar.bz2 | |
PR libgcj/12016, PR libgcj/18405, PR libgcj/17738:
* 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
Diffstat (limited to 'libjava/gnu/gcj/runtime/natVMClassLoader.cc')
| -rw-r--r-- | libjava/gnu/gcj/runtime/natVMClassLoader.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/libjava/gnu/gcj/runtime/natVMClassLoader.cc b/libjava/gnu/gcj/runtime/natVMClassLoader.cc index 42ac2a0..7f2ee34 100644 --- a/libjava/gnu/gcj/runtime/natVMClassLoader.cc +++ b/libjava/gnu/gcj/runtime/natVMClassLoader.cc @@ -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; |