[multiple changes]

1999-08-09  Anthony Green  <green@cygnus.com>

        * gij.cc: New file.

        * include/config.h.in: Rebuilt.
        * acconfig.h: Add INTERPRETER.

        * configure: Rebuilt.

        * Makefile.in: Rebuilt.
        * Makefile.am (libffi_files): Identify the libffi object files for
        inclusion in libgcj.
        (LIBFFIINCS): Define.

        * interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
        Dummy definition for configurations without an interpreter.

        * java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
        java::lang::Boolean constructor.

        * include/java-interp.h: Always include java-cpool.h.

        * java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
        when INTERPRETER not defined.

        * java/lang/Class.h (finalize): Define.

        * gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
        IOException from File.getCanonicalPath.
        (getStream): Likewise.

        * NEWS: More news.
        * THANKS: More thanks.

1999-08-09  Kresten Krab Thorup  <krab@gnu.org>

        * resolve.cc (get_ffi_type_from_signature): Generate uint16 for
        jchar type.
        (_Jv_PrepareClass): Allow non-abstract classes to
        have abstract subclasses.
        (_Jv_ResolvePoolEntry): Revert subclass check for protected
        fields and methods.
        * interpret.cc (continue1/perform_invoke): Don't sign extend
        uint16 return val.
        (continue1/lshl,lshr): Push long, not int.
        (continue1/ulshr): Use UINT64, not long long.
        * defineclass.cc (handleFieldsEnd): Handle case when all fields
        are static.
        * java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
        * java/lang/FirstThread.java (run): Add top-level exception
        handler.
        (run0): Renamed from run.

1999-08-08  Kresten Krab Thorup  <krab@gnu.org>

        * configure.in (--with-interpreter): Added.
        * include/config.h.in (INTERPRETER): Added.

        * java/lang/ClassLoader.java: File replaced.
        * java/lang/VMClassLoader.java: New file.
        * java/lang/natClassLoader.cc: New file.
        * gnu/gcj/runtime/MethodInvocation.java: New file.
        * gnu/gcj/util/path/SearchPath.java: New file.
        * gnu/gcj/util/path/PathEntry.java: New file.
        * gnu/gcj/util/path/DirectoryPathEntry.java: New file.
        * gnu/gcj/util/path/ZipPathEntry.java: New file.
        * gnu/gcj/util/path/URLPathEntry.java: New file.
        * gnu/gcj/util/path/CacheEntry.java: New file.
        * include/java-interp.h: New file.
        * include/java-cpool.h: New file.
        * include/java-insns.h: New file.
        * defineclass.cc: New file.
        * interpret.cc: New file.
        * resolve.cc: New file.

        * java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
        _Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
        _Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
        (finalize): New.
        (STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
        STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
        prefix.
        (initializeClass): Use new JV_ prefixed names.  Also, call
        ClassLoader::resolveClass instead of _Jv_ResolveClass.

        * java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
        JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
        JV_STATE_LINKED): New.
        (_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
        _Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
        (_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
        _Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
        _Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
        _Jv_InterpMethodInvocation): New friends for interpreter.
        (finalize): New.
        (CONSTANT_Class, CONSTANT_String, etc.): Moved to
        include/java-cpool.h and renamed with JV_ prefix.

        * include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
        decls.
        (_Jv_UnregisterClass): New decl.

        * java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
        class loader argument.
        (_Jv_FindClass): Use class loader.

        * prims.cc (_Jv_makeUtf8Const): New function.
        (_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
        (_Jv_NewPrimArray): Ditto.
        (_Jv_FindClassFromSignature): Ditto.
        * java/lang/reflect/natArray.cc (newInstance): Ditto.
        * java/lang/reflect/natMethod.cc (getType): Ditto.

        * include/java-field.h (_Jv_Field::isRef): Make robust for
        non-resolved contexts.

        * boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
        Also, don't mark class->next field.

        * java/lang/VirtualMachineError.java: Added FIXME note.

        * configure.in (INTERPSPEC): New spec.
        * libgcj.spec.in: Added INTERPSPEC.
        * Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
        gnu/gcj/runtime/MethodInvocation.
        (libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
        (ordinary_java_source_files): Added above mentioned java classes.

        * configure: Rebuilt.
        * Makefile.in: Rebuilt.

From-SVN: r28597

1 files changed, 117 insertions, 0 deletions

diff --git a/libjava/java/lang/VMClassLoader.java b/libjava/java/lang/VMClassLoader.java
new file mode 100644
index 0000000..026f6d8
--- /dev/null
+++ b/libjava/java/lang/VMClassLoader.java
@@ -0,0 +1,117 @@
+/* Copyright (C) 1999  Cygnus Solutions
+
+   This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
+details.  */
+
+/* Author: Kresten Krab Thorup <krab@gnu.org>  */
+
+package java.lang;
+
+import java.io.*;
+import java.net.URL;
+import gnu.gcj.util.path.SearchPath;
+
+final class VMClassLoader extends java.lang.ClassLoader
+{
+  private SearchPath   path;
+  private final String path_seperator;
+  private final String file_seperator;
+  private final char   file_seperator_char;
+    
+  private VMClassLoader () {	
+    path_seperator = System.getProperty ("path.separator", ":");
+    file_seperator = System.getProperty ("file.separator", "/");
+
+    file_seperator_char = file_seperator.charAt (0);
+
+    String class_path = System.getProperty ("java.class.path", ".");
+    path = new SearchPath (class_path);
+  }
+
+  protected Class loadClass(String name,
+			    boolean resolve) 
+    throws java.lang.ClassNotFoundException, java.lang.LinkageError
+  {
+    return loadClassInternal (name, resolve, false);
+  }
+	
+    /** I'm a little in doubt here, if this method is 
+	actually supposed to throw a LinkageError, or not.  
+	The spec, 20.14.3, is a little unclear.  It says:
+
+	`` The general contract of loadClass is that, given the name
+	of a class, it either returns the Class object for the class
+	or throws a ClassNotFoundException.''
+
+	However, by making LinkageError a checked exception, 
+	i.e., mention it directly in the throws clause,
+	we'll force caller to consider that case as well.
+    **/
+
+  protected Class loadClassInternal(String name,
+				    boolean resolve, 
+				    boolean fromBootLoader) 
+    throws java.lang.ClassNotFoundException, java.lang.LinkageError
+  {
+    Class clazz;
+
+    /** TODO: call _Jv_VerifyClassName **/
+    if (   (name.indexOf ('/') != -1)
+	   || (name.charAt (0) == '.')
+	   || (name.indexOf (file_seperator) != -1)
+	   || (name.indexOf ("..") != -1))
+	{
+	    throw new IllegalArgumentException (name);
+	}
+
+    // already loaded?
+    clazz = findLoadedClass (name);
+
+    // we need access to the boot class loader here
+    if (clazz == null && !fromBootLoader)
+      clazz = findBootClass (name);
+
+    if (clazz == null)
+      {
+	StringBuffer res = new StringBuffer ();
+
+	// here we do actually replace .'s with /'s because
+	// we're going to find something in the file system.
+	res.append (name.replace ('.', file_seperator_char));
+	res.append (".class");
+		
+	byte[] data = getResourceAsBytes (res.toString ());
+
+	if (data == null)
+	  throw new ClassNotFoundException (name);
+
+	clazz = defineClass (name, data, 0, data.length);
+	    
+      }
+
+    if (resolve && clazz != null)
+      resolveClass (clazz);
+
+    return clazz;
+  }
+
+  private native Class findBootClass (String name);
+
+  public InputStream getResourceAsStream(String name) 
+  {
+    return path.getStream (name);
+  }
+
+  public URL getResource(String name) 
+  {
+    return path.getURL (name);
+  }
+
+  public byte[] getResourceAsBytes(String name) 
+  {
+    return path.getBytes (name);
+  }
+}