1999-04-07 16:42:40 +02:00
|
|
|
|
// natClass.cc - Implementation of java.lang.Class native methods.
|
|
|
|
|
|
2007-01-23 02:06:10 +01:00
|
|
|
|
/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
|
2004-03-23 20:24:07 +01:00
|
|
|
|
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. */
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
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
|
|
|
|
#include <limits.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <string.h>
|
2003-10-24 11:29:43 +02:00
|
|
|
|
#include <stddef.h>
|
2004-11-25 04:47:08 +01:00
|
|
|
|
#include <stdio.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
#pragma implementation "Class.h"
|
|
|
|
|
|
1999-09-11 00:03:10 +02:00
|
|
|
|
#include <gcj/cni.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <jvm.h>
|
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
|
|
|
|
#include <java-threads.h>
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/Class.h>
|
|
|
|
|
#include <java/lang/ClassLoader.h>
|
|
|
|
|
#include <java/lang/String.h>
|
|
|
|
|
#include <java/lang/reflect/Modifier.h>
|
|
|
|
|
#include <java/lang/reflect/Member.h>
|
|
|
|
|
#include <java/lang/reflect/Method.h>
|
|
|
|
|
#include <java/lang/reflect/Field.h>
|
|
|
|
|
#include <java/lang/reflect/Constructor.h>
|
|
|
|
|
#include <java/lang/AbstractMethodError.h>
|
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
|
|
|
|
#include <java/lang/ArrayStoreException.h>
|
|
|
|
|
#include <java/lang/ClassCastException.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/ClassNotFoundException.h>
|
2000-03-02 21:25:20 +01:00
|
|
|
|
#include <java/lang/ExceptionInInitializerError.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/IllegalAccessException.h>
|
|
|
|
|
#include <java/lang/IllegalAccessError.h>
|
2001-11-26 07:40:06 +01:00
|
|
|
|
#include <java/lang/IllegalArgumentException.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/IncompatibleClassChangeError.h>
|
2003-10-01 18:22:13 +02:00
|
|
|
|
#include <java/lang/NoSuchFieldError.h>
|
2002-12-03 14:50:05 +01:00
|
|
|
|
#include <java/lang/ArrayIndexOutOfBoundsException.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/InstantiationException.h>
|
|
|
|
|
#include <java/lang/NoClassDefFoundError.h>
|
|
|
|
|
#include <java/lang/NoSuchFieldException.h>
|
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
|
|
|
|
#include <java/lang/NoSuchMethodError.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/NoSuchMethodException.h>
|
|
|
|
|
#include <java/lang/Thread.h>
|
|
|
|
|
#include <java/lang/NullPointerException.h>
|
2001-12-21 20:47:50 +01:00
|
|
|
|
#include <java/lang/RuntimePermission.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/System.h>
|
2007-01-29 14:14:38 +01:00
|
|
|
|
#include <java/lang/SecurityException.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/SecurityManager.h>
|
2000-01-04 09:46:52 +01:00
|
|
|
|
#include <java/lang/StringBuffer.h>
|
2003-09-25 09:46:19 +02:00
|
|
|
|
#include <java/lang/VMClassLoader.h>
|
2000-01-05 23:52:54 +01:00
|
|
|
|
#include <gcj/method.h>
|
2002-12-03 14:50:05 +01:00
|
|
|
|
#include <gnu/gcj/RawData.h>
|
2004-11-25 04:47:08 +01:00
|
|
|
|
#include <java/lang/VerifyError.h>
|
2007-01-09 20:58:05 +01:00
|
|
|
|
#include <java/lang/InternalError.h>
|
|
|
|
|
#include <java/lang/TypeNotPresentException.h>
|
|
|
|
|
#include <java/lang/Byte.h>
|
|
|
|
|
#include <java/lang/Short.h>
|
|
|
|
|
#include <java/lang/Integer.h>
|
|
|
|
|
#include <java/lang/Float.h>
|
|
|
|
|
#include <java/lang/Double.h>
|
|
|
|
|
#include <java/lang/Long.h>
|
|
|
|
|
#include <java/lang/Character.h>
|
|
|
|
|
#include <java/lang/Boolean.h>
|
|
|
|
|
#include <java/lang/annotation/Annotation.h>
|
|
|
|
|
#include <java/util/HashMap.h>
|
|
|
|
|
#include <java/util/Map.h>
|
|
|
|
|
#include <sun/reflect/annotation/AnnotationInvocationHandler.h>
|
|
|
|
|
#include <java/lang/Enum.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
[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
|
|
|
|
#include <java-cpool.h>
|
2003-10-24 11:29:43 +02:00
|
|
|
|
#include <java-interp.h>
|
2004-11-25 04:47:08 +01:00
|
|
|
|
#include <java-assert.h>
|
2005-03-10 20:02:21 +01:00
|
|
|
|
#include <java-stack.h>
|
2004-11-25 04:47:08 +01:00
|
|
|
|
#include <execution.h>
|
2004-07-08 01:44:12 +02:00
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
|
2001-10-16 10:35:17 +02:00
|
|
|
|
using namespace gcj;
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
jclass
|
2001-04-25 17:45:15 +02:00
|
|
|
|
java::lang::Class::forName (jstring className, jboolean initialize,
|
|
|
|
|
java::lang::ClassLoader *loader)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
|
|
|
|
if (! className)
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::NullPointerException;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
jsize length = _Jv_GetStringUTFLength (className);
|
|
|
|
|
char buffer[length];
|
2003-11-14 02:48:30 +01:00
|
|
|
|
_Jv_GetStringUTFRegion (className, 0, className->length(), buffer);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
_Jv_Utf8Const *name = _Jv_makeUtf8Const (buffer, length);
|
|
|
|
|
|
2001-11-26 07:40:06 +01:00
|
|
|
|
if (! _Jv_VerifyClassName (name))
|
|
|
|
|
throw new java::lang::ClassNotFoundException (className);
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
jclass klass = (buffer[0] == '['
|
2004-08-12 08:53:42 +02:00
|
|
|
|
? _Jv_FindClassFromSignature (name->chars(), loader)
|
2000-11-26 04:58:56 +01:00
|
|
|
|
: _Jv_FindClass (name, loader));
|
2000-06-19 00:14:06 +02:00
|
|
|
|
|
2001-04-25 17:45:15 +02:00
|
|
|
|
if (klass == NULL)
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::ClassNotFoundException (className);
|
[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
|
|
|
|
|
2001-04-25 17:45:15 +02:00
|
|
|
|
if (initialize)
|
|
|
|
|
_Jv_InitClass (klass);
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
return klass;
|
|
|
|
|
}
|
|
|
|
|
|
2000-11-26 04:58:56 +01:00
|
|
|
|
jclass
|
|
|
|
|
java::lang::Class::forName (jstring className)
|
|
|
|
|
{
|
2002-12-03 14:50:05 +01:00
|
|
|
|
java::lang::ClassLoader *loader = NULL;
|
2005-03-10 20:02:21 +01:00
|
|
|
|
|
|
|
|
|
jclass caller = _Jv_StackTrace::GetCallingClass (&Class::class$);
|
|
|
|
|
if (caller)
|
|
|
|
|
loader = caller->getClassLoaderInternal();
|
2002-12-03 14:50:05 +01:00
|
|
|
|
|
|
|
|
|
return forName (className, true, loader);
|
2000-11-26 04:58:56 +01:00
|
|
|
|
}
|
|
|
|
|
|
2001-12-21 20:47:50 +01:00
|
|
|
|
java::lang::ClassLoader *
|
|
|
|
|
java::lang::Class::getClassLoader (void)
|
|
|
|
|
{
|
|
|
|
|
java::lang::SecurityManager *s = java::lang::System::getSecurityManager();
|
|
|
|
|
if (s != NULL)
|
2003-07-21 03:54:06 +02:00
|
|
|
|
{
|
2005-03-10 20:02:21 +01:00
|
|
|
|
jclass caller = _Jv_StackTrace::GetCallingClass (&Class::class$);
|
2006-05-04 20:44:53 +02:00
|
|
|
|
return getClassLoader (caller);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return loader;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
java::lang::ClassLoader *
|
|
|
|
|
java::lang::Class::getClassLoader (jclass caller)
|
|
|
|
|
{
|
|
|
|
|
java::lang::SecurityManager *s = java::lang::System::getSecurityManager();
|
|
|
|
|
if (s != NULL)
|
|
|
|
|
{
|
|
|
|
|
ClassLoader *caller_loader = caller->getClassLoaderInternal();
|
2003-07-21 03:54:06 +02:00
|
|
|
|
|
|
|
|
|
// If the caller has a non-null class loader, and that loader
|
|
|
|
|
// is not this class' loader or an ancestor thereof, then do a
|
|
|
|
|
// security check.
|
|
|
|
|
if (caller_loader != NULL && ! caller_loader->isAncestorOf(loader))
|
|
|
|
|
s->checkPermission (new RuntimePermission (JvNewStringLatin1 ("getClassLoader")));
|
|
|
|
|
}
|
2001-12-21 20:47:50 +01:00
|
|
|
|
|
2005-03-24 01:04:22 +01:00
|
|
|
|
return loader;
|
2001-12-21 20:47:50 +01:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
java::lang::reflect::Constructor *
|
2000-01-04 09:46:52 +01:00
|
|
|
|
java::lang::Class::getConstructor (JArray<jclass> *param_types)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2003-07-21 03:54:06 +02:00
|
|
|
|
memberAccessCheck(java::lang::reflect::Member::PUBLIC);
|
|
|
|
|
|
2000-01-05 17:35:20 +01:00
|
|
|
|
jstring partial_sig = getSignature (param_types, true);
|
2000-01-04 09:46:52 +01:00
|
|
|
|
jint hash = partial_sig->hashCode ();
|
|
|
|
|
|
|
|
|
|
int i = isPrimitive () ? 0 : method_count;
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
{
|
|
|
|
|
if (_Jv_equalUtf8Consts (methods[i].name, init_name)
|
|
|
|
|
&& _Jv_equal (methods[i].signature, partial_sig, hash))
|
|
|
|
|
{
|
|
|
|
|
// Found it. For getConstructor, the constructor must be
|
|
|
|
|
// public.
|
|
|
|
|
using namespace java::lang::reflect;
|
2000-01-05 17:35:20 +01:00
|
|
|
|
if (! Modifier::isPublic(methods[i].accflags))
|
2000-01-04 09:46:52 +01:00
|
|
|
|
break;
|
|
|
|
|
Constructor *cons = new Constructor ();
|
|
|
|
|
cons->offset = (char *) (&methods[i]) - (char *) methods;
|
|
|
|
|
cons->declaringClass = this;
|
|
|
|
|
return cons;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-03-29 21:17:02 +01:00
|
|
|
|
throw new java::lang::NoSuchMethodException (_Jv_NewStringUtf8Const (init_name));
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JArray<java::lang::reflect::Constructor *> *
|
2005-06-14 20:51:54 +02:00
|
|
|
|
java::lang::Class::getDeclaredConstructors (jboolean publicOnly)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-01-04 09:46:52 +01:00
|
|
|
|
int numConstructors = 0;
|
|
|
|
|
int max = isPrimitive () ? 0 : method_count;
|
|
|
|
|
int i;
|
|
|
|
|
for (i = max; --i >= 0; )
|
|
|
|
|
{
|
|
|
|
|
_Jv_Method *method = &methods[i];
|
|
|
|
|
if (method->name == NULL
|
2000-01-06 19:18:15 +01:00
|
|
|
|
|| ! _Jv_equalUtf8Consts (method->name, init_name))
|
2000-01-04 09:46:52 +01:00
|
|
|
|
continue;
|
2005-06-14 20:51:54 +02:00
|
|
|
|
if (publicOnly
|
2000-01-04 09:46:52 +01:00
|
|
|
|
&& ! java::lang::reflect::Modifier::isPublic(method->accflags))
|
|
|
|
|
continue;
|
|
|
|
|
numConstructors++;
|
|
|
|
|
}
|
|
|
|
|
JArray<java::lang::reflect::Constructor *> *result
|
|
|
|
|
= (JArray<java::lang::reflect::Constructor *> *)
|
natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
(IntegerClass): Likewise.
* java/lang/natClass.cc (CloneableClass): Removed.
(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
ConstructorClass): Likewise.
* java/lang/natClassLoader.cc (CloneableClass): Removed.
(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
SerializableClass): Likewise.
* java/lang/reflect/natMethod.cc (BooleanClass): Removed.
(VoidClass, ByteClass, ShortClass, CharacterClass, IntegerClass,
LongClass, FloatClass, DoubleClass): Likewise.
From-SVN: r54977
2002-06-25 07:29:22 +02:00
|
|
|
|
JvNewObjectArray (numConstructors,
|
|
|
|
|
&java::lang::reflect::Constructor::class$,
|
|
|
|
|
NULL);
|
2000-01-04 09:46:52 +01:00
|
|
|
|
java::lang::reflect::Constructor** cptr = elements (result);
|
|
|
|
|
for (i = 0; i < max; i++)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Method *method = &methods[i];
|
|
|
|
|
if (method->name == NULL
|
2000-01-06 19:18:15 +01:00
|
|
|
|
|| ! _Jv_equalUtf8Consts (method->name, init_name))
|
2000-01-04 09:46:52 +01:00
|
|
|
|
continue;
|
2005-06-14 20:51:54 +02:00
|
|
|
|
if (publicOnly
|
2000-01-04 09:46:52 +01:00
|
|
|
|
&& ! java::lang::reflect::Modifier::isPublic(method->accflags))
|
|
|
|
|
continue;
|
|
|
|
|
java::lang::reflect::Constructor *cons
|
|
|
|
|
= new java::lang::reflect::Constructor ();
|
|
|
|
|
cons->offset = (char *) method - (char *) methods;
|
|
|
|
|
cons->declaringClass = this;
|
|
|
|
|
*cptr++ = cons;
|
|
|
|
|
}
|
|
|
|
|
return result;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
java::lang::reflect::Constructor *
|
2000-01-04 09:46:52 +01:00
|
|
|
|
java::lang::Class::getDeclaredConstructor (JArray<jclass> *param_types)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2003-07-21 03:54:06 +02:00
|
|
|
|
memberAccessCheck(java::lang::reflect::Member::DECLARED);
|
|
|
|
|
|
2000-01-05 17:35:20 +01:00
|
|
|
|
jstring partial_sig = getSignature (param_types, true);
|
2000-01-04 09:46:52 +01:00
|
|
|
|
jint hash = partial_sig->hashCode ();
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2000-01-04 09:46:52 +01:00
|
|
|
|
int i = isPrimitive () ? 0 : method_count;
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
{
|
|
|
|
|
if (_Jv_equalUtf8Consts (methods[i].name, init_name)
|
|
|
|
|
&& _Jv_equal (methods[i].signature, partial_sig, hash))
|
|
|
|
|
{
|
|
|
|
|
// Found it.
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
Constructor *cons = new Constructor ();
|
|
|
|
|
cons->offset = (char *) (&methods[i]) - (char *) methods;
|
|
|
|
|
cons->declaringClass = this;
|
|
|
|
|
return cons;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-03-29 21:17:02 +01:00
|
|
|
|
throw new java::lang::NoSuchMethodException (_Jv_NewStringUtf8Const (init_name));
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
java::lang::reflect::Field *
|
|
|
|
|
java::lang::Class::getField (jstring name, jint hash)
|
|
|
|
|
{
|
|
|
|
|
java::lang::reflect::Field* rfield;
|
|
|
|
|
for (int i = 0; i < field_count; i++)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Field *field = &fields[i];
|
|
|
|
|
if (! _Jv_equal (field->name, name, hash))
|
|
|
|
|
continue;
|
|
|
|
|
if (! (field->getModifiers() & java::lang::reflect::Modifier::PUBLIC))
|
|
|
|
|
continue;
|
|
|
|
|
rfield = new java::lang::reflect::Field ();
|
|
|
|
|
rfield->offset = (char*) field - (char*) fields;
|
|
|
|
|
rfield->declaringClass = this;
|
|
|
|
|
rfield->name = name;
|
|
|
|
|
return rfield;
|
|
|
|
|
}
|
|
|
|
|
jclass superclass = getSuperclass();
|
|
|
|
|
if (superclass == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
rfield = superclass->getField(name, hash);
|
|
|
|
|
for (int i = 0; i < interface_count && rfield == NULL; ++i)
|
|
|
|
|
rfield = interfaces[i]->getField (name, hash);
|
|
|
|
|
return rfield;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
java::lang::reflect::Field *
|
|
|
|
|
java::lang::Class::getDeclaredField (jstring name)
|
|
|
|
|
{
|
2003-07-21 03:54:06 +02:00
|
|
|
|
memberAccessCheck(java::lang::reflect::Member::DECLARED);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
int hash = name->hashCode();
|
|
|
|
|
for (int i = 0; i < field_count; i++)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Field *field = &fields[i];
|
|
|
|
|
if (! _Jv_equal (field->name, name, hash))
|
|
|
|
|
continue;
|
|
|
|
|
java::lang::reflect::Field* rfield = new java::lang::reflect::Field ();
|
|
|
|
|
rfield->offset = (char*) field - (char*) fields;
|
|
|
|
|
rfield->declaringClass = this;
|
|
|
|
|
rfield->name = name;
|
|
|
|
|
return rfield;
|
|
|
|
|
}
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::NoSuchFieldException (name);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JArray<java::lang::reflect::Field *> *
|
2003-10-22 21:29:27 +02:00
|
|
|
|
java::lang::Class::getDeclaredFields (jboolean public_only)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2003-10-22 21:29:27 +02:00
|
|
|
|
int size;
|
|
|
|
|
if (public_only)
|
|
|
|
|
{
|
|
|
|
|
size = 0;
|
|
|
|
|
for (int i = 0; i < field_count; ++i)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Field *field = &fields[i];
|
|
|
|
|
if ((field->flags & java::lang::reflect::Modifier::PUBLIC))
|
|
|
|
|
++size;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
size = field_count;
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JArray<java::lang::reflect::Field *> *result
|
|
|
|
|
= (JArray<java::lang::reflect::Field *> *)
|
2003-10-22 21:29:27 +02:00
|
|
|
|
JvNewObjectArray (size, &java::lang::reflect::Field::class$, NULL);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
java::lang::reflect::Field** fptr = elements (result);
|
|
|
|
|
for (int i = 0; i < field_count; i++)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Field *field = &fields[i];
|
2003-10-22 21:29:27 +02:00
|
|
|
|
if (public_only
|
|
|
|
|
&& ! (field->flags & java::lang::reflect::Modifier::PUBLIC))
|
|
|
|
|
continue;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
java::lang::reflect::Field* rfield = new java::lang::reflect::Field ();
|
|
|
|
|
rfield->offset = (char*) field - (char*) fields;
|
|
|
|
|
rfield->declaringClass = this;
|
|
|
|
|
*fptr++ = rfield;
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2000-01-04 09:46:52 +01:00
|
|
|
|
void
|
|
|
|
|
java::lang::Class::getSignature (java::lang::StringBuffer *buffer)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-01-04 09:46:52 +01:00
|
|
|
|
if (isPrimitive())
|
|
|
|
|
buffer->append((jchar) method_count);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
jstring name = getName();
|
|
|
|
|
if (name->charAt(0) != '[')
|
|
|
|
|
buffer->append((jchar) 'L');
|
|
|
|
|
buffer->append(name);
|
|
|
|
|
if (name->charAt(0) != '[')
|
|
|
|
|
buffer->append((jchar) ';');
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// This doesn't have to be native. It is an implementation detail
|
|
|
|
|
// only called from the C++ code, though, so maybe this is clearer.
|
|
|
|
|
jstring
|
2000-01-05 17:35:20 +01:00
|
|
|
|
java::lang::Class::getSignature (JArray<jclass> *param_types,
|
|
|
|
|
jboolean is_constructor)
|
2000-01-04 09:46:52 +01:00
|
|
|
|
{
|
|
|
|
|
java::lang::StringBuffer *buf = new java::lang::StringBuffer ();
|
|
|
|
|
buf->append((jchar) '(');
|
2001-02-14 06:32:31 +01:00
|
|
|
|
// A NULL param_types means "no parameters".
|
|
|
|
|
if (param_types != NULL)
|
|
|
|
|
{
|
2001-12-09 01:17:07 +01:00
|
|
|
|
jclass *v = elements (param_types);
|
2001-02-14 06:32:31 +01:00
|
|
|
|
for (int i = 0; i < param_types->length; ++i)
|
|
|
|
|
v[i]->getSignature(buf);
|
|
|
|
|
}
|
2000-01-04 09:46:52 +01:00
|
|
|
|
buf->append((jchar) ')');
|
2000-01-05 17:35:20 +01:00
|
|
|
|
if (is_constructor)
|
|
|
|
|
buf->append((jchar) 'V');
|
2000-01-04 09:46:52 +01:00
|
|
|
|
return buf->toString();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
java::lang::reflect::Method *
|
2002-09-03 23:33:46 +02:00
|
|
|
|
java::lang::Class::_getDeclaredMethod (jstring name,
|
|
|
|
|
JArray<jclass> *param_types)
|
2000-01-04 09:46:52 +01:00
|
|
|
|
{
|
2000-01-05 17:35:20 +01:00
|
|
|
|
jstring partial_sig = getSignature (param_types, false);
|
2000-01-04 09:46:52 +01:00
|
|
|
|
jint p_len = partial_sig->length();
|
|
|
|
|
_Jv_Utf8Const *utf_name = _Jv_makeUtf8Const (name);
|
|
|
|
|
int i = isPrimitive () ? 0 : method_count;
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
{
|
|
|
|
|
if (_Jv_equalUtf8Consts (methods[i].name, utf_name)
|
2002-12-19 20:31:55 +01:00
|
|
|
|
&& _Jv_equaln (methods[i].signature, partial_sig, p_len)
|
|
|
|
|
&& (methods[i].accflags
|
|
|
|
|
& java::lang::reflect::Modifier::INVISIBLE) == 0)
|
2000-01-04 09:46:52 +01:00
|
|
|
|
{
|
|
|
|
|
// Found it.
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
Method *rmethod = new Method ();
|
|
|
|
|
rmethod->offset = (char*) (&methods[i]) - (char*) methods;
|
|
|
|
|
rmethod->declaringClass = this;
|
2000-01-05 23:22:10 +01:00
|
|
|
|
return rmethod;
|
2000-01-04 09:46:52 +01:00
|
|
|
|
}
|
|
|
|
|
}
|
2002-09-03 23:33:46 +02:00
|
|
|
|
return NULL;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JArray<java::lang::reflect::Method *> *
|
|
|
|
|
java::lang::Class::getDeclaredMethods (void)
|
|
|
|
|
{
|
2003-07-21 03:54:06 +02:00
|
|
|
|
memberAccessCheck(java::lang::reflect::Member::DECLARED);
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
int numMethods = 0;
|
2000-01-04 09:46:52 +01:00
|
|
|
|
int max = isPrimitive () ? 0 : method_count;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
int i;
|
2000-01-04 09:46:52 +01:00
|
|
|
|
for (i = max; --i >= 0; )
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
|
|
|
|
_Jv_Method *method = &methods[i];
|
|
|
|
|
if (method->name == NULL
|
|
|
|
|
|| _Jv_equalUtf8Consts (method->name, clinit_name)
|
2000-01-05 23:22:10 +01:00
|
|
|
|
|| _Jv_equalUtf8Consts (method->name, init_name)
|
2002-12-19 20:31:55 +01:00
|
|
|
|
|| _Jv_equalUtf8Consts (method->name, finit_name)
|
|
|
|
|
|| (methods[i].accflags
|
|
|
|
|
& java::lang::reflect::Modifier::INVISIBLE) != 0)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
continue;
|
|
|
|
|
numMethods++;
|
|
|
|
|
}
|
|
|
|
|
JArray<java::lang::reflect::Method *> *result
|
|
|
|
|
= (JArray<java::lang::reflect::Method *> *)
|
natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
(IntegerClass): Likewise.
* java/lang/natClass.cc (CloneableClass): Removed.
(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
ConstructorClass): Likewise.
* java/lang/natClassLoader.cc (CloneableClass): Removed.
(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
SerializableClass): Likewise.
* java/lang/reflect/natMethod.cc (BooleanClass): Removed.
(VoidClass, ByteClass, ShortClass, CharacterClass, IntegerClass,
LongClass, FloatClass, DoubleClass): Likewise.
From-SVN: r54977
2002-06-25 07:29:22 +02:00
|
|
|
|
JvNewObjectArray (numMethods, &java::lang::reflect::Method::class$, NULL);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
java::lang::reflect::Method** mptr = elements (result);
|
2000-01-04 09:46:52 +01:00
|
|
|
|
for (i = 0; i < max; i++)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
|
|
|
|
_Jv_Method *method = &methods[i];
|
|
|
|
|
if (method->name == NULL
|
|
|
|
|
|| _Jv_equalUtf8Consts (method->name, clinit_name)
|
2000-01-05 23:22:10 +01:00
|
|
|
|
|| _Jv_equalUtf8Consts (method->name, init_name)
|
2002-12-19 20:31:55 +01:00
|
|
|
|
|| _Jv_equalUtf8Consts (method->name, finit_name)
|
|
|
|
|
|| (methods[i].accflags
|
|
|
|
|
& java::lang::reflect::Modifier::INVISIBLE) != 0)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
continue;
|
2000-01-04 09:46:52 +01:00
|
|
|
|
java::lang::reflect::Method* rmethod
|
|
|
|
|
= new java::lang::reflect::Method ();
|
|
|
|
|
rmethod->offset = (char*) method - (char*) methods;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
rmethod->declaringClass = this;
|
|
|
|
|
*mptr++ = rmethod;
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jstring
|
|
|
|
|
java::lang::Class::getName (void)
|
|
|
|
|
{
|
2004-08-12 08:53:42 +02:00
|
|
|
|
return name->toString();
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JArray<jclass> *
|
|
|
|
|
java::lang::Class::getInterfaces (void)
|
|
|
|
|
{
|
|
|
|
|
jobjectArray r = JvNewObjectArray (interface_count, getClass (), NULL);
|
|
|
|
|
jobject *data = elements (r);
|
|
|
|
|
for (int i = 0; i < interface_count; ++i)
|
2004-11-25 04:47:08 +01:00
|
|
|
|
{
|
|
|
|
|
typedef unsigned int uaddr __attribute__ ((mode (pointer)));
|
|
|
|
|
data[i] = interfaces[i];
|
|
|
|
|
if ((uaddr)data[i] < (uaddr)constants.size)
|
|
|
|
|
fprintf (stderr, "ERROR !!!\n");
|
|
|
|
|
}
|
1999-04-07 16:42:40 +02:00
|
|
|
|
return reinterpret_cast<JArray<jclass> *> (r);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
java::lang::reflect::Method *
|
2002-07-05 22:40:11 +02:00
|
|
|
|
java::lang::Class::_getMethod (jstring name, JArray<jclass> *param_types)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-01-05 17:35:20 +01:00
|
|
|
|
jstring partial_sig = getSignature (param_types, false);
|
2000-01-04 09:46:52 +01:00
|
|
|
|
jint p_len = partial_sig->length();
|
|
|
|
|
_Jv_Utf8Const *utf_name = _Jv_makeUtf8Const (name);
|
2004-11-25 04:47:08 +01:00
|
|
|
|
|
|
|
|
|
for (Class *klass = this; klass; klass = klass->getSuperclass())
|
2000-01-04 09:46:52 +01:00
|
|
|
|
{
|
|
|
|
|
int i = klass->isPrimitive () ? 0 : klass->method_count;
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
{
|
|
|
|
|
if (_Jv_equalUtf8Consts (klass->methods[i].name, utf_name)
|
2002-12-19 20:31:55 +01:00
|
|
|
|
&& _Jv_equaln (klass->methods[i].signature, partial_sig, p_len)
|
|
|
|
|
&& (klass->methods[i].accflags
|
|
|
|
|
& java::lang::reflect::Modifier::INVISIBLE) == 0)
|
2000-01-04 09:46:52 +01:00
|
|
|
|
{
|
|
|
|
|
// Found it.
|
|
|
|
|
using namespace java::lang::reflect;
|
2000-01-05 23:22:10 +01:00
|
|
|
|
|
|
|
|
|
// Method must be public.
|
2000-01-06 19:18:15 +01:00
|
|
|
|
if (! Modifier::isPublic (klass->methods[i].accflags))
|
2000-01-05 23:22:10 +01:00
|
|
|
|
break;
|
|
|
|
|
|
2000-01-04 09:46:52 +01:00
|
|
|
|
Method *rmethod = new Method ();
|
2000-01-06 01:56:21 +01:00
|
|
|
|
rmethod->offset = ((char *) (&klass->methods[i])
|
|
|
|
|
- (char *) klass->methods);
|
2000-01-04 09:46:52 +01:00
|
|
|
|
rmethod->declaringClass = klass;
|
|
|
|
|
return rmethod;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
2002-07-05 22:40:11 +02:00
|
|
|
|
|
|
|
|
|
// If we haven't found a match, and this class is an interface, then
|
|
|
|
|
// check all the superinterfaces.
|
|
|
|
|
if (isInterface())
|
|
|
|
|
{
|
|
|
|
|
for (int i = 0; i < interface_count; ++i)
|
|
|
|
|
{
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
Method *rmethod = interfaces[i]->_getMethod (name, param_types);
|
|
|
|
|
if (rmethod != NULL)
|
|
|
|
|
return rmethod;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-01-05 23:22:10 +01:00
|
|
|
|
// This is a very slow implementation, since it re-scans all the
|
|
|
|
|
// methods we've already listed to make sure we haven't duplicated a
|
|
|
|
|
// method. It also over-estimates the required size, so we have to
|
|
|
|
|
// shrink the result array later.
|
|
|
|
|
jint
|
|
|
|
|
java::lang::Class::_getMethods (JArray<java::lang::reflect::Method *> *result,
|
|
|
|
|
jint offset)
|
|
|
|
|
{
|
|
|
|
|
jint count = 0;
|
|
|
|
|
|
|
|
|
|
// First examine all local methods
|
|
|
|
|
for (int i = isPrimitive () ? 0 : method_count; --i >= 0; )
|
|
|
|
|
{
|
|
|
|
|
_Jv_Method *method = &methods[i];
|
|
|
|
|
if (method->name == NULL
|
|
|
|
|
|| _Jv_equalUtf8Consts (method->name, clinit_name)
|
|
|
|
|
|| _Jv_equalUtf8Consts (method->name, init_name)
|
2002-12-19 20:31:55 +01:00
|
|
|
|
|| _Jv_equalUtf8Consts (method->name, finit_name)
|
|
|
|
|
|| (method->accflags
|
|
|
|
|
& java::lang::reflect::Modifier::INVISIBLE) != 0)
|
2000-01-05 23:22:10 +01:00
|
|
|
|
continue;
|
|
|
|
|
// Only want public methods.
|
|
|
|
|
if (! java::lang::reflect::Modifier::isPublic (method->accflags))
|
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
// This is where we over-count the slots required if we aren't
|
|
|
|
|
// filling the result for real.
|
|
|
|
|
if (result != NULL)
|
|
|
|
|
{
|
|
|
|
|
jboolean add = true;
|
|
|
|
|
java::lang::reflect::Method **mp = elements (result);
|
|
|
|
|
// If we already have a method with this name and signature,
|
|
|
|
|
// then ignore this one. This can happen with virtual
|
|
|
|
|
// methods.
|
|
|
|
|
for (int j = 0; j < offset; ++j)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Method *meth_2 = _Jv_FromReflectedMethod (mp[j]);
|
|
|
|
|
if (_Jv_equalUtf8Consts (method->name, meth_2->name)
|
|
|
|
|
&& _Jv_equalUtf8Consts (method->signature,
|
|
|
|
|
meth_2->signature))
|
|
|
|
|
{
|
|
|
|
|
add = false;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (! add)
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (result != NULL)
|
|
|
|
|
{
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
Method *rmethod = new Method ();
|
|
|
|
|
rmethod->offset = (char *) method - (char *) methods;
|
|
|
|
|
rmethod->declaringClass = this;
|
|
|
|
|
Method **mp = elements (result);
|
|
|
|
|
mp[offset + count] = rmethod;
|
|
|
|
|
}
|
|
|
|
|
++count;
|
|
|
|
|
}
|
|
|
|
|
offset += count;
|
|
|
|
|
|
|
|
|
|
// Now examine superclasses.
|
|
|
|
|
if (getSuperclass () != NULL)
|
|
|
|
|
{
|
|
|
|
|
jint s_count = getSuperclass()->_getMethods (result, offset);
|
|
|
|
|
offset += s_count;
|
|
|
|
|
count += s_count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Finally, examine interfaces.
|
|
|
|
|
for (int i = 0; i < interface_count; ++i)
|
|
|
|
|
{
|
|
|
|
|
int f_count = interfaces[i]->_getMethods (result, offset);
|
|
|
|
|
count += f_count;
|
|
|
|
|
offset += f_count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JArray<java::lang::reflect::Method *> *
|
|
|
|
|
java::lang::Class::getMethods (void)
|
|
|
|
|
{
|
2000-01-05 23:22:10 +01:00
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
|
2003-07-21 03:54:06 +02:00
|
|
|
|
memberAccessCheck(Member::PUBLIC);
|
2000-01-05 23:22:10 +01:00
|
|
|
|
|
|
|
|
|
// This will overestimate the size we need.
|
|
|
|
|
jint count = _getMethods (NULL, 0);
|
|
|
|
|
|
|
|
|
|
JArray<Method *> *result
|
natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
(IntegerClass): Likewise.
* java/lang/natClass.cc (CloneableClass): Removed.
(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
ConstructorClass): Likewise.
* java/lang/natClassLoader.cc (CloneableClass): Removed.
(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
SerializableClass): Likewise.
* java/lang/reflect/natMethod.cc (BooleanClass): Removed.
(VoidClass, ByteClass, ShortClass, CharacterClass, IntegerClass,
LongClass, FloatClass, DoubleClass): Likewise.
From-SVN: r54977
2002-06-25 07:29:22 +02:00
|
|
|
|
= ((JArray<Method *> *) JvNewObjectArray (count,
|
|
|
|
|
&Method::class$,
|
|
|
|
|
NULL));
|
2000-01-05 23:22:10 +01:00
|
|
|
|
|
|
|
|
|
// When filling the array for real, we get the actual count. Then
|
|
|
|
|
// we resize the array.
|
|
|
|
|
jint real_count = _getMethods (result, 0);
|
|
|
|
|
|
|
|
|
|
if (real_count != count)
|
|
|
|
|
{
|
|
|
|
|
JArray<Method *> *r2
|
natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
(IntegerClass): Likewise.
* java/lang/natClass.cc (CloneableClass): Removed.
(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
ConstructorClass): Likewise.
* java/lang/natClassLoader.cc (CloneableClass): Removed.
(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
SerializableClass): Likewise.
* java/lang/reflect/natMethod.cc (BooleanClass): Removed.
(VoidClass, ByteClass, ShortClass, CharacterClass, IntegerClass,
LongClass, FloatClass, DoubleClass): Likewise.
From-SVN: r54977
2002-06-25 07:29:22 +02:00
|
|
|
|
= ((JArray<Method *> *) JvNewObjectArray (real_count,
|
|
|
|
|
&Method::class$,
|
2000-01-05 23:22:10 +01:00
|
|
|
|
NULL));
|
|
|
|
|
|
|
|
|
|
Method **destp = elements (r2);
|
|
|
|
|
Method **srcp = elements (result);
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < real_count; ++i)
|
|
|
|
|
*destp++ = *srcp++;
|
|
|
|
|
|
|
|
|
|
result = r2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2001-01-15 09:11:40 +01:00
|
|
|
|
jboolean
|
1999-04-07 16:42:40 +02:00
|
|
|
|
java::lang::Class::isAssignableFrom (jclass klass)
|
|
|
|
|
{
|
2000-03-21 06:12:20 +01:00
|
|
|
|
// Arguments may not have been initialized, given ".class" syntax.
|
2006-03-01 17:01:34 +01:00
|
|
|
|
// This ensures we can at least look at their superclasses.
|
|
|
|
|
_Jv_Linker::wait_for_state (this, JV_STATE_LOADING);
|
|
|
|
|
_Jv_Linker::wait_for_state (klass, JV_STATE_LOADING);
|
2005-09-06 18:01:31 +02:00
|
|
|
|
return _Jv_IsAssignableFrom (klass, this);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2001-01-15 09:11:40 +01:00
|
|
|
|
jboolean
|
1999-04-07 16:42:40 +02:00
|
|
|
|
java::lang::Class::isInstance (jobject obj)
|
|
|
|
|
{
|
2001-06-05 11:46:36 +02:00
|
|
|
|
if (! obj)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
return false;
|
2005-09-06 18:01:31 +02:00
|
|
|
|
return _Jv_IsAssignableFrom (JV_CLASS (obj), this);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobject
|
|
|
|
|
java::lang::Class::newInstance (void)
|
|
|
|
|
{
|
2003-07-21 03:54:06 +02:00
|
|
|
|
memberAccessCheck(java::lang::reflect::Member::PUBLIC);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
if (isPrimitive ()
|
|
|
|
|
|| isInterface ()
|
|
|
|
|
|| isArray ()
|
|
|
|
|
|| java::lang::reflect::Modifier::isAbstract(accflags))
|
2003-03-29 21:17:02 +01:00
|
|
|
|
throw new java::lang::InstantiationException (getName ());
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
1999-08-18 16:16:42 +02:00
|
|
|
|
_Jv_InitClass (this);
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
_Jv_Method *meth = _Jv_GetMethodLocal (this, init_name, void_signature);
|
|
|
|
|
if (! meth)
|
2003-11-04 06:27:10 +01:00
|
|
|
|
throw new java::lang::InstantiationException (getName());
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2004-04-20 03:38:46 +02:00
|
|
|
|
jobject r = _Jv_AllocObject (this);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
((void (*) (jobject)) meth->ncode) (r);
|
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
[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
|
|
|
|
java::lang::Class::finalize (void)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2004-11-25 04:47:08 +01:00
|
|
|
|
engine->unregister(this);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
ffi.h.in (ffi_closure_alloc, [...]): New.
libffi/ChangeLog:
* include/ffi.h.in (ffi_closure_alloc, ffi_closure_free): New.
(ffi_prep_closure_loc): New.
(ffi_prep_raw_closure_loc): New.
(ffi_prep_java_raw_closure_loc): New.
* src/closures.c: New file.
* src/dlmalloc.c [FFI_MMAP_EXEC_WRIT] (struct malloc_segment):
Replace sflags with exec_offset.
[FFI_MMAP_EXEC_WRIT] (mmap_exec_offset, add_segment_exec_offset,
sub_segment_exec_offset): New macros.
(get_segment_flags, set_segment_flags, check_segment_merge): New
macros.
(is_mmapped_segment, is_extern_segment): Use get_segment_flags.
(add_segment, sys_alloc, create_mspace, create_mspace_with_base,
destroy_mspace): Use new macros.
(sys_alloc): Silence warning.
* Makefile.am (libffi_la_SOURCES): Add src/closures.c.
* Makefile.in: Rebuilt.
* src/prep_cif [FFI_CLOSURES] (ffi_prep_closure): Implement in
terms of ffi_prep_closure_loc.
* src/raw_api.c (ffi_prep_raw_closure_loc): Renamed and adjusted
from...
(ffi_prep_raw_closure): ... this. Re-implement in terms of the
renamed version.
* src/java_raw_api (ffi_prep_java_raw_closure_loc): Renamed and
adjusted from...
(ffi_prep_java_raw_closure): ... this. Re-implement in terms of
the renamed version.
* src/alpha/ffi.c (ffi_prep_closure_loc): Renamed from
(ffi_prep_closure): ... this.
* src/pa/ffi.c: Likewise.
* src/cris/ffi.c: Likewise. Adjust.
* src/frv/ffi.c: Likewise.
* src/ia64/ffi.c: Likewise.
* src/mips/ffi.c: Likewise.
* src/powerpc/ffi_darwin.c: Likewise.
* src/s390/ffi.c: Likewise.
* src/sh/ffi.c: Likewise.
* src/sh64/ffi.c: Likewise.
* src/sparc/ffi.c: Likewise.
* src/x86/ffi64.c: Likewise.
* src/x86/ffi.c: Likewise.
(FFI_INIT_TRAMPOLINE): Adjust.
(ffi_prep_raw_closure_loc): Renamed and adjusted from...
(ffi_prep_raw_closure): ... this.
* src/powerpc/ffi.c (ffi_prep_closure_loc): Renamed from
(ffi_prep_closure): ... this.
(flush_icache): Adjust.
boehm-gc/ChangeLog:
* include/gc.h (GC_REGISTER_FINALIZER_UNREACHABLE): New.
(GC_register_finalizer_unreachable): Declare.
(GC_debug_register_finalizer_unreachable): Declare.
* finalize.c (GC_unreachable_finalize_mark_proc): New.
(GC_register_finalizer_unreachable): New.
(GC_finalize): Handle it.
* dbg_mlc.c (GC_debug_register_finalizer_unreachable): New.
(GC_debug_register_finalizer_no_order): Fix whitespace.
libjava/ChangeLog:
* include/jvm.h (_Jv_ClosureListFinalizer): New.
(_Jv_Linker::create_error_method): Adjust.
* boehm.cc (_Jv_ClosureListFinalizer): New.
* nogc.cc (_Jv_ClosureListFinalizer): New.
* java/lang/Class.h (class _Jv_ClosureList): New.
(class java::lang::Class): Declare it as friend.
* java/lang/natClass.cc (_Jv_ClosureList::releaseClosures): New.
(_Jv_ClosureList::registerClousure): New.
* include/execution.h (_Jv_ExecutionEngine): Add get_closure_list.
(_Jv_CompiledEngine::do_get_closure_list): New.
(_Jv_CompiledEngine::_Jv_CompiledEngine): Use it.
(_Jv_IndirectCompiledClass): Add closures.
(_Jv_IndirectCompiledEngine::get_aux_info): New.
(_Jv_IndirectCompiledEngine::do_allocate_field_initializers): Use
it.
(_Jv_IndirectCompiledEngine::do_get_closure_list): New.
(_Jv_IndirectCompiledEngine::_Jv_IndirectCompiledEngine): Use it.
(_Jv_InterpreterEngine::do_get_closure_list): Declare.
(_Jv_InterpreterEngine::_Jv_InterpreterEngine): Use it.
* interpret.cc (FFI_PREP_RAW_CLOSURE): Use _loc variants.
(node_closure): Add closure list.
(_Jv_InterpMethod::ncode): Add jclass argument. Use
ffi_closure_alloc and the separate code pointer. Register the
closure for finalization.
(_Jv_JNIMethod::ncode): Likewise.
(_Jv_InterpreterEngine::do_create_ncode): Pass klass to ncode.
(_Jv_InterpreterEngine::do_get_closure_list): New.
* include/java-interp.h (_Jv_InterpMethod::ncode): Adjust.
(_Jv_InterpClass): Add closures field.
(_Jv_JNIMethod::ncode): Adjust.
* defineclass.cc (_Jv_ClassReader::handleCodeAttribute): Adjust.
(_Jv_ClassReader::handleMethodsEnd): Likewise.
* link.cc (struct method_closure): Add closure list.
(_Jv_Linker::create_error_method): Add jclass argument. Use
ffi_closure_alloc and the separate code pointer. Register the
closure for finalization.
(_Jv_Linker::link_symbol_table): Remove outdated comment about
sharing of otable and atable. Adjust.
* java/lang/reflect/natVMProxy.cc (ncode_closure): Add closure
list.
(ncode): Add jclass argument. Use ffi_closure_alloc and the
separate code pointer. Register the closure for finalization.
(java::lang::reflect::VMProxy::generateProxyClass): Adjust.
* testsuite/libjava.jar/TestClosureGC.java: New.
* testsuite/libjava.jar/TestClosureGC.out: New.
* testsuite/libjava.jar/TestClosureGC.xfail: New.
* testsuite/libjava.jar/TestClosureGC.jar: New.
From-SVN: r122652
2007-03-07 08:27:25 +01:00
|
|
|
|
void
|
|
|
|
|
_Jv_ClosureList::releaseClosures (_Jv_ClosureList **closures)
|
|
|
|
|
{
|
|
|
|
|
if (!closures)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
while (_Jv_ClosureList *current = *closures)
|
|
|
|
|
{
|
|
|
|
|
*closures = current->next;
|
|
|
|
|
ffi_closure_free (current->ptr);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_ClosureList::registerClosure (jclass klass, void *ptr)
|
|
|
|
|
{
|
|
|
|
|
_Jv_ClosureList **closures = klass->engine->get_closure_list (klass);
|
|
|
|
|
this->ptr = ptr;
|
|
|
|
|
this->next = *closures;
|
|
|
|
|
*closures = this;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
// This implements the initialization process for a class. From Spec
|
|
|
|
|
// section 12.4.2.
|
|
|
|
|
void
|
|
|
|
|
java::lang::Class::initializeClass (void)
|
|
|
|
|
{
|
2006-02-01 14:40:05 +01:00
|
|
|
|
// Short-circuit to avoid needless locking (expression includes
|
|
|
|
|
// JV_STATE_PHANTOM and JV_STATE_DONE).
|
|
|
|
|
if (state >= JV_STATE_PHANTOM)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
return;
|
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Step 1. We introduce a new scope so we can synchronize more
|
|
|
|
|
// easily.
|
|
|
|
|
{
|
|
|
|
|
JvSynchronize sync (this);
|
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
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
if (state < JV_STATE_LINKED)
|
2005-04-22 04:33:31 +02:00
|
|
|
|
{
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
_Jv_Linker::wait_for_state(this, JV_STATE_LINKED);
|
|
|
|
|
}
|
2007-01-29 14:14:38 +01:00
|
|
|
|
catch (java::lang::SecurityException *x)
|
|
|
|
|
{
|
|
|
|
|
throw x;
|
|
|
|
|
}
|
2005-04-22 04:33:31 +02:00
|
|
|
|
catch (java::lang::Throwable *x)
|
|
|
|
|
{
|
|
|
|
|
// Turn into a NoClassDefFoundError.
|
|
|
|
|
java::lang::NoClassDefFoundError *result
|
|
|
|
|
= new java::lang::NoClassDefFoundError(getName());
|
|
|
|
|
result->initCause(x);
|
|
|
|
|
throw result;
|
|
|
|
|
}
|
|
|
|
|
}
|
2003-01-31 00:20:45 +01:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Step 2.
|
|
|
|
|
java::lang::Thread *self = java::lang::Thread::currentThread();
|
|
|
|
|
self = (java::lang::Thread *) ((long) self | 1);
|
|
|
|
|
while (state == JV_STATE_IN_PROGRESS && thread && thread != self)
|
|
|
|
|
wait ();
|
2003-01-31 00:20:45 +01:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Steps 3 & 4.
|
|
|
|
|
if (state == JV_STATE_DONE || state == JV_STATE_IN_PROGRESS)
|
2003-01-31 00:20:45 +01:00
|
|
|
|
return;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Step 5.
|
|
|
|
|
if (state == JV_STATE_ERROR)
|
2002-11-10 22:07:27 +01:00
|
|
|
|
throw new java::lang::NoClassDefFoundError (getName());
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Step 6.
|
|
|
|
|
thread = self;
|
|
|
|
|
_Jv_Linker::wait_for_state (this, JV_STATE_LINKED);
|
|
|
|
|
state = JV_STATE_IN_PROGRESS;
|
|
|
|
|
}
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
// Step 7.
|
|
|
|
|
if (! isInterface () && superclass)
|
|
|
|
|
{
|
2000-03-02 21:25:20 +01:00
|
|
|
|
try
|
|
|
|
|
{
|
2001-01-17 11:22:33 +01:00
|
|
|
|
_Jv_InitClass (superclass);
|
2000-03-02 21:25:20 +01:00
|
|
|
|
}
|
2007-01-29 14:14:38 +01:00
|
|
|
|
catch (java::lang::SecurityException *x)
|
|
|
|
|
{
|
|
|
|
|
throw x;
|
|
|
|
|
}
|
2000-03-02 21:25:20 +01:00
|
|
|
|
catch (java::lang::Throwable *except)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
|
|
|
|
// Caught an exception.
|
2004-11-25 04:47:08 +01:00
|
|
|
|
JvSynchronize sync (this);
|
[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
|
|
|
|
state = JV_STATE_ERROR;
|
1999-09-02 05:46:35 +02:00
|
|
|
|
notifyAll ();
|
2000-03-02 21:25:20 +01:00
|
|
|
|
throw except;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-02 21:25:20 +01:00
|
|
|
|
// Steps 8, 9, 10, 11.
|
|
|
|
|
try
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-03-02 21:25:20 +01:00
|
|
|
|
_Jv_Method *meth = _Jv_GetMethodLocal (this, clinit_name,
|
|
|
|
|
void_signature);
|
|
|
|
|
if (meth)
|
|
|
|
|
((void (*) (void)) meth->ncode) ();
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
2007-01-29 14:14:38 +01:00
|
|
|
|
catch (java::lang::SecurityException *x)
|
|
|
|
|
{
|
|
|
|
|
throw x;
|
|
|
|
|
}
|
2000-03-02 21:25:20 +01:00
|
|
|
|
catch (java::lang::Throwable *except)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
(IntegerClass): Likewise.
* java/lang/natClass.cc (CloneableClass): Removed.
(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
ConstructorClass): Likewise.
* java/lang/natClassLoader.cc (CloneableClass): Removed.
(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
SerializableClass): Likewise.
* java/lang/reflect/natMethod.cc (BooleanClass): Removed.
(VoidClass, ByteClass, ShortClass, CharacterClass, IntegerClass,
LongClass, FloatClass, DoubleClass): Likewise.
From-SVN: r54977
2002-06-25 07:29:22 +02:00
|
|
|
|
if (! java::lang::Error::class$.isInstance(except))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-03-02 21:25:20 +01:00
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
except = new ExceptionInInitializerError (except);
|
|
|
|
|
}
|
|
|
|
|
catch (java::lang::Throwable *t)
|
|
|
|
|
{
|
|
|
|
|
except = t;
|
|
|
|
|
}
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
2004-11-25 04:47:08 +01:00
|
|
|
|
|
|
|
|
|
JvSynchronize sync (this);
|
[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
|
|
|
|
state = JV_STATE_ERROR;
|
2000-03-02 21:25:20 +01:00
|
|
|
|
notifyAll ();
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw except;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
2000-03-02 21:25:20 +01:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
JvSynchronize sync (this);
|
2000-03-02 21:25:20 +01:00
|
|
|
|
state = JV_STATE_DONE;
|
1999-09-02 05:46:35 +02:00
|
|
|
|
notifyAll ();
|
2004-11-25 04:47:08 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Only used by serialization
|
|
|
|
|
java::lang::reflect::Field *
|
|
|
|
|
java::lang::Class::getPrivateField (jstring name)
|
|
|
|
|
{
|
|
|
|
|
int hash = name->hashCode ();
|
|
|
|
|
|
|
|
|
|
java::lang::reflect::Field* rfield;
|
|
|
|
|
for (int i = 0; i < field_count; i++)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Field *field = &fields[i];
|
|
|
|
|
if (! _Jv_equal (field->name, name, hash))
|
|
|
|
|
continue;
|
|
|
|
|
rfield = new java::lang::reflect::Field ();
|
|
|
|
|
rfield->offset = (char*) field - (char*) fields;
|
|
|
|
|
rfield->declaringClass = this;
|
|
|
|
|
rfield->name = name;
|
|
|
|
|
return rfield;
|
|
|
|
|
}
|
|
|
|
|
jclass superclass = getSuperclass();
|
|
|
|
|
if (superclass == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
rfield = superclass->getPrivateField(name);
|
|
|
|
|
for (int i = 0; i < interface_count && rfield == NULL; ++i)
|
|
|
|
|
rfield = interfaces[i]->getPrivateField (name);
|
|
|
|
|
return rfield;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Only used by serialization
|
|
|
|
|
java::lang::reflect::Method *
|
|
|
|
|
java::lang::Class::getPrivateMethod (jstring name, JArray<jclass> *param_types)
|
|
|
|
|
{
|
|
|
|
|
jstring partial_sig = getSignature (param_types, false);
|
|
|
|
|
jint p_len = partial_sig->length();
|
|
|
|
|
_Jv_Utf8Const *utf_name = _Jv_makeUtf8Const (name);
|
|
|
|
|
for (Class *klass = this; klass; klass = klass->getSuperclass())
|
|
|
|
|
{
|
|
|
|
|
int i = klass->isPrimitive () ? 0 : klass->method_count;
|
|
|
|
|
while (--i >= 0)
|
|
|
|
|
{
|
|
|
|
|
if (_Jv_equalUtf8Consts (klass->methods[i].name, utf_name)
|
|
|
|
|
&& _Jv_equaln (klass->methods[i].signature, partial_sig, p_len))
|
|
|
|
|
{
|
|
|
|
|
// Found it.
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
|
|
|
|
|
Method *rmethod = new Method ();
|
|
|
|
|
rmethod->offset = ((char *) (&klass->methods[i])
|
|
|
|
|
- (char *) klass->methods);
|
|
|
|
|
rmethod->declaringClass = klass;
|
|
|
|
|
return rmethod;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
throw new java::lang::NoSuchMethodException (name);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Private accessor method for Java code to retrieve the protection domain.
|
|
|
|
|
java::security::ProtectionDomain *
|
|
|
|
|
java::lang::Class::getProtectionDomain0 ()
|
|
|
|
|
{
|
|
|
|
|
return protectionDomain;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JArray<jobject> *
|
|
|
|
|
java::lang::Class::getSigners()
|
|
|
|
|
{
|
|
|
|
|
return hack_signers;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
java::lang::Class::setSigners(JArray<jobject> *s)
|
|
|
|
|
{
|
|
|
|
|
hack_signers = s;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2007-01-09 20:58:05 +01:00
|
|
|
|
static unsigned char
|
|
|
|
|
read_u1 (unsigned char *&p)
|
|
|
|
|
{
|
|
|
|
|
return *p++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned char
|
|
|
|
|
read_u1 (unsigned char *&p, unsigned char *next)
|
|
|
|
|
{
|
|
|
|
|
if (next - p < 1)
|
|
|
|
|
throw new java::lang::InternalError();
|
|
|
|
|
return *p++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
|
read_u2 (unsigned char *&p)
|
|
|
|
|
{
|
|
|
|
|
unsigned int b1 = *p++;
|
|
|
|
|
unsigned int b2 = *p++;
|
|
|
|
|
return (b1 << 8) | b2;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static unsigned int
|
|
|
|
|
read_u2 (unsigned char *&p, unsigned char *next)
|
|
|
|
|
{
|
|
|
|
|
if (next - p < 2)
|
|
|
|
|
throw new java::lang::InternalError();
|
|
|
|
|
return read_u2 (p);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static int
|
|
|
|
|
read_4 (unsigned char *&p)
|
|
|
|
|
{
|
|
|
|
|
int b1 = *p++;
|
|
|
|
|
int b2 = *p++;
|
|
|
|
|
int b3 = *p++;
|
|
|
|
|
int b4 = *p++;
|
|
|
|
|
return (b1 << 24) | (b2 << 16) | (b3 << 8) | b4;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jstring
|
|
|
|
|
java::lang::Class::getReflectionSignature (jint /*jv_attr_type*/ type,
|
|
|
|
|
jint obj_index)
|
|
|
|
|
{
|
|
|
|
|
// We just re-parse the bytecode for this data each time. If
|
|
|
|
|
// necessary we can cache results, but I suspect this is not
|
|
|
|
|
// performance sensitive.
|
|
|
|
|
unsigned char *bytes = reflection_data;
|
|
|
|
|
if (bytes == NULL)
|
|
|
|
|
return NULL;
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
|
|
|
|
int kind = read_u1 (bytes);
|
|
|
|
|
if (kind == JV_DONE_ATTR)
|
|
|
|
|
return NULL;
|
|
|
|
|
int len = read_4 (bytes);
|
|
|
|
|
unsigned char *next = bytes + len;
|
|
|
|
|
if (kind != type)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (type != JV_CLASS_ATTR)
|
|
|
|
|
{
|
|
|
|
|
unsigned short index = read_u2 (bytes, next);
|
|
|
|
|
if (index != obj_index)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
int nt = read_u1 (bytes, next);
|
|
|
|
|
if (nt != JV_SIGNATURE_KIND)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
unsigned int cpool_idx = read_u2 (bytes, next);
|
|
|
|
|
if (cpool_idx >= (unsigned int) constants.size
|
|
|
|
|
|| constants.tags[cpool_idx] != JV_CONSTANT_Utf8)
|
|
|
|
|
{
|
|
|
|
|
// We just ignore errors for now. It isn't clear what is
|
|
|
|
|
// best to do here, as an encoding error here means a bug
|
|
|
|
|
// either in the compiler or in defineclass.cc.
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
return _Jv_NewStringUtf8Const (constants.data[cpool_idx].utf8);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jstring
|
|
|
|
|
java::lang::Class::getReflectionSignature (::java::lang::reflect::Constructor *c)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Method *meth = _Jv_FromReflectedConstructor (c);
|
|
|
|
|
unsigned short meth_index = meth - methods;
|
|
|
|
|
return getReflectionSignature (JV_METHOD_ATTR, meth_index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jstring
|
|
|
|
|
java::lang::Class::getReflectionSignature (::java::lang::reflect::Method *m)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Method *meth = _Jv_FromReflectedMethod (m);
|
|
|
|
|
unsigned short meth_index = meth - methods;
|
|
|
|
|
return getReflectionSignature (JV_METHOD_ATTR, meth_index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jstring
|
|
|
|
|
java::lang::Class::getReflectionSignature (::java::lang::reflect::Field *f)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Field *fld = _Jv_FromReflectedField (f);
|
|
|
|
|
unsigned short fld_index = fld - fields;
|
|
|
|
|
return getReflectionSignature (JV_FIELD_ATTR, fld_index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jstring
|
|
|
|
|
java::lang::Class::getClassSignature()
|
|
|
|
|
{
|
|
|
|
|
return getReflectionSignature (JV_CLASS_ATTR, 0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jint
|
|
|
|
|
java::lang::Class::getEnclosingMethodData()
|
|
|
|
|
{
|
|
|
|
|
unsigned char *bytes = reflection_data;
|
|
|
|
|
if (bytes == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
|
|
|
|
int kind = read_u1 (bytes);
|
|
|
|
|
if (kind == JV_DONE_ATTR)
|
|
|
|
|
return 0;
|
|
|
|
|
int len = read_4 (bytes);
|
|
|
|
|
unsigned char *next = bytes + len;
|
|
|
|
|
if (kind != JV_CLASS_ATTR)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
int type = read_u1 (bytes, next);
|
|
|
|
|
if (type != JV_ENCLOSING_METHOD_KIND)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
int class_index = read_u2 (bytes, next);
|
|
|
|
|
int method_index = read_u2 (bytes, next);
|
|
|
|
|
_Jv_word result;
|
|
|
|
|
_Jv_storeIndexes (&result, class_index, method_index);
|
|
|
|
|
return result.i;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jclass
|
|
|
|
|
java::lang::Class::getEnclosingClass()
|
|
|
|
|
{
|
|
|
|
|
_Jv_word indexes;
|
|
|
|
|
indexes.i = getEnclosingMethodData();
|
|
|
|
|
if (indexes.i == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
_Jv_ushort class_index, method_index;
|
|
|
|
|
_Jv_loadIndexes (&indexes, class_index, method_index);
|
|
|
|
|
return _Jv_Linker::resolve_pool_entry (this, class_index).clazz;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
::java::lang::reflect::Method *
|
|
|
|
|
java::lang::Class::getEnclosingMethod()
|
|
|
|
|
{
|
|
|
|
|
_Jv_word indexes;
|
|
|
|
|
indexes.i = getEnclosingMethodData();
|
|
|
|
|
if (indexes.i == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
_Jv_ushort class_index, method_index;
|
|
|
|
|
_Jv_loadIndexes (&indexes, class_index, method_index);
|
|
|
|
|
jclass found_class;
|
|
|
|
|
_Jv_Method *method = _Jv_Linker::resolve_method_entry (this, found_class,
|
|
|
|
|
class_index,
|
|
|
|
|
method_index,
|
|
|
|
|
false, false);
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
Method *rmethod = new Method ();
|
|
|
|
|
rmethod->offset = (char *) method - (char *) found_class->methods;
|
|
|
|
|
rmethod->declaringClass = found_class;
|
|
|
|
|
return rmethod;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
::java::lang::reflect::Constructor *
|
|
|
|
|
java::lang::Class::getEnclosingConstructor()
|
|
|
|
|
{
|
|
|
|
|
_Jv_word indexes;
|
|
|
|
|
indexes.i = getEnclosingMethodData();
|
|
|
|
|
if (indexes.i == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
_Jv_ushort class_index, method_index;
|
|
|
|
|
_Jv_loadIndexes (&indexes, class_index, method_index);
|
|
|
|
|
jclass found_class;
|
|
|
|
|
_Jv_Method *method = _Jv_Linker::resolve_method_entry (this, found_class,
|
|
|
|
|
class_index,
|
|
|
|
|
method_index,
|
|
|
|
|
false, false);
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
Constructor *cons = new Constructor ();
|
|
|
|
|
cons->offset = (char *) method - (char *) found_class->methods;
|
|
|
|
|
cons->declaringClass = this;
|
|
|
|
|
return cons;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
check_constant (_Jv_Constants *pool, jint cpool_index, jint type)
|
|
|
|
|
{
|
|
|
|
|
if (cpool_index <= 0 || cpool_index >= pool->size)
|
|
|
|
|
throw new InternalError(JvNewStringLatin1("invalid constant pool index"));
|
|
|
|
|
if ((pool->tags[cpool_index] &
|
|
|
|
|
~(JV_CONSTANT_ResolvedFlag|JV_CONSTANT_LazyFlag)) != type)
|
|
|
|
|
{
|
|
|
|
|
::java::lang::StringBuffer *sb = new ::java::lang::StringBuffer();
|
|
|
|
|
sb->append(JvNewStringLatin1("expected pool constant "));
|
|
|
|
|
sb->append(type);
|
|
|
|
|
sb->append(JvNewStringLatin1(" but got "));
|
|
|
|
|
sb->append(jint (pool->tags[cpool_index]));
|
|
|
|
|
throw new InternalError(sb->toString());
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Forward declaration
|
|
|
|
|
static ::java::lang::annotation::Annotation *
|
|
|
|
|
parseAnnotation(jclass klass, _Jv_Constants *pool,
|
|
|
|
|
unsigned char *&bytes, unsigned char *last);
|
|
|
|
|
|
|
|
|
|
static jobject
|
|
|
|
|
parseAnnotationElement(jclass klass, _Jv_Constants *pool,
|
|
|
|
|
unsigned char *&bytes, unsigned char *last)
|
|
|
|
|
{
|
|
|
|
|
int tag = read_u1 (bytes, last);
|
|
|
|
|
jobject result;
|
|
|
|
|
switch (tag)
|
|
|
|
|
{
|
|
|
|
|
case 'B':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Integer);
|
|
|
|
|
result = Byte::valueOf (pool->data[cindex].i);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'C':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Integer);
|
|
|
|
|
result = Character::valueOf (pool->data[cindex].i);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'S':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Integer);
|
|
|
|
|
result = Short::valueOf (pool->data[cindex].i);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'Z':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Integer);
|
|
|
|
|
result = Boolean::valueOf (jboolean (pool->data[cindex].i));
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'I':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Integer);
|
|
|
|
|
result = Integer::valueOf (pool->data[cindex].i);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'D':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Double);
|
|
|
|
|
_Jv_word2 word;
|
|
|
|
|
memcpy (&word, &pool->data[cindex], 2 * sizeof (_Jv_word));
|
|
|
|
|
result = Double::valueOf (word.d);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'F':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Float);
|
|
|
|
|
result = Float::valueOf (pool->data[cindex].f);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'J':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
2007-03-05 12:33:46 +01:00
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Long);
|
2007-01-09 20:58:05 +01:00
|
|
|
|
_Jv_word2 word;
|
|
|
|
|
memcpy (&word, &pool->data[cindex], 2 * sizeof (_Jv_word));
|
|
|
|
|
result = Long::valueOf (word.l);
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 's':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
|
|
|
|
// Despite what the JVM spec says, compilers generate a Utf8
|
|
|
|
|
// constant here, not a String.
|
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Utf8);
|
|
|
|
|
result = pool->data[cindex].utf8->toString();
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'e':
|
|
|
|
|
{
|
|
|
|
|
int type_name_index = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, type_name_index, JV_CONSTANT_Utf8);
|
|
|
|
|
int const_name_index = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, const_name_index, JV_CONSTANT_Utf8);
|
|
|
|
|
|
|
|
|
|
_Jv_Utf8Const *u_name = pool->data[type_name_index].utf8;
|
|
|
|
|
_Jv_Utf8Const *e_name = pool->data[const_name_index].utf8;
|
|
|
|
|
|
|
|
|
|
// FIXME: throw correct exceptions at the correct times.
|
|
|
|
|
jclass e_class = _Jv_FindClassFromSignature(u_name->chars(),
|
|
|
|
|
klass->getClassLoaderInternal());
|
|
|
|
|
result = ::java::lang::Enum::valueOf(e_class, e_name->toString());
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case 'c':
|
|
|
|
|
{
|
|
|
|
|
int cindex = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, cindex, JV_CONSTANT_Utf8);
|
|
|
|
|
_Jv_Utf8Const *u_name = pool->data[cindex].utf8;
|
|
|
|
|
jclass anno_class
|
|
|
|
|
= _Jv_FindClassFromSignatureNoException(u_name->chars(),
|
|
|
|
|
klass->getClassLoaderInternal());
|
|
|
|
|
// FIXME: not correct: we should lazily do this when trying to
|
|
|
|
|
// read the element. This means that
|
|
|
|
|
// AnnotationInvocationHandler needs to have a special case.
|
|
|
|
|
if (! anno_class)
|
|
|
|
|
// FIXME: original exception...
|
|
|
|
|
throw new TypeNotPresentException(u_name->toString(), NULL);
|
|
|
|
|
result = anno_class;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
case '@':
|
|
|
|
|
result = parseAnnotation (klass, pool, bytes, last);
|
|
|
|
|
break;
|
|
|
|
|
case '[':
|
|
|
|
|
{
|
|
|
|
|
int n_array_elts = read_u2 (bytes, last);
|
|
|
|
|
jobjectArray aresult = _Jv_NewObjectArray (n_array_elts,
|
|
|
|
|
&Object::class$, NULL);
|
|
|
|
|
jobject *elts = elements (aresult);
|
|
|
|
|
for (int i = 0; i < n_array_elts; ++i)
|
|
|
|
|
elts[i] = parseAnnotationElement(klass, pool, bytes, last);
|
|
|
|
|
result = aresult;
|
|
|
|
|
}
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
throw new java::lang::InternalError();
|
|
|
|
|
}
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static ::java::lang::annotation::Annotation *
|
|
|
|
|
parseAnnotation(jclass klass, _Jv_Constants *pool,
|
|
|
|
|
unsigned char *&bytes, unsigned char *last)
|
|
|
|
|
{
|
|
|
|
|
int type_index = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, type_index, JV_CONSTANT_Utf8);
|
|
|
|
|
|
|
|
|
|
_Jv_Utf8Const *u_name = pool->data[type_index].utf8;
|
|
|
|
|
jclass anno_class = _Jv_FindClassFromSignatureNoException(u_name->chars(),
|
|
|
|
|
klass->getClassLoaderInternal());
|
|
|
|
|
// FIXME: what to do if anno_class==NULL?
|
|
|
|
|
|
|
|
|
|
::java::util::HashMap *hmap = new ::java::util::HashMap();
|
|
|
|
|
int npairs = read_u2 (bytes, last);
|
|
|
|
|
for (int i = 0; i < npairs; ++i)
|
|
|
|
|
{
|
|
|
|
|
int name_index = read_u2 (bytes, last);
|
|
|
|
|
check_constant (pool, name_index, JV_CONSTANT_Utf8);
|
|
|
|
|
jstring name = _Jv_NewStringUtf8Const (pool->data[name_index].utf8);
|
|
|
|
|
jobject value = parseAnnotationElement (klass, pool, bytes, last);
|
|
|
|
|
// FIXME: any checks needed for name?
|
|
|
|
|
hmap->put(name, value);
|
|
|
|
|
}
|
|
|
|
|
using namespace ::sun::reflect::annotation;
|
|
|
|
|
return AnnotationInvocationHandler::create (anno_class,
|
|
|
|
|
(::java::util::Map *) hmap);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static jobjectArray
|
|
|
|
|
parseAnnotations(jclass klass, _Jv_Constants *pool,
|
|
|
|
|
unsigned char *&bytes, unsigned char *last)
|
|
|
|
|
{
|
|
|
|
|
int num = read_u2 (bytes, last);
|
|
|
|
|
jobjectArray result = _Jv_NewObjectArray (num,
|
|
|
|
|
&::java::lang::annotation::Annotation::class$,
|
|
|
|
|
NULL);
|
|
|
|
|
jobject *elts = elements (result);
|
|
|
|
|
for (int i = 0; i < num; ++i)
|
|
|
|
|
elts[i] = parseAnnotation(klass, pool, bytes, last);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static jobjectArray
|
|
|
|
|
parseParameterAnnotations(jclass klass, _Jv_Constants *pool,
|
|
|
|
|
unsigned char *&bytes, unsigned char *last)
|
|
|
|
|
{
|
|
|
|
|
jclass anno = &::java::lang::annotation::Annotation::class$;
|
|
|
|
|
jclass annoary = _Jv_GetArrayClass (anno, anno->getClassLoaderInternal());
|
|
|
|
|
|
|
|
|
|
// FIXME: something should check the number of params versus the
|
|
|
|
|
// method
|
|
|
|
|
int n_params = read_u1 (bytes, last);
|
|
|
|
|
jobjectArray result = _Jv_NewObjectArray (n_params, annoary, NULL);
|
|
|
|
|
jobject *elts = elements (result);
|
|
|
|
|
for (int i = 0; i < n_params; ++i)
|
|
|
|
|
elts[i] = parseAnnotations(klass, pool, bytes, last);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobject
|
|
|
|
|
java::lang::Class::getMethodDefaultValue(::java::lang::reflect::Method *meth)
|
|
|
|
|
{
|
|
|
|
|
// FIXME: could cache the value here...
|
|
|
|
|
|
|
|
|
|
unsigned char *bytes = reflection_data;
|
|
|
|
|
if (bytes == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
unsigned short meth_index = _Jv_FromReflectedMethod (meth) - methods;
|
|
|
|
|
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
|
|
|
|
int type = read_u1 (bytes);
|
|
|
|
|
if (type == JV_DONE_ATTR)
|
|
|
|
|
return NULL;
|
|
|
|
|
int len = read_4 (bytes);
|
|
|
|
|
unsigned char *next = bytes + len;
|
|
|
|
|
if (type != JV_METHOD_ATTR)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
int kind = read_u1 (bytes, next);
|
|
|
|
|
if (kind != JV_ANNOTATION_DEFAULT_KIND)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
int index = read_u2 (bytes, next);
|
|
|
|
|
if (meth_index != index)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// FIXME: could cache here. If we do then we have to clone any
|
|
|
|
|
// array result.
|
|
|
|
|
return parseAnnotationElement(this, &this->constants, bytes, next);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobjectArray
|
|
|
|
|
java::lang::Class::getDeclaredAnnotations(jint /* jv_attr_type */ member_type,
|
|
|
|
|
jint member_index,
|
|
|
|
|
jint /* jv_attr_kind */ kind_req)
|
|
|
|
|
{
|
|
|
|
|
using namespace java::lang::annotation;
|
|
|
|
|
jobjectArray result;
|
|
|
|
|
|
|
|
|
|
unsigned char *bytes = reflection_data;
|
|
|
|
|
if (bytes == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
2007-03-02 20:34:18 +01:00
|
|
|
|
if (loader == NULL)
|
|
|
|
|
loader = (ClassLoader *)VMClassLoader::bootLoader;
|
2007-01-09 20:58:05 +01:00
|
|
|
|
|
|
|
|
|
result = (loader->getDeclaredAnnotations
|
|
|
|
|
(this, member_type, member_index, kind_req));
|
|
|
|
|
if (result)
|
|
|
|
|
return result;
|
|
|
|
|
|
|
|
|
|
for (;;)
|
|
|
|
|
{
|
|
|
|
|
int type = read_u1 (bytes);
|
|
|
|
|
if (type == JV_DONE_ATTR)
|
|
|
|
|
return NULL;
|
|
|
|
|
int len = read_4 (bytes);
|
|
|
|
|
unsigned char *next = bytes + len;
|
|
|
|
|
if (type != member_type)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
int kind = read_u1 (bytes, next);
|
|
|
|
|
if (kind != kind_req)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (member_type != JV_CLASS_ATTR)
|
|
|
|
|
{
|
|
|
|
|
int index = read_u2 (bytes, next);
|
|
|
|
|
if (member_index != index)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (kind_req == JV_PARAMETER_ANNOTATIONS_KIND)
|
|
|
|
|
result = ((parseParameterAnnotations
|
|
|
|
|
(this, &this->constants, bytes, next)));
|
|
|
|
|
else
|
|
|
|
|
result = ((parseAnnotations (this, &this->constants, bytes, next)));
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (loader->putDeclaredAnnotations
|
|
|
|
|
(this, member_type, member_index, kind_req, result));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobjectArray
|
|
|
|
|
java::lang::Class::getDeclaredAnnotations(::java::lang::reflect::Method *meth,
|
|
|
|
|
jboolean is_param)
|
|
|
|
|
{
|
|
|
|
|
unsigned short meth_index = _Jv_FromReflectedMethod (meth) - methods;
|
|
|
|
|
return getDeclaredAnnotations(JV_METHOD_ATTR, meth_index,
|
|
|
|
|
(is_param
|
|
|
|
|
? JV_PARAMETER_ANNOTATIONS_KIND
|
|
|
|
|
: JV_ANNOTATIONS_KIND));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobjectArray
|
|
|
|
|
java::lang::Class::getDeclaredAnnotations(::java::lang::reflect::Constructor *cons,
|
|
|
|
|
jboolean is_param)
|
|
|
|
|
{
|
|
|
|
|
unsigned short meth_index = _Jv_FromReflectedConstructor (cons) - methods;
|
|
|
|
|
return getDeclaredAnnotations(JV_METHOD_ATTR, meth_index,
|
|
|
|
|
(is_param
|
|
|
|
|
? JV_PARAMETER_ANNOTATIONS_KIND
|
|
|
|
|
: JV_ANNOTATIONS_KIND));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobjectArray
|
|
|
|
|
java::lang::Class::getDeclaredAnnotations(::java::lang::reflect::Field *fld)
|
|
|
|
|
{
|
|
|
|
|
unsigned short field_index = _Jv_FromReflectedField (fld) - fields;
|
|
|
|
|
return getDeclaredAnnotations(JV_FIELD_ATTR, field_index,
|
|
|
|
|
JV_ANNOTATIONS_KIND);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JArray< ::java::lang::annotation::Annotation *> *
|
|
|
|
|
java::lang::Class::getDeclaredAnnotationsInternal()
|
|
|
|
|
{
|
|
|
|
|
return (JArray< ::java::lang::annotation::Annotation *> *) getDeclaredAnnotations(JV_CLASS_ATTR, 0, JV_ANNOTATIONS_KIND);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static jclass
|
|
|
|
|
resolve_class_constant (jclass klass, _Jv_Constants *pool, int cpool_index)
|
|
|
|
|
{
|
|
|
|
|
check_constant (pool, cpool_index, JV_CONSTANT_Class);
|
|
|
|
|
// FIXME: what is the correct thing to do with an exception here?
|
|
|
|
|
return _Jv_Linker::resolve_pool_entry (klass, cpool_index, false).clazz;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jint
|
|
|
|
|
java::lang::Class::findInnerClassAttribute()
|
|
|
|
|
{
|
|
|
|
|
unsigned char *bytes = reflection_data;
|
|
|
|
|
if (bytes == NULL)
|
|
|
|
|
return -1;
|
|
|
|
|
while (true)
|
|
|
|
|
{
|
|
|
|
|
int type = read_u1 (bytes);
|
|
|
|
|
if (type == JV_DONE_ATTR)
|
|
|
|
|
break;
|
|
|
|
|
// After the type but before the length.
|
|
|
|
|
unsigned char *save = bytes;
|
|
|
|
|
int len = read_4 (bytes);
|
|
|
|
|
unsigned char *next = bytes + len;
|
|
|
|
|
if (type != JV_CLASS_ATTR)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
int kind = read_u1 (bytes, next);
|
|
|
|
|
if (kind != JV_INNER_CLASSES_KIND)
|
|
|
|
|
{
|
|
|
|
|
bytes = next;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
return save - reflection_data;
|
|
|
|
|
}
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jint
|
|
|
|
|
java::lang::Class::findDeclaredClasses(JArray<jclass> *result,
|
|
|
|
|
jboolean publicOnly,
|
|
|
|
|
jint offset)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *bytes = reflection_data + offset;
|
|
|
|
|
int len = read_4 (bytes);
|
|
|
|
|
unsigned char *next = bytes + len;
|
|
|
|
|
// Skip a byte.
|
|
|
|
|
read_u1 (bytes, next);
|
|
|
|
|
int n_classes = read_u2 (bytes, next);
|
|
|
|
|
int count = 0;
|
|
|
|
|
for (int i = 0; i < n_classes; ++i)
|
|
|
|
|
{
|
|
|
|
|
int inner_class_index = read_u2 (bytes, next);
|
|
|
|
|
int outer_class_index = read_u2 (bytes, next);
|
|
|
|
|
/*int inner_name_index = */ read_u2 (bytes, next);
|
|
|
|
|
int inner_flags = read_u2 (bytes, next);
|
|
|
|
|
|
|
|
|
|
if (inner_class_index == 0 || outer_class_index == 0)
|
|
|
|
|
continue;
|
|
|
|
|
if (resolve_class_constant (this, &constants, outer_class_index) == this)
|
|
|
|
|
{
|
|
|
|
|
jclass inner = resolve_class_constant (this, &constants,
|
|
|
|
|
inner_class_index);
|
|
|
|
|
if (! publicOnly
|
|
|
|
|
|| ((inner_flags
|
|
|
|
|
& java::lang::reflect::Modifier::PUBLIC) != 0))
|
|
|
|
|
{
|
|
|
|
|
if (result)
|
|
|
|
|
{
|
|
|
|
|
jclass *elts = elements (result);
|
|
|
|
|
elts[count] = inner;
|
|
|
|
|
}
|
|
|
|
|
++count;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
JArray<jclass> *
|
|
|
|
|
java::lang::Class::getDeclaredClasses (jboolean publicOnly)
|
|
|
|
|
{
|
|
|
|
|
int offset = findInnerClassAttribute();
|
|
|
|
|
int count;
|
|
|
|
|
if (offset == -1)
|
|
|
|
|
{
|
|
|
|
|
// No InnerClasses attribute, so no declared classes.
|
|
|
|
|
count = 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
count = findDeclaredClasses(NULL, publicOnly, offset);
|
|
|
|
|
JArray<jclass> *result
|
|
|
|
|
= (JArray<jclass> *) JvNewObjectArray (count, &java::lang::Class::class$,
|
|
|
|
|
NULL);
|
|
|
|
|
if (count > 0)
|
|
|
|
|
findDeclaredClasses(result, publicOnly, offset);
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jclass
|
|
|
|
|
java::lang::Class::getDeclaringClass (void)
|
|
|
|
|
{
|
|
|
|
|
int offset = findInnerClassAttribute();
|
|
|
|
|
if (offset == -1)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
unsigned char *bytes = reflection_data + offset;
|
|
|
|
|
int len = read_4 (bytes);
|
|
|
|
|
unsigned char *next = bytes + len;
|
|
|
|
|
// Skip a byte.
|
|
|
|
|
read_u1 (bytes, next);
|
|
|
|
|
int n_classes = read_u2 (bytes, next);
|
|
|
|
|
for (int i = 0; i < n_classes; ++i)
|
|
|
|
|
{
|
|
|
|
|
int inner_class_index = read_u2 (bytes, next);
|
|
|
|
|
int outer_class_index = read_u2 (bytes, next);
|
|
|
|
|
/*int inner_name_index = */read_u2 (bytes, next);
|
|
|
|
|
/*int inner_flags = */read_u2 (bytes, next);
|
|
|
|
|
|
|
|
|
|
if (inner_class_index == 0 || outer_class_index == 0)
|
|
|
|
|
continue;
|
|
|
|
|
if (resolve_class_constant (this, &constants, inner_class_index) == this)
|
|
|
|
|
return resolve_class_constant (this, &constants, outer_class_index);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jboolean
|
|
|
|
|
java::lang::Class::isAnonymousClass()
|
|
|
|
|
{
|
|
|
|
|
int offset = findInnerClassAttribute();
|
|
|
|
|
if (offset == -1)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
unsigned char *bytes = reflection_data + offset;
|
|
|
|
|
int len = read_4 (bytes);
|
|
|
|
|
unsigned char *next = bytes + len;
|
|
|
|
|
// Skip a byte.
|
|
|
|
|
read_u1 (bytes, next);
|
|
|
|
|
int n_classes = read_u2 (bytes, next);
|
|
|
|
|
for (int i = 0; i < n_classes; ++i)
|
|
|
|
|
{
|
|
|
|
|
int inner_class_index = read_u2 (bytes, next);
|
|
|
|
|
/*int outer_class_index = */read_u2 (bytes, next);
|
|
|
|
|
int inner_name_index = read_u2 (bytes, next);
|
|
|
|
|
/*int inner_flags = */read_u2 (bytes, next);
|
|
|
|
|
|
|
|
|
|
if (inner_class_index == 0)
|
|
|
|
|
continue;
|
|
|
|
|
if (resolve_class_constant (this, &constants, inner_class_index) == this)
|
|
|
|
|
return inner_name_index == 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jboolean
|
|
|
|
|
java::lang::Class::isLocalClass()
|
|
|
|
|
{
|
|
|
|
|
_Jv_word indexes;
|
|
|
|
|
indexes.i = getEnclosingMethodData();
|
|
|
|
|
return indexes.i != 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jboolean
|
|
|
|
|
java::lang::Class::isMemberClass()
|
|
|
|
|
{
|
|
|
|
|
// FIXME: is this correct?
|
|
|
|
|
return !isLocalClass() && getDeclaringClass() != NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
//
|
|
|
|
|
// Some class-related convenience functions.
|
|
|
|
|
//
|
|
|
|
|
|
2000-01-04 09:46:52 +01:00
|
|
|
|
// Find a method declared in the class. If it is not declared locally
|
|
|
|
|
// (or if it is inherited), return NULL.
|
1999-04-07 16:42:40 +02:00
|
|
|
|
_Jv_Method *
|
|
|
|
|
_Jv_GetMethodLocal (jclass klass, _Jv_Utf8Const *name,
|
|
|
|
|
_Jv_Utf8Const *signature)
|
|
|
|
|
{
|
|
|
|
|
for (int i = 0; i < klass->method_count; ++i)
|
|
|
|
|
{
|
|
|
|
|
if (_Jv_equalUtf8Consts (name, klass->methods[i].name)
|
|
|
|
|
&& _Jv_equalUtf8Consts (signature, klass->methods[i].signature))
|
|
|
|
|
return &klass->methods[i];
|
|
|
|
|
}
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2000-01-04 09:46:52 +01:00
|
|
|
|
_Jv_Method *
|
|
|
|
|
_Jv_LookupDeclaredMethod (jclass klass, _Jv_Utf8Const *name,
|
2004-11-25 04:47:08 +01:00
|
|
|
|
_Jv_Utf8Const *signature,
|
|
|
|
|
jclass *declarer_result)
|
2000-01-04 09:46:52 +01:00
|
|
|
|
{
|
|
|
|
|
for (; klass; klass = klass->getSuperclass())
|
|
|
|
|
{
|
|
|
|
|
_Jv_Method *meth = _Jv_GetMethodLocal (klass, name, signature);
|
|
|
|
|
|
|
|
|
|
if (meth)
|
2004-11-25 04:47:08 +01:00
|
|
|
|
{
|
|
|
|
|
if (declarer_result)
|
|
|
|
|
*declarer_result = klass;
|
|
|
|
|
return meth;
|
|
|
|
|
}
|
2000-01-04 09:46:52 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2007-03-05 17:06:27 +01:00
|
|
|
|
java::lang::reflect::Method *
|
|
|
|
|
_Jv_GetReflectedMethod (jclass klass, _Jv_Utf8Const *name,
|
|
|
|
|
_Jv_Utf8Const *signature)
|
|
|
|
|
{
|
|
|
|
|
for (; klass; klass = klass->getSuperclass())
|
|
|
|
|
{
|
|
|
|
|
_Jv_Method *meth = _Jv_GetMethodLocal (klass, name, signature);
|
|
|
|
|
if (meth)
|
|
|
|
|
{
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
Method *rmethod = new Method ();
|
|
|
|
|
rmethod->offset = (char*) meth - (char*) klass->methods;
|
|
|
|
|
rmethod->declaringClass = klass;
|
|
|
|
|
return rmethod;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
2005-09-27 22:03:09 +02:00
|
|
|
|
#ifdef HAVE_TLS
|
|
|
|
|
|
1999-11-18 08:19:00 +01:00
|
|
|
|
// NOTE: MCACHE_SIZE should be a power of 2 minus one.
|
2005-09-27 22:03:09 +02:00
|
|
|
|
#define MCACHE_SIZE 31
|
[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
|
|
|
|
|
1999-11-18 08:19:00 +01:00
|
|
|
|
struct _Jv_mcache
|
|
|
|
|
{
|
[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
|
|
|
|
jclass klass;
|
|
|
|
|
_Jv_Method *method;
|
|
|
|
|
};
|
|
|
|
|
|
2005-09-27 22:03:09 +02:00
|
|
|
|
static __thread _Jv_mcache *method_cache;
|
|
|
|
|
#endif // HAVE_TLS
|
[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
|
|
|
|
|
1999-11-04 20:47:01 +01:00
|
|
|
|
static void *
|
2006-05-21 00:03:19 +02:00
|
|
|
|
_Jv_FindMethodInCache (jclass klass MAYBE_UNUSED,
|
|
|
|
|
_Jv_Utf8Const *name MAYBE_UNUSED,
|
|
|
|
|
_Jv_Utf8Const *signature MAYBE_UNUSED)
|
[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
|
|
|
|
{
|
2005-09-27 22:03:09 +02:00
|
|
|
|
#ifdef HAVE_TLS
|
|
|
|
|
_Jv_mcache *cache = method_cache;
|
|
|
|
|
if (cache)
|
|
|
|
|
{
|
|
|
|
|
int index = name->hash16 () & MCACHE_SIZE;
|
|
|
|
|
_Jv_mcache *mc = &cache[index];
|
|
|
|
|
_Jv_Method *m = mc->method;
|
|
|
|
|
|
|
|
|
|
if (mc->klass == klass
|
|
|
|
|
&& _Jv_equalUtf8Consts (m->name, name)
|
|
|
|
|
&& _Jv_equalUtf8Consts (m->signature, signature))
|
|
|
|
|
return mc->method->ncode;
|
|
|
|
|
}
|
|
|
|
|
#endif // HAVE_TLS
|
[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
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
2006-05-21 00:03:19 +02:00
|
|
|
|
_Jv_AddMethodToCache (jclass klass MAYBE_UNUSED,
|
|
|
|
|
_Jv_Method *method MAYBE_UNUSED)
|
2005-09-27 22:03:09 +02:00
|
|
|
|
{
|
|
|
|
|
#ifdef HAVE_TLS
|
|
|
|
|
if (method_cache == NULL)
|
|
|
|
|
method_cache = (_Jv_mcache *) _Jv_MallocUnchecked((MCACHE_SIZE + 1)
|
|
|
|
|
* sizeof (_Jv_mcache));
|
|
|
|
|
// If the allocation failed, just keep going.
|
|
|
|
|
if (method_cache != NULL)
|
|
|
|
|
{
|
|
|
|
|
int index = method->name->hash16 () & MCACHE_SIZE;
|
|
|
|
|
method_cache[index].method = method;
|
|
|
|
|
method_cache[index].klass = klass;
|
|
|
|
|
}
|
|
|
|
|
#endif // HAVE_TLS
|
|
|
|
|
}
|
[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
|
|
|
|
|
2005-09-27 22:03:09 +02:00
|
|
|
|
// Free this thread's method cache. We explicitly manage this memory
|
|
|
|
|
// as the GC does not yet know how to scan TLS on all platforms.
|
|
|
|
|
void
|
|
|
|
|
_Jv_FreeMethodCache ()
|
|
|
|
|
{
|
|
|
|
|
#ifdef HAVE_TLS
|
|
|
|
|
if (method_cache != NULL)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Free(method_cache);
|
|
|
|
|
method_cache = NULL;
|
|
|
|
|
}
|
|
|
|
|
#endif // HAVE_TLS
|
[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
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
void *
|
|
|
|
|
_Jv_LookupInterfaceMethod (jclass klass, _Jv_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
|
|
|
|
_Jv_Utf8Const *signature)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
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
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
|
[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
|
|
|
|
void *ncode = _Jv_FindMethodInCache (klass, name, signature);
|
|
|
|
|
if (ncode != 0)
|
|
|
|
|
return ncode;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
for (; klass; klass = klass->getSuperclass())
|
|
|
|
|
{
|
|
|
|
|
_Jv_Method *meth = _Jv_GetMethodLocal (klass, name, signature);
|
|
|
|
|
if (! meth)
|
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
|
|
|
|
continue;
|
|
|
|
|
|
|
|
|
|
if (Modifier::isStatic(meth->accflags))
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::IncompatibleClassChangeError
|
2005-02-17 20:17:08 +01:00
|
|
|
|
(_Jv_GetMethodString (klass, meth));
|
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
|
|
|
|
if (Modifier::isAbstract(meth->accflags))
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::AbstractMethodError
|
2005-02-17 20:17:08 +01:00
|
|
|
|
(_Jv_GetMethodString (klass, meth));
|
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
|
|
|
|
if (! Modifier::isPublic(meth->accflags))
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::IllegalAccessError
|
2005-02-17 20:17:08 +01:00
|
|
|
|
(_Jv_GetMethodString (klass, meth));
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
[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_AddMethodToCache (klass, meth);
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
return meth->ncode;
|
|
|
|
|
}
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::IncompatibleClassChangeError;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
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
|
|
|
|
// Fast interface method lookup by index.
|
|
|
|
|
void *
|
|
|
|
|
_Jv_LookupInterfaceMethodIdx (jclass klass, jclass iface, int method_idx)
|
|
|
|
|
{
|
|
|
|
|
_Jv_IDispatchTable *cldt = klass->idt;
|
2006-02-10 00:59:30 +01:00
|
|
|
|
int idx = iface->ioffsets[cldt->iindex] + method_idx;
|
|
|
|
|
return cldt->itable[idx];
|
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
|
|
|
|
}
|
|
|
|
|
|
2000-11-26 04:58:56 +01:00
|
|
|
|
jboolean
|
2005-09-06 18:01:31 +02:00
|
|
|
|
_Jv_IsAssignableFrom (jclass source, jclass target)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2001-03-24 01:21:24 +01:00
|
|
|
|
if (source == target)
|
|
|
|
|
return true;
|
2003-05-01 23:36:18 +02:00
|
|
|
|
|
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
|
|
|
|
// If target is array, so must source be.
|
2003-05-01 23:36:18 +02:00
|
|
|
|
while (target->isArray ())
|
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
|
|
|
|
{
|
|
|
|
|
if (! source->isArray())
|
|
|
|
|
return false;
|
2003-05-01 23:36:18 +02:00
|
|
|
|
target = target->getComponentType();
|
|
|
|
|
source = source->getComponentType();
|
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
|
|
|
|
}
|
2000-05-19 19:55:34 +02:00
|
|
|
|
|
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
|
|
|
|
if (target->isInterface())
|
|
|
|
|
{
|
2000-06-15 13:58:18 +02:00
|
|
|
|
// Abstract classes have no IDT, and IDTs provide no way to check
|
|
|
|
|
// two interfaces for assignability.
|
|
|
|
|
if (__builtin_expect
|
2001-01-09 00:28:56 +01:00
|
|
|
|
(source->idt == NULL || source->isInterface(), false))
|
2005-09-06 18:01:31 +02:00
|
|
|
|
return _Jv_InterfaceAssignableFrom (source, target);
|
2003-05-01 23:36:18 +02:00
|
|
|
|
|
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
|
|
|
|
_Jv_IDispatchTable *cl_idt = source->idt;
|
2000-05-19 19:55:34 +02:00
|
|
|
|
|
2006-02-10 00:59:30 +01:00
|
|
|
|
if (__builtin_expect ((target->ioffsets == NULL), false))
|
2000-03-21 06:12:20 +01:00
|
|
|
|
return false; // No class implementing TARGET has been loaded.
|
2006-02-10 00:59:30 +01:00
|
|
|
|
jshort cl_iindex = cl_idt->iindex;
|
|
|
|
|
if (cl_iindex < target->ioffsets[0])
|
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
|
|
|
|
{
|
2006-02-10 00:59:30 +01:00
|
|
|
|
jshort offset = target->ioffsets[cl_iindex];
|
|
|
|
|
if (offset != -1 && offset < cl_idt->itable_length
|
|
|
|
|
&& cl_idt->itable[offset] == target)
|
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
|
|
|
|
return true;
|
|
|
|
|
}
|
2001-03-24 01:21:24 +01:00
|
|
|
|
return false;
|
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
|
|
|
|
}
|
2003-05-01 23:36:18 +02:00
|
|
|
|
|
2001-06-05 11:46:36 +02:00
|
|
|
|
// Primitive TYPE classes are only assignable to themselves.
|
2003-05-01 23:36:18 +02:00
|
|
|
|
if (__builtin_expect (target->isPrimitive() || source->isPrimitive(), false))
|
2001-06-05 11:46:36 +02:00
|
|
|
|
return false;
|
2003-05-01 23:36:18 +02:00
|
|
|
|
|
natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
* java/net/natPlainDatagramSocketImpl.cc (BooleanClass): Removed.
(IntegerClass): Likewise.
* java/lang/natClass.cc (CloneableClass): Removed.
(ObjectClass, ErrorClass, ClassClass, MethodClass, FieldClass,
ConstructorClass): Likewise.
* java/lang/natClassLoader.cc (CloneableClass): Removed.
(ObjectClass, ClassClass, VMClassLoaderClass, ClassLoaderClass,
SerializableClass): Likewise.
* java/lang/reflect/natMethod.cc (BooleanClass): Removed.
(VoidClass, ByteClass, ShortClass, CharacterClass, IntegerClass,
LongClass, FloatClass, DoubleClass): Likewise.
From-SVN: r54977
2002-06-25 07:29:22 +02:00
|
|
|
|
if (target == &java::lang::Object::class$)
|
2003-05-01 23:36:18 +02:00
|
|
|
|
return true;
|
|
|
|
|
else if (source->ancestors == NULL || target->ancestors == NULL)
|
2001-06-05 11:46:36 +02:00
|
|
|
|
{
|
2003-05-01 23:36:18 +02:00
|
|
|
|
// We need this case when either SOURCE or TARGET has not has
|
|
|
|
|
// its constant-time tables prepared.
|
|
|
|
|
|
|
|
|
|
// At this point we know that TARGET can't be Object, so it is
|
|
|
|
|
// safe to use that as the termination point.
|
|
|
|
|
while (source && source != &java::lang::Object::class$)
|
|
|
|
|
{
|
|
|
|
|
if (source == target)
|
|
|
|
|
return true;
|
|
|
|
|
source = source->getSuperclass();
|
|
|
|
|
}
|
2001-06-05 11:46:36 +02:00
|
|
|
|
}
|
2003-05-01 23:36:18 +02:00
|
|
|
|
else if (source->depth >= target->depth
|
2001-06-05 11:46:36 +02:00
|
|
|
|
&& source->ancestors[source->depth - target->depth] == target)
|
2001-03-24 01:21:24 +01:00
|
|
|
|
return true;
|
2003-05-01 23:36:18 +02:00
|
|
|
|
|
2001-06-05 11:46:36 +02:00
|
|
|
|
return false;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-06-15 13:58:18 +02:00
|
|
|
|
// Interface type checking, the slow way. Returns TRUE if IFACE is a
|
|
|
|
|
// superinterface of SOURCE. This is used when SOURCE is also an interface,
|
|
|
|
|
// or a class with no interface dispatch table.
|
|
|
|
|
jboolean
|
2005-09-06 18:01:31 +02:00
|
|
|
|
_Jv_InterfaceAssignableFrom (jclass source, jclass iface)
|
2000-06-15 13:58:18 +02:00
|
|
|
|
{
|
|
|
|
|
for (int i = 0; i < source->interface_count; i++)
|
|
|
|
|
{
|
|
|
|
|
jclass interface = source->interfaces[i];
|
|
|
|
|
if (iface == interface
|
2005-09-06 18:01:31 +02:00
|
|
|
|
|| _Jv_InterfaceAssignableFrom (interface, iface))
|
2000-06-15 13:58:18 +02:00
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!source->isInterface()
|
|
|
|
|
&& source->superclass
|
2005-09-06 18:01:31 +02:00
|
|
|
|
&& _Jv_InterfaceAssignableFrom (source->superclass, iface))
|
2000-06-15 13:58:18 +02:00
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
jboolean
|
|
|
|
|
_Jv_IsInstanceOf(jobject obj, jclass cl)
|
|
|
|
|
{
|
2000-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (!obj, false))
|
|
|
|
|
return false;
|
2005-09-06 18:01:31 +02:00
|
|
|
|
return _Jv_IsAssignableFrom (JV_CLASS (obj), cl);
|
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
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void *
|
|
|
|
|
_Jv_CheckCast (jclass c, jobject obj)
|
|
|
|
|
{
|
2000-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect
|
2005-09-06 18:01:31 +02:00
|
|
|
|
(obj != NULL && ! _Jv_IsAssignableFrom(JV_CLASS (obj), c), false))
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::ClassCastException
|
|
|
|
|
((new java::lang::StringBuffer
|
|
|
|
|
(obj->getClass()->getName()))->append
|
|
|
|
|
(JvNewStringUTF(" cannot be cast to "))->append
|
|
|
|
|
(c->getName())->toString());
|
2001-03-19 00:07:57 +01:00
|
|
|
|
|
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
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_CheckArrayStore (jobject arr, jobject obj)
|
|
|
|
|
{
|
|
|
|
|
if (obj)
|
|
|
|
|
{
|
|
|
|
|
JvAssert (arr != NULL);
|
|
|
|
|
jclass elt_class = (JV_CLASS (arr))->getComponentType();
|
2002-12-03 14:50:05 +01:00
|
|
|
|
if (elt_class == &java::lang::Object::class$)
|
|
|
|
|
return;
|
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
|
|
|
|
jclass obj_class = JV_CLASS (obj);
|
2000-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect
|
2005-09-06 18:01:31 +02:00
|
|
|
|
(! _Jv_IsAssignableFrom (obj_class, elt_class), false))
|
2002-11-10 22:07:27 +01:00
|
|
|
|
throw new java::lang::ArrayStoreException
|
|
|
|
|
((new java::lang::StringBuffer
|
|
|
|
|
(JvNewStringUTF("Cannot store ")))->append
|
|
|
|
|
(obj_class->getName())->append
|
|
|
|
|
(JvNewStringUTF(" in array of type "))->append
|
|
|
|
|
(elt_class->getName())->toString());
|
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
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
jboolean
|
2005-09-06 18:01:31 +02:00
|
|
|
|
_Jv_IsAssignableFromSlow (jclass source, jclass target)
|
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
|
|
|
|
{
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// First, strip arrays.
|
|
|
|
|
while (target->isArray ())
|
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
|
|
|
|
{
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// If target is array, source must be as well.
|
|
|
|
|
if (! source->isArray ())
|
|
|
|
|
return false;
|
|
|
|
|
target = target->getComponentType ();
|
|
|
|
|
source = source->getComponentType ();
|
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
|
|
|
|
}
|
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Quick success.
|
|
|
|
|
if (target == &java::lang::Object::class$)
|
|
|
|
|
return true;
|
2003-01-31 00:20:45 +01:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Ensure that the classes have their supers installed.
|
|
|
|
|
_Jv_Linker::wait_for_state (source, JV_STATE_LOADING);
|
|
|
|
|
_Jv_Linker::wait_for_state (target, JV_STATE_LOADING);
|
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
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
do
|
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
|
|
|
|
{
|
2004-11-25 04:47:08 +01:00
|
|
|
|
if (source == target)
|
|
|
|
|
return true;
|
|
|
|
|
|
|
|
|
|
if (target->isPrimitive () || source->isPrimitive ())
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
if (target->isInterface ())
|
|
|
|
|
{
|
|
|
|
|
for (int i = 0; i < source->interface_count; ++i)
|
|
|
|
|
{
|
|
|
|
|
// We use a recursive call because we also need to
|
|
|
|
|
// check superinterfaces.
|
2005-09-06 18:01:31 +02:00
|
|
|
|
if (_Jv_IsAssignableFromSlow (source->getInterface (i), target))
|
2004-11-25 04:47:08 +01:00
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
source = source->getSuperclass ();
|
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
|
|
|
|
}
|
2004-11-25 04:47:08 +01:00
|
|
|
|
while (source != NULL);
|
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
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
return false;
|
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
|
|
|
|
}
|
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Lookup an interface method by name. This is very similar to
|
|
|
|
|
// purpose to _getMethod, but the interfaces are quite different. It
|
|
|
|
|
// might be a good idea for _getMethod to call this function.
|
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
|
|
|
|
//
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Return true of the method is found, with the class in FOUND_CLASS
|
|
|
|
|
// and the index in INDEX.
|
|
|
|
|
bool
|
|
|
|
|
_Jv_getInterfaceMethod (jclass search_class, jclass &found_class, int &index,
|
|
|
|
|
const _Jv_Utf8Const *utf_name,
|
|
|
|
|
const _Jv_Utf8Const *utf_sig)
|
2000-05-19 19:55:34 +02:00
|
|
|
|
{
|
2004-11-25 04:47:08 +01:00
|
|
|
|
for (jclass klass = search_class; klass; klass = klass->getSuperclass())
|
2000-05-19 19:55:34 +02:00
|
|
|
|
{
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// FIXME: Throw an exception?
|
|
|
|
|
if (!klass->isInterface ())
|
|
|
|
|
return false;
|
|
|
|
|
|
2006-04-24 23:28:36 +02:00
|
|
|
|
int max = klass->method_count;
|
|
|
|
|
int offset = 0;
|
|
|
|
|
for (int i = 0; i < max; ++i)
|
2000-05-19 19:55:34 +02:00
|
|
|
|
{
|
2006-04-24 23:28:36 +02:00
|
|
|
|
// Skip <clinit> here, as it will not be in the IDT.
|
|
|
|
|
if (klass->methods[i].name->first() == '<')
|
|
|
|
|
continue;
|
|
|
|
|
|
2000-05-19 19:55:34 +02:00
|
|
|
|
if (_Jv_equalUtf8Consts (klass->methods[i].name, utf_name)
|
2004-11-25 04:47:08 +01:00
|
|
|
|
&& _Jv_equalUtf8Consts (klass->methods[i].signature, utf_sig))
|
2000-05-19 19:55:34 +02:00
|
|
|
|
{
|
|
|
|
|
// Found it.
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// FIXME: Method must be public. Throw an exception?
|
|
|
|
|
if (! Modifier::isPublic (klass->methods[i].accflags))
|
|
|
|
|
break;
|
2003-10-24 11:29:43 +02:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
found_class = klass;
|
|
|
|
|
// Interface method indexes count from 1.
|
2006-04-24 23:28:36 +02:00
|
|
|
|
index = offset + 1;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
return true;
|
2003-10-24 11:29:43 +02:00
|
|
|
|
}
|
2006-04-24 23:28:36 +02:00
|
|
|
|
|
|
|
|
|
++offset;
|
2003-10-24 11:29:43 +02:00
|
|
|
|
}
|
java-tree.h (otable_methods, [...]): New field/global tree definitions.
gcc/java:
* java-tree.h (otable_methods, otable_decl, otable_syms_decl,
otable_type, otable_ptr_type, method_symbol_type,
method_symbols_array_type, method_symbols_array_ptr_type): New
field/global tree definitions.
(flag_indirect_dispatch): New flag.
* decl.c (java_init_decl_processing): Initialize new otable and
otable_syms type nodes and decls. Add new field "index" to
method_type_node.
* class.c (build_method_symbols_entry): New function.
(make_method_value): Set "index" to to method's vtable index for
virtual methods when indirect-dispatch is not used.
(make_class_data): For indirect-dispatch, dont emit the dtable_decl,
and set vtable_method_count to -1. Set otable and otable_syms field
if indirect-dispatch is used and there was something to put in them.
(build_method_symbols_entry): New function.
(emit_offset_symbol_table): New function.
* expr.c (get_offset_table_index): New function.
(build_invokevirtual): Build array reference to otable at the index
returned by get_offset_table_index, and use the result as the vtable
offset.
(build_invokeinterface): Similar.
* jcf-parse.c (yyparse): If indirect-dispatch, call
emit_offset_symbol_table at the end of compilation, after all classes
have been generated.
* jvspec.c: Don't pass findirect-dispatch to jvgenmain.
* lang.c (flag_indirect_dispatch): Define.
(lang_f_options): Add indirect-dispatch flag.
libjava:
* include/jvm.h (_Jv_VTable::idx_to_offset): New method.
* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): Call
_Jv_MakeVTable and _Jv_LinkOffsetTable if needed.
* java/lang/Class.h (_Jv_Method): Add "index" field.
(_Jv_MethodSymbol): New struct type.
(_Jv_LinkOffsetTable, _Jv_LayoutVTableMethods, _Jv_SetVTableEntries,
_Jv_MakeVTable): Friends.
(otable, otable_syms): New Class fields.
* java/lang/natClass.cc (_Jv_LinkOffsetTable): New function.
(isVirtualMethod): New static function.
(_Jv_LayoutVTableMethods): New function.
(_Jv_SetVTableEntries): New function.
(_Jv_MakeVTable): New function.
From-SVN: r48038
2001-12-15 09:31:49 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// If we haven't found a match, and this class is an interface, then
|
|
|
|
|
// check all the superinterfaces.
|
|
|
|
|
if (search_class->isInterface())
|
java-tree.h (otable_methods, [...]): New field/global tree definitions.
gcc/java:
* java-tree.h (otable_methods, otable_decl, otable_syms_decl,
otable_type, otable_ptr_type, method_symbol_type,
method_symbols_array_type, method_symbols_array_ptr_type): New
field/global tree definitions.
(flag_indirect_dispatch): New flag.
* decl.c (java_init_decl_processing): Initialize new otable and
otable_syms type nodes and decls. Add new field "index" to
method_type_node.
* class.c (build_method_symbols_entry): New function.
(make_method_value): Set "index" to to method's vtable index for
virtual methods when indirect-dispatch is not used.
(make_class_data): For indirect-dispatch, dont emit the dtable_decl,
and set vtable_method_count to -1. Set otable and otable_syms field
if indirect-dispatch is used and there was something to put in them.
(build_method_symbols_entry): New function.
(emit_offset_symbol_table): New function.
* expr.c (get_offset_table_index): New function.
(build_invokevirtual): Build array reference to otable at the index
returned by get_offset_table_index, and use the result as the vtable
offset.
(build_invokeinterface): Similar.
* jcf-parse.c (yyparse): If indirect-dispatch, call
emit_offset_symbol_table at the end of compilation, after all classes
have been generated.
* jvspec.c: Don't pass findirect-dispatch to jvgenmain.
* lang.c (flag_indirect_dispatch): Define.
(lang_f_options): Add indirect-dispatch flag.
libjava:
* include/jvm.h (_Jv_VTable::idx_to_offset): New method.
* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): Call
_Jv_MakeVTable and _Jv_LinkOffsetTable if needed.
* java/lang/Class.h (_Jv_Method): Add "index" field.
(_Jv_MethodSymbol): New struct type.
(_Jv_LinkOffsetTable, _Jv_LayoutVTableMethods, _Jv_SetVTableEntries,
_Jv_MakeVTable): Friends.
(otable, otable_syms): New Class fields.
* java/lang/natClass.cc (_Jv_LinkOffsetTable): New function.
(isVirtualMethod): New static function.
(_Jv_LayoutVTableMethods): New function.
(_Jv_SetVTableEntries): New function.
(_Jv_MakeVTable): New function.
From-SVN: r48038
2001-12-15 09:31:49 +01:00
|
|
|
|
{
|
2004-11-25 04:47:08 +01:00
|
|
|
|
for (int i = 0; i < search_class->interface_count; ++i)
|
2002-12-05 08:43:45 +01:00
|
|
|
|
{
|
2004-11-25 04:47:08 +01:00
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
bool found = _Jv_getInterfaceMethod (search_class->interfaces[i],
|
2006-04-24 23:28:36 +02:00
|
|
|
|
found_class, index,
|
|
|
|
|
utf_name, utf_sig);
|
2004-11-25 04:47:08 +01:00
|
|
|
|
if (found)
|
|
|
|
|
return true;
|
2002-12-05 08:43:45 +01:00
|
|
|
|
}
|
java-tree.h (otable_methods, [...]): New field/global tree definitions.
gcc/java:
* java-tree.h (otable_methods, otable_decl, otable_syms_decl,
otable_type, otable_ptr_type, method_symbol_type,
method_symbols_array_type, method_symbols_array_ptr_type): New
field/global tree definitions.
(flag_indirect_dispatch): New flag.
* decl.c (java_init_decl_processing): Initialize new otable and
otable_syms type nodes and decls. Add new field "index" to
method_type_node.
* class.c (build_method_symbols_entry): New function.
(make_method_value): Set "index" to to method's vtable index for
virtual methods when indirect-dispatch is not used.
(make_class_data): For indirect-dispatch, dont emit the dtable_decl,
and set vtable_method_count to -1. Set otable and otable_syms field
if indirect-dispatch is used and there was something to put in them.
(build_method_symbols_entry): New function.
(emit_offset_symbol_table): New function.
* expr.c (get_offset_table_index): New function.
(build_invokevirtual): Build array reference to otable at the index
returned by get_offset_table_index, and use the result as the vtable
offset.
(build_invokeinterface): Similar.
* jcf-parse.c (yyparse): If indirect-dispatch, call
emit_offset_symbol_table at the end of compilation, after all classes
have been generated.
* jvspec.c: Don't pass findirect-dispatch to jvgenmain.
* lang.c (flag_indirect_dispatch): Define.
(lang_f_options): Add indirect-dispatch flag.
libjava:
* include/jvm.h (_Jv_VTable::idx_to_offset): New method.
* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): Call
_Jv_MakeVTable and _Jv_LinkOffsetTable if needed.
* java/lang/Class.h (_Jv_Method): Add "index" field.
(_Jv_MethodSymbol): New struct type.
(_Jv_LinkOffsetTable, _Jv_LayoutVTableMethods, _Jv_SetVTableEntries,
_Jv_MakeVTable): Friends.
(otable, otable_syms): New Class fields.
* java/lang/natClass.cc (_Jv_LinkOffsetTable): New function.
(isVirtualMethod): New static function.
(_Jv_LayoutVTableMethods): New function.
(_Jv_SetVTableEntries): New function.
(_Jv_MakeVTable): New function.
From-SVN: r48038
2001-12-15 09:31:49 +01:00
|
|
|
|
}
|
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
return false;
|
java-tree.h (otable_methods, [...]): New field/global tree definitions.
gcc/java:
* java-tree.h (otable_methods, otable_decl, otable_syms_decl,
otable_type, otable_ptr_type, method_symbol_type,
method_symbols_array_type, method_symbols_array_ptr_type): New
field/global tree definitions.
(flag_indirect_dispatch): New flag.
* decl.c (java_init_decl_processing): Initialize new otable and
otable_syms type nodes and decls. Add new field "index" to
method_type_node.
* class.c (build_method_symbols_entry): New function.
(make_method_value): Set "index" to to method's vtable index for
virtual methods when indirect-dispatch is not used.
(make_class_data): For indirect-dispatch, dont emit the dtable_decl,
and set vtable_method_count to -1. Set otable and otable_syms field
if indirect-dispatch is used and there was something to put in them.
(build_method_symbols_entry): New function.
(emit_offset_symbol_table): New function.
* expr.c (get_offset_table_index): New function.
(build_invokevirtual): Build array reference to otable at the index
returned by get_offset_table_index, and use the result as the vtable
offset.
(build_invokeinterface): Similar.
* jcf-parse.c (yyparse): If indirect-dispatch, call
emit_offset_symbol_table at the end of compilation, after all classes
have been generated.
* jvspec.c: Don't pass findirect-dispatch to jvgenmain.
* lang.c (flag_indirect_dispatch): Define.
(lang_f_options): Add indirect-dispatch flag.
libjava:
* include/jvm.h (_Jv_VTable::idx_to_offset): New method.
* java/lang/natClassLoader.cc (_Jv_PrepareCompiledClass): Call
_Jv_MakeVTable and _Jv_LinkOffsetTable if needed.
* java/lang/Class.h (_Jv_Method): Add "index" field.
(_Jv_MethodSymbol): New struct type.
(_Jv_LinkOffsetTable, _Jv_LayoutVTableMethods, _Jv_SetVTableEntries,
_Jv_MakeVTable): Friends.
(otable, otable_syms): New Class fields.
* java/lang/natClass.cc (_Jv_LinkOffsetTable): New function.
(isVirtualMethod): New static function.
(_Jv_LayoutVTableMethods): New function.
(_Jv_SetVTableEntries): New function.
(_Jv_MakeVTable): New function.
From-SVN: r48038
2001-12-15 09:31:49 +01:00
|
|
|
|
}
|
2006-01-23 19:44:43 +01:00
|
|
|
|
|
|
|
|
|
#ifdef INTERPRETER
|
2006-09-07 00:16:59 +02:00
|
|
|
|
_Jv_MethodBase *
|
2006-01-23 19:44:43 +01:00
|
|
|
|
_Jv_FindInterpreterMethod (jclass klass, jmethodID desired_method)
|
|
|
|
|
{
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
|
2006-09-07 00:16:59 +02:00
|
|
|
|
_Jv_InterpClass *iclass
|
|
|
|
|
= reinterpret_cast<_Jv_InterpClass *> (klass->aux_info);
|
|
|
|
|
_Jv_MethodBase **imethods = _Jv_GetFirstMethod (iclass);
|
2006-01-23 19:44:43 +01:00
|
|
|
|
|
|
|
|
|
for (int i = 0; i < JvNumMethods (klass); ++i)
|
|
|
|
|
{
|
2006-09-07 00:16:59 +02:00
|
|
|
|
_Jv_MethodBase *imeth = imethods[i];
|
|
|
|
|
if (imeth->get_method () == desired_method)
|
|
|
|
|
return imeth;
|
2006-01-23 19:44:43 +01:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
#endif
|
2006-10-19 01:17:04 +02:00
|
|
|
|
|
|
|
|
|
// Return Utf8 name of a class. This function is here for code that
|
|
|
|
|
// can't access klass->name directly.
|
|
|
|
|
_Jv_Utf8Const*
|
|
|
|
|
_Jv_GetClassNameUtf8 (jclass klass)
|
|
|
|
|
{
|
|
|
|
|
return klass->name;
|
|
|
|
|
}
|
2006-10-28 04:15:12 +02:00
|
|
|
|
|
|
|
|
|
jclass
|
|
|
|
|
_Jv_GetMethodDeclaringClass (jmethodID method)
|
|
|
|
|
{
|
|
|
|
|
_Jv_StackTrace::UpdateNCodeMap ();
|
|
|
|
|
jobject obj = reinterpret_cast<jobject> (method->ncode);
|
|
|
|
|
return reinterpret_cast<jclass> (_Jv_StackTrace::ncodeMap->get (obj));
|
|
|
|
|
}
|
|
|
|
|
|
2007-01-23 02:06:10 +01:00
|
|
|
|
jbyte
|
|
|
|
|
_Jv_GetClassState (jclass klass)
|
|
|
|
|
{
|
|
|
|
|
return klass->state;
|
|
|
|
|
}
|
|
|
|
|
|
2007-03-13 20:27:13 +01:00
|
|
|
|
jstring
|
|
|
|
|
_Jv_GetInterpClassSourceFile (jclass klass)
|
|
|
|
|
{
|
|
|
|
|
if (_Jv_IsInterpretedClass (klass))
|
|
|
|
|
{
|
|
|
|
|
_Jv_InterpClass *iclass =
|
|
|
|
|
reinterpret_cast<_Jv_InterpClass *> (klass->aux_info);
|
|
|
|
|
return iclass->source_file_name;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|