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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@93155 138bc75d-0d04-0410-961f-82ee72b054a4
Showing
- libjava/ChangeLog 34 additions, 0 deletionslibjava/ChangeLog
- libjava/defineclass.cc 2 additions, 2 deletionslibjava/defineclass.cc
- libjava/gnu/gcj/runtime/VMClassLoader.java 22 additions, 1 deletionlibjava/gnu/gcj/runtime/VMClassLoader.java
- libjava/gnu/gcj/runtime/natVMClassLoader.cc 7 additions, 5 deletionslibjava/gnu/gcj/runtime/natVMClassLoader.cc
- libjava/include/jvm.h 2 additions, 0 deletionslibjava/include/jvm.h
- libjava/java/lang/Class.h 3 additions, 5 deletionslibjava/java/lang/Class.h
- libjava/java/lang/Package.java 3 additions, 6 deletionslibjava/java/lang/Package.java
- libjava/java/lang/VMClassLoader.java 31 additions, 5 deletionslibjava/java/lang/VMClassLoader.java
- libjava/java/lang/natClassLoader.cc 47 additions, 79 deletionslibjava/java/lang/natClassLoader.cc
- libjava/java/lang/natVMClassLoader.cc 5 additions, 2 deletionslibjava/java/lang/natVMClassLoader.cc
- libjava/prims.cc 3 additions, 1 deletionlibjava/prims.cc
Loading
Please register or sign in to comment