58eb6e7cef
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
115 lines
3.7 KiB
C++
115 lines
3.7 KiB
C++
// jvm.h - Header file for private implementation information. -*- c++ -*-
|
|
|
|
/* Copyright (C) 1998, 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. */
|
|
|
|
#ifndef __JAVA_JVM_H__
|
|
#define __JAVA_JVM_H__
|
|
|
|
#include <java-assert.h>
|
|
#include <java-field.h>
|
|
|
|
/* Structure of the virtual table. */
|
|
struct _Jv_VTable
|
|
{
|
|
jclass clas;
|
|
void *method[1];
|
|
};
|
|
|
|
/* 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);
|
|
_Jv_Utf8Const *_Jv_makeUtf8TypeConst (char* s, int len);
|
|
_Jv_Utf8Const *_Jv_makeUtf8Const (jstring string);
|
|
extern jboolean _Jv_equalUtf8Consts (_Jv_Utf8Const *, _Jv_Utf8Const *);
|
|
extern jboolean _Jv_equal (_Jv_Utf8Const *, jstring, jint);
|
|
|
|
#define StringClass _CL_Q34java4lang6String
|
|
extern java::lang::Class StringClass;
|
|
|
|
/* Type of pointer used as finalizer. */
|
|
typedef void _Jv_FinalizerFunc (jobject);
|
|
|
|
/* Allocate space for a new Java object. */
|
|
void *_Jv_AllocObj (jsize size);
|
|
/* Allocate space for an array of Java objects. */
|
|
void *_Jv_AllocArray (jsize size);
|
|
/* Allocate space that is known to be pointer-free. */
|
|
void *_Jv_AllocBytes (jsize size);
|
|
/* Initialize the GC. */
|
|
void _Jv_InitGC (void);
|
|
/* Register a finalizer. */
|
|
void _Jv_RegisterFinalizer (void *object, _Jv_FinalizerFunc *method);
|
|
|
|
/* 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);
|
|
|
|
/* Return approximation of total size of heap. */
|
|
long _Jv_GCTotalMemory (void);
|
|
/* Return approximation of total free memory. */
|
|
long _Jv_GCFreeMemory (void);
|
|
|
|
/* Allocate some unscanned bytes. Throw exception if out of memory. */
|
|
void *_Jv_AllocBytesChecked (jsize size);
|
|
|
|
// This function is used to determine the hash code of an object.
|
|
inline jint
|
|
_Jv_HashCode (jobject obj)
|
|
{
|
|
return (jint) obj;
|
|
}
|
|
|
|
extern "C" void _Jv_ThrowBadArrayIndex (jint bad_index);
|
|
extern "C" jobject _Jv_NewArray (jint type, jint size);
|
|
extern "C" jobject _Jv_NewMultiArray (jclass klass, jint dims, ...);
|
|
extern "C" void *_Jv_CheckCast (jclass klass, jobject obj);
|
|
extern "C" void *_Jv_LookupInterfaceMethod (jclass klass, Utf8Const *name,
|
|
Utf8Const *signature);
|
|
extern "C" void _Jv_CheckArrayStore (jobject array, jobject obj);
|
|
extern "C" void _Jv_RegisterClass (jclass klass);
|
|
extern "C" void _Jv_RegisterClasses (jclass *classes);
|
|
extern void _Jv_UnregisterClass (_Jv_Utf8Const*, java::lang::ClassLoader*);
|
|
|
|
extern jclass _Jv_FindClass (_Jv_Utf8Const *name,
|
|
java::lang::ClassLoader *loader);
|
|
extern jclass _Jv_FindClassFromSignature (char *,
|
|
java::lang::ClassLoader *loader);
|
|
|
|
extern jobject _Jv_NewMultiArray (jclass, jint ndims, jint* dims);
|
|
|
|
/* 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);
|
|
}
|
|
|
|
#endif /* __JAVA_JVM_H__ */
|