1999-04-07 16:42:40 +02:00
|
|
|
// jvm.h - Header file for private implementation information. -*- c++ -*-
|
|
|
|
|
2000-03-07 20:55:28 +01:00
|
|
|
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
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. */
|
|
|
|
|
|
|
|
#ifndef __JAVA_JVM_H__
|
|
|
|
#define __JAVA_JVM_H__
|
|
|
|
|
1999-09-11 00:03:10 +02:00
|
|
|
#include <gcj/javaprims.h>
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
#include <java-assert.h>
|
1999-09-11 00:03:10 +02:00
|
|
|
#include <java-threads.h>
|
|
|
|
// Must include java-gc.h before Object.h for the implementation.
|
|
|
|
#include <java-gc.h>
|
|
|
|
|
|
|
|
#include <java/lang/Object.h>
|
|
|
|
|
|
|
|
// Include cni.h before field.h to enable all definitions. FIXME.
|
|
|
|
#include <gcj/cni.h>
|
|
|
|
#include <gcj/field.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
/* Structure of the virtual table. */
|
|
|
|
struct _Jv_VTable
|
|
|
|
{
|
|
|
|
jclass clas;
|
2000-09-30 11:56:58 +02:00
|
|
|
void *gc_descr;
|
1999-04-07 16:42:40 +02:00
|
|
|
void *method[1];
|
2000-09-30 11:56:58 +02:00
|
|
|
void *get_finalizer() { return method[0]; }
|
1999-04-07 16:42:40 +02:00
|
|
|
};
|
|
|
|
|
2000-06-01 01:50:37 +02:00
|
|
|
// Number of virtual methods on object. FIXME: it sucks that we have
|
|
|
|
// to keep this up to date by hand.
|
|
|
|
#define NUM_OBJECT_METHODS 5
|
|
|
|
|
|
|
|
// This structure is the type of an array's vtable.
|
|
|
|
struct _Jv_ArrayVTable
|
|
|
|
{
|
|
|
|
jclass clas;
|
2000-09-30 11:56:58 +02:00
|
|
|
void *gc_descr;
|
|
|
|
void *method[NUM_OBJECT_METHODS];
|
|
|
|
void *get_finalizer() { return method[0]; }
|
2000-06-01 01:50:37 +02:00
|
|
|
};
|
|
|
|
|
2000-04-21 00:24:33 +02:00
|
|
|
union _Jv_word
|
|
|
|
{
|
|
|
|
jobject o;
|
|
|
|
jint i; // Also stores smaller integral types.
|
|
|
|
jfloat f;
|
|
|
|
jint ia[1]; // Half of _Jv_word2.
|
|
|
|
void* p;
|
|
|
|
|
|
|
|
#if SIZEOF_VOID_P == 8
|
|
|
|
// We can safely put a long or a double in here without increasing
|
|
|
|
// the size of _Jv_Word; we take advantage of this in the interpreter.
|
|
|
|
jlong l;
|
|
|
|
jdouble d;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
jclass clazz;
|
|
|
|
jstring string;
|
|
|
|
struct _Jv_Field *field;
|
|
|
|
struct _Jv_Utf8Const *utf8;
|
|
|
|
struct _Jv_ResolvedMethod *rmethod;
|
|
|
|
};
|
|
|
|
|
|
|
|
union _Jv_word2
|
|
|
|
{
|
|
|
|
jint ia[2];
|
|
|
|
jlong l;
|
|
|
|
jdouble d;
|
|
|
|
};
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
/* Extract a character from a Java-style Utf8 string.
|
|
|
|
* PTR points to the current character.
|
|
|
|
* LIMIT points to the end of the Utf8 string.
|
|
|
|
* PTR is incremented to point after the character thta gets returns.
|
|
|
|
* On an error, -1 is returned. */
|
|
|
|
#define UTF8_GET(PTR, LIMIT) \
|
|
|
|
((PTR) >= (LIMIT) ? -1 \
|
|
|
|
: *(PTR) < 128 ? *(PTR)++ \
|
|
|
|
: (*(PTR)&0xE0) == 0xC0 && ((PTR)+=2)<=(LIMIT) && ((PTR)[-1]&0xC0) == 0x80 \
|
|
|
|
? (((PTR)[-2] & 0x1F) << 6) + ((PTR)[-1] & 0x3F) \
|
|
|
|
: (*(PTR) & 0xF0) == 0xE0 && ((PTR) += 3) <= (LIMIT) \
|
|
|
|
&& ((PTR)[-2] & 0xC0) == 0x80 && ((PTR)[-1] & 0xC0) == 0x80 \
|
|
|
|
? (((PTR)[-3]&0x0F) << 12) + (((PTR)[-2]&0x3F) << 6) + ((PTR)[-1]&0x3F) \
|
|
|
|
: ((PTR)++, -1))
|
|
|
|
|
|
|
|
extern int _Jv_strLengthUtf8(char* str, int len);
|
|
|
|
|
|
|
|
typedef struct _Jv_Utf8Const Utf8Const;
|
|
|
|
_Jv_Utf8Const *_Jv_makeUtf8Const (char *s, int len);
|
[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
1999-08-08 16:06:23 +02:00
|
|
|
_Jv_Utf8Const *_Jv_makeUtf8Const (jstring string);
|
1999-04-07 16:42:40 +02:00
|
|
|
extern jboolean _Jv_equalUtf8Consts (_Jv_Utf8Const *, _Jv_Utf8Const *);
|
|
|
|
extern jboolean _Jv_equal (_Jv_Utf8Const *, jstring, jint);
|
2000-01-04 09:46:52 +01:00
|
|
|
extern jboolean _Jv_equaln (_Jv_Utf8Const *, jstring, jint);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
natField.cc (BooleanClass): Don't define.
* java/lang/reflect/natField.cc (BooleanClass): Don't define.
* java/lang/reflect/natArray.cc (BooleanClass): Don't define.
* java/lang/Class.h (Object): Added `class$' field.
* java/lang/Object.h (Object): Added `class$' field.
* defineclass.cc (ClassClass): Use `class$' form.
(ClassObject): Likewise.
* resolve.cc (ClassObject): Use `class$' form.
(ObjectClass): Likewise.
* interpret.cc (ClassError): Removed.
* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Use
`class$' form.
(IntegerClass): Likewise.
* java/net/natPlainSocketImpl.cc (BooleanClass): Use `class$'
form.
* java/lang/natClassLoader.cc (CloneableClass): Use `class$' form.
(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
SerializableClass): Likewise.
Include Serializable.h, Cloneable.h.
* java/lang/natSystem.cc (SystemClass): Removed.
(init_properties): Use `class$' form.
* java/lang/natObject.cc (CloneableClass): Removed.
(clone): Use `class$' form.
* java/lang/natClass.cc (CloneableClass): Use `class$' form.
(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
ConstructorClass): Likewise.
* java/lang/reflect/natMethod.cc (ObjectClass): Use `class$' form.
(ClassClass, VoidClass, ByteClass, ShortClass, CharacterClass,
IntegerClass, LongClass, FloatClass, DoubleClass): Likewise.
* java/io/natObjectInputStream.cc (ObjectClass): Use `class$'
form.
(ClassClass): Likewise.
* include/jvm.h (StringClass): Use `class$' form.
* prims.cc (ObjectClass): Removed.
(_Jv_RunMain): Use `class$' form.
(_Jv_AllocObject): Likewise.
* jni.cc (ClassClass): Use `class$' form.
(ThrowableClass): Likewise.
(ObjectClass): Likewise.
(MethodClass): Likewise.
(ThreadGroupClass): Likewise.
(NativeThreadClass): Likewise.
* boehm.cc (ObjectClass): Removed.
(ClassClass): Removed.
(_Jv_MarkObj): Use `class$' form.
* gcj/field.h (JvFieldIsRef): Use `class$' form.
Include RawData.h.
From-SVN: r36740
2000-10-06 03:49:32 +02:00
|
|
|
// FIXME: remove this define.
|
|
|
|
#define StringClass java::lang::String::class$
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
/* Type of pointer used as finalizer. */
|
|
|
|
typedef void _Jv_FinalizerFunc (jobject);
|
|
|
|
|
|
|
|
/* Allocate space for a new Java object. */
|
2000-09-30 11:56:58 +02:00
|
|
|
void *_Jv_AllocObj (jsize size, jclass cl) __attribute__((__malloc__));
|
1999-04-07 16:42:40 +02:00
|
|
|
/* Allocate space for an array of Java objects. */
|
2000-09-30 11:56:58 +02:00
|
|
|
void *_Jv_AllocArray (jsize size, jclass cl) __attribute__((__malloc__));
|
1999-04-07 16:42:40 +02:00
|
|
|
/* Allocate space that is known to be pointer-free. */
|
1999-12-06 07:33:56 +01:00
|
|
|
void *_Jv_AllocBytes (jsize size) __attribute__((__malloc__));
|
1999-04-07 16:42:40 +02:00
|
|
|
/* Initialize the GC. */
|
|
|
|
void _Jv_InitGC (void);
|
|
|
|
/* Register a finalizer. */
|
|
|
|
void _Jv_RegisterFinalizer (void *object, _Jv_FinalizerFunc *method);
|
2000-09-30 11:56:58 +02:00
|
|
|
/* Compute the GC descriptor for a class */
|
|
|
|
#ifdef INTERPRETER
|
|
|
|
void * _Jv_BuildGCDescr(jclass);
|
|
|
|
#endif
|
1999-04-07 16:42:40 +02:00
|
|
|
|
2000-02-01 07:14:26 +01:00
|
|
|
/* Allocate some unscanned, unmoveable memory. Return NULL if out of
|
|
|
|
memory. */
|
|
|
|
void *_Jv_MallocUnchecked (jsize size) __attribute__((__malloc__));
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
/* Run finalizers for objects ready to be finalized.. */
|
|
|
|
void _Jv_RunFinalizers (void);
|
|
|
|
/* Run all finalizers. Should be called only before exit. */
|
|
|
|
void _Jv_RunAllFinalizers (void);
|
|
|
|
/* Perform a GC. */
|
|
|
|
void _Jv_RunGC (void);
|
2000-04-02 17:34:17 +02:00
|
|
|
/* Disable and enable GC. */
|
|
|
|
void _Jv_DisableGC (void);
|
|
|
|
void _Jv_EnableGC (void);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
/* Return approximation of total size of heap. */
|
|
|
|
long _Jv_GCTotalMemory (void);
|
|
|
|
/* Return approximation of total free memory. */
|
|
|
|
long _Jv_GCFreeMemory (void);
|
|
|
|
|
1999-10-22 21:43:41 +02:00
|
|
|
/* Set initial heap size. If SIZE==0, ignore. Should be run before
|
|
|
|
_Jv_InitGC. Not required to have any actual effect. */
|
|
|
|
void _Jv_GCSetInitialHeapSize (size_t size);
|
|
|
|
|
|
|
|
/* Set maximum heap size. If SIZE==0, unbounded. Should be run
|
|
|
|
before _Jv_InitGC. Not required to have any actual effect. */
|
|
|
|
void _Jv_GCSetMaximumHeapSize (size_t size);
|
|
|
|
|
|
|
|
/* External interface to setting the heap size. Parses ARG (a number
|
|
|
|
which can optionally have "k" or "m" appended and calls
|
|
|
|
_Jv_GCSetInitialHeapSize. */
|
|
|
|
void _Jv_SetInitialHeapSize (const char *arg);
|
|
|
|
|
|
|
|
/* External interface to setting the maximum heap size. Parses ARG (a
|
|
|
|
number which can optionally have "k" or "m" appended and calls
|
|
|
|
_Jv_GCSetMaximumHeapSize. */
|
|
|
|
void _Jv_SetMaximumHeapSize (const char *arg);
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
/* Allocate some unscanned bytes. Throw exception if out of memory. */
|
1999-12-06 07:33:56 +01:00
|
|
|
void *_Jv_AllocBytesChecked (jsize size) __attribute__((__malloc__));
|
1999-04-07 16:42:40 +02:00
|
|
|
|
1999-10-22 21:43:41 +02:00
|
|
|
extern "C" void JvRunMain (jclass klass, int argc, const char **argv);
|
2000-08-21 08:05:20 +02:00
|
|
|
void _Jv_RunMain (const char* name, int argc, const char **argv, bool is_jar);
|
1999-10-22 21:43:41 +02:00
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
// This function is used to determine the hash code of an object.
|
|
|
|
inline jint
|
|
|
|
_Jv_HashCode (jobject obj)
|
|
|
|
{
|
2000-08-16 17:30:02 +02:00
|
|
|
// This was chosen to yield relatively well distributed results on
|
2000-09-07 00:25:56 +02:00
|
|
|
// both 32- and 64-bit architectures. Note 0x7fffffff is prime.
|
|
|
|
// FIXME: we assume sizeof(long) == sizeof(void *).
|
|
|
|
return (jint) ((unsigned long) obj % 0x7fffffff);
|
1999-04-07 16:42:40 +02:00
|
|
|
}
|
|
|
|
|
1999-11-25 01:36:51 +01:00
|
|
|
// Return a raw pointer to the elements of an array given the array
|
|
|
|
// and its element type. You might think we could just pick a single
|
|
|
|
// array type and use elements() on it, but we can't because we must
|
2000-04-04 01:36:49 +02:00
|
|
|
// account for alignment of the element type. When ARRAY is null, we
|
|
|
|
// obtain the number of bytes taken by the base part of the array.
|
1999-11-25 01:36:51 +01:00
|
|
|
inline char *
|
|
|
|
_Jv_GetArrayElementFromElementType (jobject array,
|
|
|
|
jclass element_type)
|
|
|
|
{
|
|
|
|
char *elts;
|
|
|
|
if (element_type == JvPrimClass (byte))
|
|
|
|
elts = (char *) elements ((jbyteArray) array);
|
|
|
|
else if (element_type == JvPrimClass (short))
|
|
|
|
elts = (char *) elements ((jshortArray) array);
|
|
|
|
else if (element_type == JvPrimClass (int))
|
|
|
|
elts = (char *) elements ((jintArray) array);
|
|
|
|
else if (element_type == JvPrimClass (long))
|
|
|
|
elts = (char *) elements ((jlongArray) array);
|
|
|
|
else if (element_type == JvPrimClass (boolean))
|
|
|
|
elts = (char *) elements ((jbooleanArray) array);
|
|
|
|
else if (element_type == JvPrimClass (char))
|
|
|
|
elts = (char *) elements ((jcharArray) array);
|
|
|
|
else if (element_type == JvPrimClass (float))
|
|
|
|
elts = (char *) elements ((jfloatArray) array);
|
|
|
|
else if (element_type == JvPrimClass (double))
|
|
|
|
elts = (char *) elements ((jdoubleArray) array);
|
|
|
|
else
|
|
|
|
elts = (char *) elements ((jobjectArray) array);
|
|
|
|
return elts;
|
|
|
|
}
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
extern "C" void _Jv_ThrowBadArrayIndex (jint bad_index);
|
2000-04-28 01:13:31 +02:00
|
|
|
extern "C" void _Jv_ThrowNullPointerException (void);
|
1999-12-06 07:33:56 +01:00
|
|
|
extern "C" jobject _Jv_NewArray (jint type, jint size)
|
|
|
|
__attribute__((__malloc__));
|
|
|
|
extern "C" jobject _Jv_NewMultiArray (jclass klass, jint dims, ...)
|
|
|
|
__attribute__((__malloc__));
|
1999-04-07 16:42:40 +02:00
|
|
|
extern "C" void *_Jv_CheckCast (jclass klass, jobject obj);
|
|
|
|
extern "C" void *_Jv_LookupInterfaceMethod (jclass klass, Utf8Const *name,
|
resolve.cc (_Jv_SearchMethodInClass): New function.
2000-03-07 Bryce McKinlay <bryce@albatross.co.nz>
* resolve.cc (_Jv_SearchMethodInClass): New function.
(_Jv_ResolvePoolEntry): Search superinterfaces for interface
methods.
* java/lang/Class.h (_Jv_SearchMethodInClass): New prototype.
2000-03-07 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/Class.h (union _Jv_IDispatchTable): New declaration.
(struct _Jv_ifaces): New declaration.
JV_CLASS: New macro definition.
(getComponentType): Relocate below isArray() for inlining.
(getModifiers): Declare `inline'.
(getSuperclass): Ditto.
(isArray): Ditto.
(isPrimitive): Ditto.
(_Jv_IsAssignableFrom): New prototype.
(_Jv_LookupInterfaceMethodIdx): New prototype. Predeclare with "C"
linkage.
(_Jv_InitClass): Move from natClass.cc. Declare `inline'.
Check for JV_STATE_DONE before invoking initializeClass().
(_Jv_PrepareConstantTimeTables): New prototype.
(_Jv_GetInterfaces): Ditto.
(_Jv_GenerateITable): Ditto.
(_Jv_GetMethodString): Ditto.
(_Jv_AppendPartialITable): Ditto.
(_Jv_FindIIndex): Ditto.
depth, ancestors, idt: New class fields.
* java/lang/natClass.cc (isAssignableFrom): Move functionality to
inline function `_Jv_IsAssignableFrom'. Use that function.
(isInstance): Declare `inline'.
(initializeClass): Get lock on class before checking `state'. Unlock
before calling resolveClass0. Call _Jv_PrepareConstantTimeTables
with the lock held.
(_Jv_LookupInterfaceMethod): Use _Jv_GetMessageString.
(_Jv_IsAssignableFrom): New inline function. Test assignability
using class->depth and ancestor table.
(_Jv_IsInstanceOf): Use _Jv_IsAssignableFrom.
(_Jv_CheckCast): Move from prims.cc. Use JV_CLASS and
_Jv_IsAssignableFrom.
(_Jv_CheckArrayStore): Ditto.
(_Jv_LookupInterfaceMethodIdx): New function.
INITIAL_IOFFSETS_LEN, INITIAL_IFACES_LEN: New #defines.
(_Jv_PrepareConstantTimeTables): New function.
(_Jv_IndexOf): Ditto.
(_Jv_GetInterfaces): Ditto.
(_Jv_GenerateITable): Ditto.
(_Jv_GetMethodString): Ditto.
(_Jv_AppendPartialITable): Ditto.
iindex_mutex, iindex_mutex_initialized: New static fields.
(_Jv_FindIIndex): New function.
* java/lang/natClassLoader.cc (_Jv_NewClass): Set new jclass fields.
* prims.cc (_Jv_CheckCast): Moved to natClass.cc.
(_Jv_CheckArrayStore): Ditto.
(JvNewCharArray, JvNewBooleanArray, JvNewByteArray, JvNewShortArray,
JvNewIntArray, JvNewLongArray, JvNewFloatArray, JvNewDoubleArray):
Moved to gcj/array.h.
(_Jv_Realloc): New function.
* gcj/cni.h: Move _Jv_PrimClass definitions to gcj/array.h.
* gcj/array.h: _Jv_PrimClass definitions moved from gcj/cni.h.
(JvNewCharArray, JvNewBooleanArray, JvNewByteArray,
JvNewShortArray, JvNewIntArray, JvNewLongArray, JvNewFloatArray,
JvNewDoubleArray): Implementations moved from prims.cc and
declared `inline'.
* gcj/javaprims.h (_Jv_Realloc): Prototype.
* include/jvm.h (_Jv_LookupInterfaceMethodIdx): Prototype.
From-SVN: r32382
2000-03-07 10:52:56 +01:00
|
|
|
Utf8Const *signature);
|
|
|
|
extern "C" void *_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface,
|
|
|
|
int meth_idx);
|
1999-04-07 16:42:40 +02:00
|
|
|
extern "C" void _Jv_CheckArrayStore (jobject array, jobject obj);
|
|
|
|
extern "C" void _Jv_RegisterClass (jclass klass);
|
|
|
|
extern "C" void _Jv_RegisterClasses (jclass *classes);
|
[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
1999-08-08 16:06:23 +02:00
|
|
|
extern void _Jv_UnregisterClass (_Jv_Utf8Const*, java::lang::ClassLoader*);
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
extern jclass _Jv_FindClass (_Jv_Utf8Const *name,
|
|
|
|
java::lang::ClassLoader *loader);
|
|
|
|
extern jclass _Jv_FindClassFromSignature (char *,
|
|
|
|
java::lang::ClassLoader *loader);
|
2000-01-04 09:46:52 +01:00
|
|
|
extern void _Jv_GetTypesFromSignature (jmethodID method,
|
|
|
|
jclass declaringClass,
|
|
|
|
JArray<jclass> **arg_types_out,
|
|
|
|
jclass *return_type_out);
|
natConstructor.cc (newInstance): Use _Jv_CallAnyMethodA.
* java/lang/reflect/natConstructor.cc (newInstance): Use
_Jv_CallAnyMethodA.
* include/jvm.h: Declare _Jv_CallAnyMethodA.
* java/lang/reflect/natMethod.cc (_Jv_CallAnyMethodA): Renamed
from _Jv_CallNonvirtualMethodA. Changed interface; overloaded.
Include <jni.h>.
(COPY): Removed.
(invoke): Use _Jv_CallAnyMethodA.
(VAL): Redefined.
* java/lang/Class.h (Class): Declare JvGetFirstStaticField,
JvNumStaticFields, JvNumMethods, and JvGetFirstMethod as friend
functions.
(struct _Jv_Method): Added getNextMethod method.
(JvNumMethods): New function.
(JvGetFirstMethod): Likewise.
* gcj/field.h (JvGetFirstStaticField): New function.
(JvNumStaticFields): Likewise.
(getNextField): Renamed from getNextInstanceField.
(struct _Jv_Field): New method getClass.
* jni.cc: Wrote many new functions.
* include/jni.h (JNI_TRUE): Define.
(JNI_FALSE): Likewise.
(jobject, jclass, jstring, jarray, jthrowable, jobjectArray,
jbyteArray, jshortArray, jintArray, jlongArray, jbooleanArray,
jcharArray, jfloatArray, jdoubleArray): New typedefs.
(jfieldID, jmethodID): Likewise.
(JNI_COMMIT, JNI_ABORT): New defines.
(JNINativeMethod): New struct.
(struct JNINativeInterface): Correctly declared more entries.
(class _Jv_JNIEnv): Added `ex' member.
(JNI_VERSION_1_1): New define.
(JNI_VERSION_1_2): Likewise.
* boehm.cc (_Jv_MarkObj): Use getNextField, not
getNextInstanceField.
From-SVN: r31553
2000-01-22 00:50:31 +01:00
|
|
|
|
|
|
|
extern jobject _Jv_CallAnyMethodA (jobject obj, jclass return_type,
|
|
|
|
jmethodID meth, jboolean is_constructor,
|
|
|
|
JArray<jclass> *parameter_types,
|
|
|
|
jobjectArray args);
|
|
|
|
|
|
|
|
union jvalue;
|
|
|
|
extern jthrowable _Jv_CallAnyMethodA (jobject obj,
|
|
|
|
jclass return_type,
|
|
|
|
jmethodID meth,
|
|
|
|
jboolean is_constructor,
|
|
|
|
JArray<jclass> *parameter_types,
|
|
|
|
jvalue *args,
|
|
|
|
jvalue *result);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
1999-12-06 07:33:56 +01:00
|
|
|
extern jobject _Jv_NewMultiArray (jclass, jint ndims, jint* dims)
|
|
|
|
__attribute__((__malloc__));
|
1999-04-07 16:42:40 +02:00
|
|
|
|
1999-07-21 17:11:56 +02:00
|
|
|
/* Checked divide subroutines. */
|
|
|
|
extern "C"
|
|
|
|
{
|
|
|
|
jint _Jv_divI (jint, jint);
|
|
|
|
jint _Jv_remI (jint, jint);
|
|
|
|
jlong _Jv_divJ (jlong, jlong);
|
|
|
|
jlong _Jv_remJ (jlong, jlong);
|
|
|
|
}
|
|
|
|
|
2000-01-17 16:45:24 +01:00
|
|
|
/* get/set the name of the running executable. */
|
|
|
|
extern char *_Jv_ThisExecutable (void);
|
|
|
|
extern void _Jv_ThisExecutable (const char *);
|
|
|
|
|
2000-02-04 21:49:27 +01:00
|
|
|
/* Return a pointer to a symbol in executable or loaded library. */
|
|
|
|
void *_Jv_FindSymbolInExecutable (const char *);
|
|
|
|
|
2000-02-01 07:14:26 +01:00
|
|
|
/* Initialize JNI. */
|
|
|
|
extern void _Jv_JNI_Init (void);
|
|
|
|
|
2000-02-10 21:31:48 +01:00
|
|
|
/* Get or set the per-thread JNIEnv used by the invocation API. */
|
|
|
|
_Jv_JNIEnv *_Jv_GetCurrentJNIEnv ();
|
|
|
|
void _Jv_SetCurrentJNIEnv (_Jv_JNIEnv *);
|
|
|
|
|
2000-02-18 22:22:06 +01:00
|
|
|
struct _Jv_JavaVM;
|
|
|
|
_Jv_JavaVM *_Jv_GetJavaVM ();
|
|
|
|
|
2000-04-02 17:34:17 +02:00
|
|
|
#ifdef ENABLE_JVMPI
|
|
|
|
#include "jvmpi.h"
|
|
|
|
|
|
|
|
extern void (*_Jv_JVMPI_Notify_OBJECT_ALLOC) (JVMPI_Event *event);
|
|
|
|
extern void (*_Jv_JVMPI_Notify_THREAD_START) (JVMPI_Event *event);
|
|
|
|
extern void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event);
|
|
|
|
#endif
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
#endif /* __JAVA_JVM_H__ */
|