diff options
| author | krab <krab@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-18 14:16:42 +0000 |
|---|---|---|
| committer | krab <krab@138bc75d-0d04-0410-961f-82ee72b054a4> | 1999-08-18 14:16:42 +0000 |
| commit | 009022b277bdd8bc12a66677811adee7135ec042 (patch) | |
| tree | 3bcaf8f2877d654d67d3e2cc982a85a71299ca35 /libjava/resolve.cc | |
| parent | 71a3455af48e575974a233c4174aeb50c835a469 (diff) | |
| download | gcc-009022b277bdd8bc12a66677811adee7135ec042.tar.gz | |
* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): Renamed
from _Jv_InternClassStrings.
* prims.cc (_Jv_RunMain): New function.
(JvRunMain): Remove gij-support.
* gij.cc (main): Use _Jv_RunMain.
* java/util/zip/ZipFile.java: Call readDirectory in constructor.
* interpret.cc (PUSHA, PUSHI, PUSHF, PUSHL, PUSHD): Don't store
argument in temp variable.
(continue1): For all op_x2y insns, use temp variable for
intermediate value. Also remove some comments.
* java/lang/natClass.cc (newInstance): Call _Jv_InitClass.
(forName): Don't call _Jv_InitClass.
* java/lang/Class.java (getResource,getResourceAsStream): Implement.
* java/util/zip/ZipEntry.java (ZipEntry(ZipEntry)): New construcor.
* java/util/jar/JarInputStream.java: New file.
* java/util/jar/JarEntry.java: New file.
* java/util/jar/JarFile.java: New file.
* java/net/URLClassLoader.java: New file.
* java/net/JarURLConnection.java: New file.
* gnu/gcj/protocol/jar/Handler.java: New file.
* gnu/gcj/protocol/jar/Connection.java: New file.
* java/security/SecureClassLoader.java: New file.
* java/lang/ClassLoader.java (parent): New variable.
(ClassLoader (ClassLoader)): new constructor.
(findClass): New method.
(loadClass): Add default 1.2 implementation.
(getSystemResourceAsBytes, getResourceAsBytes): Removed.
(readfully): Removed.
* gnu/gcj/runtime/VMClassLoader.java: Moved from java/lang.
(findSystemClass): New method.
(VMClassLoader): Constructor rewritten.
(init): New method.
All other methods removed.
* java/lang/natClassLoader.cc: Change use of java::lang::VMClassLoader
to gnu::gcj::runtime::VMClassLoader.
(_Jv_InternClassStrings): Use _Jv_ResolvePoolEntry. Also handle
class entries.
(VMClassLoader::findSystemClass): renamed from findBootClass.
* Makefile.am: Add new files.
(FirstThread.h, ThreadGroup.h): Add _Jv_Main friend.
* Makefile.in: Rebuilt.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@28748 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/resolve.cc')
| -rw-r--r-- | libjava/resolve.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libjava/resolve.cc b/libjava/resolve.cc index d5ab739833a..9b3167a36e9 100644 --- a/libjava/resolve.cc +++ b/libjava/resolve.cc @@ -12,8 +12,6 @@ details. */ #include <java-interp.h> -#ifdef INTERPRETER - #include <cni.h> #include <jvm.h> #include <string.h> @@ -30,6 +28,8 @@ details. */ #include <java/lang/ClassNotFoundException.h> #include <java/lang/IncompatibleClassChangeError.h> +#ifdef INTERPRETER + static void throw_internal_error (char *msg) __attribute__ ((__noreturn__)); static void throw_class_format_error (jstring msg) @@ -124,6 +124,7 @@ _Jv_ResolvePoolEntry (jclass klass, int index) } break; + case JV_CONSTANT_Fieldref: { _Jv_ushort class_index, name_and_type_index; @@ -316,6 +317,7 @@ _Jv_ResolvePoolEntry (jclass klass, int index) return pool->data[index]; } + void _Jv_ResolveField (_Jv_Field *field, java::lang::ClassLoader *loader) { |