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
170 lines
3.5 KiB
C++
170 lines
3.5 KiB
C++
// java-field.h - Header file for fieldID instances. -*- 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_FIELD_H__
|
|
#define __JAVA_FIELD_H__
|
|
|
|
#include <java/lang/Class.h>
|
|
#include <java/lang/reflect/Field.h>
|
|
|
|
#define _Jv_FIELD_UNRESOLVED_FLAG 0x8000
|
|
#define _Jv_FIELD_CONSTANT_VALUE 0x4000
|
|
|
|
struct _Jv_Field
|
|
{
|
|
#ifndef COMPACT_FIELDS
|
|
struct _Jv_Utf8Const* name;
|
|
#endif
|
|
|
|
/* The type of the field, if isResolved().
|
|
If !isResolved(): The fields's signature as a (Utf8Const*). */
|
|
jclass type;
|
|
|
|
_Jv_ushort flags;
|
|
|
|
#ifdef COMPACT_FIELDS
|
|
short nameIndex; /* ofsfet in class's name table */
|
|
#else
|
|
_Jv_ushort bsize; /* not really needed ... */
|
|
#endif
|
|
|
|
union {
|
|
int boffset; /* offset in bytes for instance field */
|
|
void* addr; /* address of static field */
|
|
} u;
|
|
|
|
#ifdef __cplusplus
|
|
jboolean isResolved ()
|
|
{ return ! (flags & _Jv_FIELD_UNRESOLVED_FLAG); }
|
|
|
|
public:
|
|
|
|
int getOffset () { return u.boffset; }
|
|
|
|
jobject getObjectField (jobject obj)
|
|
{ return *(jobject *)((char *)obj + getOffset ()); }
|
|
|
|
jfieldID getNextInstanceField () { return this + 1; }
|
|
|
|
jboolean isRef ()
|
|
{
|
|
if (!isResolved ())
|
|
{
|
|
char first = ((_Jv_Utf8Const*)type)->data[0];
|
|
return first == '[' || first == 'L';
|
|
}
|
|
else
|
|
{
|
|
return ! type->isPrimitive ();
|
|
}
|
|
}
|
|
|
|
// FIXME - may need to mask off internal flags.
|
|
int getModifiers() { return flags; }
|
|
|
|
#ifdef COMPACT_FIELDS
|
|
_Jv_Utf8Const * getNameUtf8Const (jclass cls)
|
|
{ return clas->fieldNames + nameIndex; }
|
|
#else
|
|
_Jv_Utf8Const * getNameUtf8Const (jclass) { return name; }
|
|
#endif
|
|
#endif
|
|
};
|
|
|
|
#ifdef __cplusplus
|
|
inline jbyte
|
|
_Jv_GetStaticByteField (jclass, _Jv_Field* field)
|
|
{
|
|
return * (jbyte *) field->u.addr;
|
|
}
|
|
|
|
inline jshort
|
|
_Jv_GetStaticShortField (jclass, _Jv_Field* field)
|
|
{
|
|
return * (jshort *) field->u.addr;
|
|
}
|
|
|
|
inline jint
|
|
_Jv_GetStaticIntField (jclass, _Jv_Field* field)
|
|
{
|
|
return * (jint *) field->u.addr;
|
|
}
|
|
|
|
inline jlong
|
|
_Jv_GetStaticLongField (jclass, _Jv_Field* field)
|
|
{
|
|
return * (jlong *) field->u.addr;
|
|
}
|
|
|
|
inline jobject
|
|
_Jv_GetObjectField (jobject obj, _Jv_Field* field)
|
|
{
|
|
return field->getObjectField (obj);
|
|
}
|
|
|
|
inline jbyte
|
|
_Jv_GetByteField (jobject obj, _Jv_Field* field)
|
|
{
|
|
return * (jbyte *) ((char*) obj + field->getOffset ());
|
|
}
|
|
|
|
inline jshort
|
|
_Jv_GetShortField (jobject obj, _Jv_Field* field)
|
|
{
|
|
return * (jshort *) ((char*) obj + field->getOffset ());
|
|
}
|
|
inline jint
|
|
_Jv_GetIntField (jobject obj, _Jv_Field* field)
|
|
{
|
|
return * (jint *) ((char*) obj + field->getOffset ());
|
|
}
|
|
inline jlong
|
|
_Jv_GetLongField (jobject obj, _Jv_Field* field)
|
|
{
|
|
return * (jlong *) ((char*) obj + field->getOffset ());
|
|
}
|
|
|
|
extern inline jfieldID
|
|
_Jv_FromReflectedField (java::lang::reflect::Field *field)
|
|
{
|
|
return (jfieldID) ((char *) field->declaringClass->fields + field->offset);
|
|
}
|
|
|
|
|
|
#ifdef __JAVA_CNI_H__
|
|
extern inline jfieldID
|
|
JvGetFirstInstanceField (jclass klass)
|
|
{
|
|
return &(klass->fields[klass->static_field_count]);
|
|
}
|
|
|
|
extern inline jint
|
|
JvNumInstanceFields (jclass klass)
|
|
{
|
|
return klass->field_count - klass->static_field_count;
|
|
}
|
|
|
|
extern inline jboolean
|
|
JvFieldIsRef (jfieldID field)
|
|
{
|
|
return field->isRef ();
|
|
}
|
|
|
|
extern inline jobject
|
|
JvGetObjectField (jobject obj, _Jv_Field* field)
|
|
{
|
|
return _Jv_GetObjectField (obj, field);
|
|
}
|
|
#endif /* defined (__JAVA_CNI_H__) */
|
|
|
|
#endif
|
|
|
|
#endif /* __JAVA_FIELD_H */
|