mirror of
git://gcc.gnu.org/git/gcc.git
synced 2024-12-19 11:59:55 +08:00
58eb6e7cef
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
341 lines
12 KiB
C++
341 lines
12 KiB
C++
// natField.cc - Implementation of java.lang.reflect.Field native methods.
|
|
|
|
/* Copyright (C) 1999 Cygnus Solutions
|
|
|
|
This file is part of libgcj.
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
details. */
|
|
|
|
#include <config.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <jvm.h>
|
|
#include <cni.h>
|
|
#include <java/lang/reflect/Array.h>
|
|
#include <java/lang/IllegalArgumentException.h>
|
|
#include <java/lang/Byte.h>
|
|
#include <java/lang/Short.h>
|
|
#include <java/lang/Integer.h>
|
|
#include <java/lang/Long.h>
|
|
#include <java/lang/Float.h>
|
|
#include <java/lang/Double.h>
|
|
#include <java/lang/Boolean.h>
|
|
#include <java/lang/Character.h>
|
|
|
|
jobject
|
|
java::lang::reflect::Array::newInstance (jclass componentType, jint length)
|
|
{
|
|
if (componentType->isPrimitive())
|
|
return _Jv_NewPrimArray (componentType, length);
|
|
else
|
|
return JvNewObjectArray (length, componentType, NULL);
|
|
|
|
}
|
|
|
|
jobject
|
|
java::lang::reflect::Array::newInstance (jclass componentType, jintArray dimensions)
|
|
{
|
|
jint ndims = dimensions->length;
|
|
if (ndims == 0)
|
|
return componentType->newInstance ();
|
|
jint* dims = elements (dimensions);
|
|
if (ndims == 1)
|
|
return newInstance (componentType, dims[0]);
|
|
jclass arrayType = componentType;
|
|
for (int i = 0; i < ndims; i++) // FIXME 2nd arg should
|
|
// be "current" loader
|
|
arrayType = _Jv_FindArrayClass (arrayType, 0);
|
|
|
|
return _Jv_NewMultiArray (arrayType, ndims, dims);
|
|
}
|
|
|
|
jint
|
|
java::lang::reflect::Array::getLength (jobject array)
|
|
{
|
|
jclass arrayType = array->getClass();
|
|
if (! arrayType->isArray ())
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
return ((__JArray*) array)->length;
|
|
}
|
|
|
|
jclass
|
|
java::lang::reflect::Array::getElementType (jobject array, jint index)
|
|
{
|
|
jclass arrayType = array->getClass();
|
|
if (! arrayType->isArray ())
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
jint length = ((__JArray*) array)->length;
|
|
if ((_Jv_uint) index >= (_Jv_uint) length)
|
|
_Jv_ThrowBadArrayIndex(index);
|
|
return arrayType->getComponentType ();
|
|
}
|
|
|
|
jboolean
|
|
java::lang::reflect::Array::getBoolean (jobject array, jint index)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (boolean))
|
|
return elements ((jbooleanArray) array) [index];
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
jchar
|
|
java::lang::reflect::Array::getChar (jobject array, jint index)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (char))
|
|
return elements ((jcharArray) array) [index];
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
jbyte
|
|
java::lang::reflect::Array::getByte (jobject array, jint index)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (byte))
|
|
return elements ((jbyteArray) array) [index];
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
jshort
|
|
java::lang::reflect::Array::getShort (jobject array, jint index)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (short))
|
|
return elements ((jshortArray) array) [index];
|
|
if (elementType == JvPrimClass (byte))
|
|
return elements ((jbyteArray) array) [index];
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
jint
|
|
java::lang::reflect::Array::getInt (jobject array, jint index)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (int))
|
|
return elements ((jintArray) array) [index];
|
|
if (elementType == JvPrimClass (short))
|
|
return elements ((jshortArray) array) [index];
|
|
if (elementType == JvPrimClass (byte))
|
|
return elements ((jbyteArray) array) [index];
|
|
if (elementType == JvPrimClass (char))
|
|
return elements ((jcharArray) array) [index];
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
jlong
|
|
java::lang::reflect::Array::getLong (jobject array, jint index)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (long))
|
|
return elements ((jlongArray) array) [index];
|
|
if (elementType == JvPrimClass (int))
|
|
return elements ((jintArray) array) [index];
|
|
if (elementType == JvPrimClass (short))
|
|
return elements ((jshortArray) array) [index];
|
|
if (elementType == JvPrimClass (byte))
|
|
return elements ((jbyteArray) array) [index];
|
|
if (elementType == JvPrimClass (char))
|
|
return elements ((jcharArray) array) [index];
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
jfloat
|
|
java::lang::reflect::Array::getFloat (jobject array, jint index)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (float))
|
|
return elements ((jfloatArray) array) [index];
|
|
if (elementType == JvPrimClass (long))
|
|
return elements ((jlongArray) array) [index];
|
|
if (elementType == JvPrimClass (int))
|
|
return elements ((jintArray) array) [index];
|
|
if (elementType == JvPrimClass (short))
|
|
return elements ((jshortArray) array) [index];
|
|
if (elementType == JvPrimClass (byte))
|
|
return elements ((jbyteArray) array) [index];
|
|
if (elementType == JvPrimClass (char))
|
|
return elements ((jcharArray) array) [index];
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
jdouble
|
|
java::lang::reflect::Array::getDouble (jobject array, jint index)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (double))
|
|
return elements ((jdoubleArray) array) [index];
|
|
if (elementType == JvPrimClass (float))
|
|
return elements ((jfloatArray) array) [index];
|
|
if (elementType == JvPrimClass (long))
|
|
return elements ((jlongArray) array) [index];
|
|
if (elementType == JvPrimClass (int))
|
|
return elements ((jintArray) array) [index];
|
|
if (elementType == JvPrimClass (short))
|
|
return elements ((jshortArray) array) [index];
|
|
if (elementType == JvPrimClass (byte))
|
|
return elements ((jbyteArray) array) [index];
|
|
if (elementType == JvPrimClass (char))
|
|
return elements ((jcharArray) array) [index];
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
jobject
|
|
java::lang::reflect::Array::get (jobject array, jint index)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (! elementType->isPrimitive ())
|
|
return elements ((jobjectArray) array) [index];
|
|
if (elementType == JvPrimClass (double))
|
|
return new java::lang::Double (elements ((jdoubleArray) array) [index]);
|
|
if (elementType == JvPrimClass (float))
|
|
return new java::lang::Float (elements ((jfloatArray) array) [index]);
|
|
if (elementType == JvPrimClass (long))
|
|
return new java::lang::Long (elements ((jlongArray) array) [index]);
|
|
if (elementType == JvPrimClass (int))
|
|
return new java::lang::Integer (elements ((jintArray) array) [index]);
|
|
if (elementType == JvPrimClass (short))
|
|
return new java::lang::Short (elements ((jshortArray) array) [index]);
|
|
if (elementType == JvPrimClass (byte))
|
|
return new java::lang::Byte (elements ((jbyteArray) array) [index]);
|
|
if (elementType == JvPrimClass (char))
|
|
return new java::lang::Character (elements ((jcharArray) array) [index]);
|
|
if (elementType == JvPrimClass (boolean))
|
|
if (elements ((jbooleanArray) array) [index])
|
|
return java::lang::Boolean::TRUE;
|
|
else
|
|
return java::lang::Boolean::FALSE;
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Array::setChar (jobject array, jint index, jchar value)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (char))
|
|
elements ((jcharArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (int))
|
|
elements ((jintArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (long))
|
|
elements ((jlongArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (float))
|
|
elements ((jfloatArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (double))
|
|
elements ((jdoubleArray) array) [index] = value;
|
|
else
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Array::setByte (jobject array, jint index, jbyte value)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (byte))
|
|
elements ((jbyteArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (short))
|
|
elements ((jshortArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (int))
|
|
elements ((jintArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (long))
|
|
elements ((jlongArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (float))
|
|
elements ((jfloatArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (double))
|
|
elements ((jdoubleArray) array) [index] = value;
|
|
else
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Array::setShort (jobject array, jint index, jshort value)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (short))
|
|
elements ((jshortArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (int))
|
|
elements ((jintArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (long))
|
|
elements ((jlongArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (float))
|
|
elements ((jfloatArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (double))
|
|
elements ((jdoubleArray) array) [index] = value;
|
|
else
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Array::setInt (jobject array, jint index, jint value)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (int))
|
|
elements ((jintArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (long))
|
|
elements ((jlongArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (float))
|
|
elements ((jfloatArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (double))
|
|
elements ((jdoubleArray) array) [index] = value;
|
|
else
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Array::setLong (jobject array, jint index, jlong value)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (long))
|
|
elements ((jlongArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (float))
|
|
elements ((jfloatArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (double))
|
|
elements ((jdoubleArray) array) [index] = value;
|
|
else
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Array::setFloat (jobject array, jint index, jfloat value)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (float))
|
|
elements ((jfloatArray) array) [index] = value;
|
|
else if (elementType == JvPrimClass (double))
|
|
elements ((jdoubleArray) array) [index] = value;
|
|
else
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Array::setDouble (jobject array, jint index, jdouble value)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (double))
|
|
elements ((jdoubleArray) array) [index] = value;
|
|
else
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Array::setBoolean (jobject array,
|
|
jint index, jboolean value)
|
|
{
|
|
jclass elementType = getElementType (array, index);
|
|
if (elementType == JvPrimClass (boolean))
|
|
elements ((jbooleanArray) array) [index] = value;
|
|
else
|
|
JvThrow (new java::lang::IllegalArgumentException());
|
|
}
|
|
|
|
void
|
|
java::lang::reflect::Array::set (jobject array, jint index,
|
|
jobject value, jclass elType)
|
|
{
|
|
if (! _Jv_IsInstanceOf (value, elType))
|
|
JvThrow (new java::lang::IllegalArgumentException ());
|
|
elements ((jobjectArray) array) [index] = value;
|
|
}
|