1999-04-07 16:42:40 +02:00
|
|
|
|
// prims.cc - Code for core of runtime environment.
|
|
|
|
|
|
2000-03-07 20:55:28 +01:00
|
|
|
|
/* Copyright (C) 1998, 1999, 2000 Free Software Foundation
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
This file is part of libgcj.
|
|
|
|
|
|
|
|
|
|
This software is copyrighted work licensed under the terms of the
|
|
|
|
|
Libgcj License. Please consult the file "LIBGCJ_LICENSE" for
|
|
|
|
|
details. */
|
|
|
|
|
|
|
|
|
|
#include <config.h>
|
|
|
|
|
|
2000-03-15 23:03:19 +01:00
|
|
|
|
#ifdef USE_WIN32_SIGNALLING
|
|
|
|
|
#include <windows.h>
|
|
|
|
|
#endif /* USE_WIN32_SIGNALLING */
|
|
|
|
|
|
|
|
|
|
#ifdef USE_WINSOCK
|
|
|
|
|
#undef __INSIDE_CYGWIN__
|
|
|
|
|
#include <winsock.h>
|
|
|
|
|
#endif /* USE_WINSOCK */
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
#include <stdarg.h>
|
|
|
|
|
#include <stdio.h>
|
|
|
|
|
#include <string.h>
|
1999-09-23 20:50:59 +02:00
|
|
|
|
#include <signal.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2000-01-17 16:45:24 +01:00
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-09-11 00:03:10 +02:00
|
|
|
|
#include <gcj/cni.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <jvm.h>
|
1999-04-13 11:18:09 +02:00
|
|
|
|
#include <java-signal.h>
|
1999-09-11 00:03:10 +02:00
|
|
|
|
#include <java-threads.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2000-04-02 17:34:17 +02:00
|
|
|
|
#ifdef ENABLE_JVMPI
|
|
|
|
|
#include <jvmpi.h>
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-10-15 08:07:41 +02:00
|
|
|
|
#ifndef DISABLE_GETENV_PROPERTIES
|
|
|
|
|
#include <ctype.h>
|
|
|
|
|
#include <java-props.h>
|
|
|
|
|
#define PROCESS_GCJ_PROPERTIES process_gcj_properties()
|
|
|
|
|
#else
|
|
|
|
|
#define PROCESS_GCJ_PROPERTIES
|
|
|
|
|
#endif // DISABLE_GETENV_PROPERTIES
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/Class.h>
|
|
|
|
|
#include <java/lang/Runtime.h>
|
|
|
|
|
#include <java/lang/String.h>
|
|
|
|
|
#include <java/lang/Thread.h>
|
|
|
|
|
#include <java/lang/ThreadGroup.h>
|
2000-03-05 23:26:30 +01:00
|
|
|
|
#include <gnu/gcj/runtime/FirstThread.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/ArrayIndexOutOfBoundsException.h>
|
1999-04-13 11:18:09 +02:00
|
|
|
|
#include <java/lang/ArithmeticException.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/ClassFormatError.h>
|
|
|
|
|
#include <java/lang/NegativeArraySizeException.h>
|
|
|
|
|
#include <java/lang/NullPointerException.h>
|
|
|
|
|
#include <java/lang/OutOfMemoryError.h>
|
|
|
|
|
#include <java/lang/System.h>
|
|
|
|
|
#include <java/lang/reflect/Modifier.h>
|
|
|
|
|
#include <java/io/PrintStream.h>
|
|
|
|
|
|
1999-05-05 16:19:24 +02:00
|
|
|
|
#ifdef USE_LTDL
|
|
|
|
|
#include <ltdl.h>
|
|
|
|
|
#endif
|
1999-04-13 11:18:09 +02:00
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#define ObjectClass _CL_Q34java4lang6Object
|
|
|
|
|
extern java::lang::Class ObjectClass;
|
|
|
|
|
|
|
|
|
|
// We allocate a single OutOfMemoryError exception which we keep
|
|
|
|
|
// around for use if we run out of memory.
|
|
|
|
|
static java::lang::OutOfMemoryError *no_memory;
|
|
|
|
|
|
|
|
|
|
// Largest representable size_t.
|
|
|
|
|
#define SIZE_T_MAX ((size_t) (~ (size_t) 0))
|
|
|
|
|
|
1999-10-22 21:43:41 +02:00
|
|
|
|
// Properties set at compile time.
|
|
|
|
|
const char **_Jv_Compiler_Properties;
|
|
|
|
|
|
1999-10-15 08:07:41 +02:00
|
|
|
|
#ifndef DISABLE_GETENV_PROPERTIES
|
|
|
|
|
// Property key/value pairs.
|
|
|
|
|
property_pair *_Jv_Environment_Properties;
|
|
|
|
|
#endif
|
2000-01-17 16:45:24 +01:00
|
|
|
|
|
|
|
|
|
// The name of this executable.
|
|
|
|
|
static char * _Jv_execName;
|
|
|
|
|
|
2000-04-02 17:34:17 +02:00
|
|
|
|
#ifdef ENABLE_JVMPI
|
|
|
|
|
// Pointer to JVMPI notification functions.
|
|
|
|
|
void (*_Jv_JVMPI_Notify_OBJECT_ALLOC) (JVMPI_Event *event);
|
|
|
|
|
void (*_Jv_JVMPI_Notify_THREAD_START) (JVMPI_Event *event);
|
|
|
|
|
void (*_Jv_JVMPI_Notify_THREAD_END) (JVMPI_Event *event);
|
|
|
|
|
#endif
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
|
1999-04-20 08:27:11 +02:00
|
|
|
|
#ifdef HANDLE_SEGV
|
|
|
|
|
static java::lang::NullPointerException *nullp;
|
|
|
|
|
SIGNAL_HANDLER (catch_segv)
|
|
|
|
|
{
|
|
|
|
|
MAKE_THROW_FRAME;
|
2000-01-17 16:45:24 +01:00
|
|
|
|
nullp->fillInStackTrace ();
|
1999-04-20 08:27:11 +02:00
|
|
|
|
_Jv_Throw (nullp);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
static java::lang::ArithmeticException *arithexception;
|
1999-07-21 17:11:56 +02:00
|
|
|
|
|
|
|
|
|
#ifdef HANDLE_FPE
|
1999-04-20 08:27:11 +02:00
|
|
|
|
SIGNAL_HANDLER (catch_fpe)
|
|
|
|
|
{
|
1999-05-20 10:26:55 +02:00
|
|
|
|
#ifdef HANDLE_DIVIDE_OVERFLOW
|
|
|
|
|
HANDLE_DIVIDE_OVERFLOW;
|
|
|
|
|
#else
|
1999-04-20 08:27:11 +02:00
|
|
|
|
MAKE_THROW_FRAME;
|
1999-05-20 10:26:55 +02:00
|
|
|
|
#endif
|
2000-01-17 16:45:24 +01:00
|
|
|
|
arithexception->fillInStackTrace ();
|
1999-04-20 08:27:11 +02:00
|
|
|
|
_Jv_Throw (arithexception);
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
jboolean
|
|
|
|
|
_Jv_equalUtf8Consts (Utf8Const* a, Utf8Const *b)
|
|
|
|
|
{
|
|
|
|
|
register int len;
|
|
|
|
|
register _Jv_ushort *aptr, *bptr;
|
|
|
|
|
if (a == b)
|
|
|
|
|
return true;
|
|
|
|
|
if (a->hash != b->hash)
|
|
|
|
|
return false;
|
|
|
|
|
len = a->length;
|
|
|
|
|
if (b->length != len)
|
|
|
|
|
return false;
|
|
|
|
|
aptr = (_Jv_ushort *)a->data;
|
|
|
|
|
bptr = (_Jv_ushort *)b->data;
|
|
|
|
|
len = (len + 1) >> 1;
|
|
|
|
|
while (--len >= 0)
|
|
|
|
|
if (*aptr++ != *bptr++)
|
|
|
|
|
return false;
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* True iff A is equal to STR.
|
1999-05-20 10:26:55 +02:00
|
|
|
|
HASH is STR->hashCode().
|
1999-04-07 16:42:40 +02:00
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
jboolean
|
|
|
|
|
_Jv_equal (Utf8Const* a, jstring str, jint hash)
|
|
|
|
|
{
|
|
|
|
|
if (a->hash != (_Jv_ushort) hash)
|
|
|
|
|
return false;
|
|
|
|
|
jint len = str->length();
|
|
|
|
|
jint i = 0;
|
|
|
|
|
jchar *sptr = _Jv_GetStringChars (str);
|
|
|
|
|
register unsigned char* ptr = (unsigned char*) a->data;
|
|
|
|
|
register unsigned char* limit = ptr + a->length;
|
|
|
|
|
for (;; i++, sptr++)
|
2000-01-04 09:46:52 +01:00
|
|
|
|
{
|
|
|
|
|
int ch = UTF8_GET (ptr, limit);
|
|
|
|
|
if (i == len)
|
|
|
|
|
return ch < 0;
|
|
|
|
|
if (ch != *sptr)
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Like _Jv_equal, but stop after N characters. */
|
|
|
|
|
jboolean
|
|
|
|
|
_Jv_equaln (Utf8Const *a, jstring str, jint n)
|
|
|
|
|
{
|
|
|
|
|
jint len = str->length();
|
|
|
|
|
jint i = 0;
|
|
|
|
|
jchar *sptr = _Jv_GetStringChars (str);
|
|
|
|
|
register unsigned char* ptr = (unsigned char*) a->data;
|
|
|
|
|
register unsigned char* limit = ptr + a->length;
|
|
|
|
|
for (; n-- > 0; i++, sptr++)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
|
|
|
|
int ch = UTF8_GET (ptr, limit);
|
|
|
|
|
if (i == len)
|
|
|
|
|
return ch < 0;
|
|
|
|
|
if (ch != *sptr)
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
return true;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Count the number of Unicode chars encoded in a given Ut8 string. */
|
|
|
|
|
int
|
|
|
|
|
_Jv_strLengthUtf8(char* str, int len)
|
|
|
|
|
{
|
|
|
|
|
register unsigned char* ptr;
|
|
|
|
|
register unsigned char* limit;
|
|
|
|
|
int str_length;
|
|
|
|
|
|
|
|
|
|
ptr = (unsigned char*) str;
|
|
|
|
|
limit = ptr + len;
|
|
|
|
|
str_length = 0;
|
|
|
|
|
for (; ptr < limit; str_length++) {
|
|
|
|
|
if (UTF8_GET (ptr, limit) < 0) {
|
|
|
|
|
return (-1);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
return (str_length);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* Calculate a hash value for a string encoded in Utf8 format.
|
|
|
|
|
* This returns the same hash value as specified or java.lang.String.hashCode.
|
|
|
|
|
*/
|
|
|
|
|
static jint
|
|
|
|
|
hashUtf8String (char* str, int len)
|
|
|
|
|
{
|
|
|
|
|
register unsigned char* ptr = (unsigned char*) str;
|
|
|
|
|
register unsigned char* limit = ptr + len;
|
|
|
|
|
jint hash = 0;
|
|
|
|
|
|
|
|
|
|
for (; ptr < limit;)
|
|
|
|
|
{
|
|
|
|
|
int ch = UTF8_GET (ptr, limit);
|
|
|
|
|
/* Updated specification from
|
|
|
|
|
http://www.javasoft.com/docs/books/jls/clarify.html. */
|
|
|
|
|
hash = (31 * hash) + ch;
|
|
|
|
|
}
|
|
|
|
|
return hash;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_Jv_Utf8Const *
|
|
|
|
|
_Jv_makeUtf8Const (char* s, int len)
|
|
|
|
|
{
|
|
|
|
|
if (len < 0)
|
|
|
|
|
len = strlen (s);
|
|
|
|
|
Utf8Const* m = (Utf8Const*) _Jv_AllocBytes (sizeof(Utf8Const) + len + 1);
|
|
|
|
|
if (! m)
|
|
|
|
|
JvThrow (no_memory);
|
|
|
|
|
memcpy (m->data, s, len);
|
|
|
|
|
m->data[len] = 0;
|
|
|
|
|
m->length = len;
|
|
|
|
|
m->hash = hashUtf8String (s, len) & 0xFFFF;
|
|
|
|
|
return (m);
|
|
|
|
|
}
|
|
|
|
|
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
|
_Jv_Utf8Const *
|
|
|
|
|
_Jv_makeUtf8Const (jstring string)
|
|
|
|
|
{
|
|
|
|
|
jint hash = string->hashCode ();
|
|
|
|
|
jint len = _Jv_GetStringUTFLength (string);
|
|
|
|
|
|
|
|
|
|
Utf8Const* m = (Utf8Const*)
|
|
|
|
|
_Jv_AllocBytesChecked (sizeof(Utf8Const) + len + 1);
|
|
|
|
|
|
|
|
|
|
m->hash = hash;
|
|
|
|
|
m->length = len;
|
|
|
|
|
|
|
|
|
|
_Jv_GetStringUTFRegion (string, 0, string->length (), m->data);
|
|
|
|
|
m->data[len] = 0;
|
|
|
|
|
|
|
|
|
|
return m;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
void
|
|
|
|
|
_Jv_Abort (const char *function, const char *file, int line,
|
|
|
|
|
const char *message)
|
|
|
|
|
#else
|
|
|
|
|
void
|
|
|
|
|
_Jv_Abort (const char *, const char *, int, const char *message)
|
|
|
|
|
#endif
|
|
|
|
|
{
|
|
|
|
|
#ifdef DEBUG
|
|
|
|
|
fprintf (stderr,
|
|
|
|
|
"libgcj failure: %s\n in function %s, file %s, line %d\n",
|
|
|
|
|
message, function, file, line);
|
|
|
|
|
#else
|
|
|
|
|
java::io::PrintStream *err = java::lang::System::err;
|
|
|
|
|
err->print(JvNewStringLatin1 ("libgcj failure: "));
|
|
|
|
|
err->println(JvNewStringLatin1 (message));
|
|
|
|
|
err->flush();
|
|
|
|
|
#endif
|
|
|
|
|
abort ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
fail_on_finalization (jobject)
|
|
|
|
|
{
|
|
|
|
|
JvFail ("object was finalized");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_GCWatch (jobject obj)
|
|
|
|
|
{
|
|
|
|
|
_Jv_RegisterFinalizer (obj, fail_on_finalization);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_ThrowBadArrayIndex(jint bad_index)
|
|
|
|
|
{
|
|
|
|
|
JvThrow (new java::lang::ArrayIndexOutOfBoundsException
|
|
|
|
|
(java::lang::String::valueOf(bad_index)));
|
|
|
|
|
}
|
|
|
|
|
|
2000-04-28 01:13:31 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_ThrowNullPointerException ()
|
|
|
|
|
{
|
|
|
|
|
throw new java::lang::NullPointerException ();
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
// Allocate some unscanned memory and throw an exception if no memory.
|
|
|
|
|
void *
|
|
|
|
|
_Jv_AllocBytesChecked (jsize size)
|
|
|
|
|
{
|
|
|
|
|
void *r = _Jv_AllocBytes (size);
|
|
|
|
|
if (! r)
|
|
|
|
|
_Jv_Throw (no_memory);
|
|
|
|
|
return r;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Allocate a new object of class C. SIZE is the size of the object
|
|
|
|
|
// to allocate. You might think this is redundant, but it isn't; some
|
|
|
|
|
// classes, such as String, aren't of fixed size.
|
|
|
|
|
jobject
|
|
|
|
|
_Jv_AllocObject (jclass c, jint size)
|
|
|
|
|
{
|
|
|
|
|
_Jv_InitClass (c);
|
|
|
|
|
|
|
|
|
|
jobject obj = (jobject) _Jv_AllocObj (size);
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (! obj, 0))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JvThrow (no_memory);
|
|
|
|
|
*((_Jv_VTable **) obj) = c->vtable;
|
|
|
|
|
|
|
|
|
|
// If this class has inherited finalize from Object, then don't
|
|
|
|
|
// bother registering a finalizer. We know that finalize() is the
|
|
|
|
|
// very first method after the dummy entry. If this turns out to be
|
|
|
|
|
// unreliable, a more robust implementation can be written. Such an
|
|
|
|
|
// implementation would look for Object.finalize in Object's method
|
|
|
|
|
// table at startup, and then use that information to find the
|
|
|
|
|
// appropriate index in the method vector.
|
|
|
|
|
if (c->vtable->method[1] != ObjectClass.vtable->method[1])
|
|
|
|
|
_Jv_RegisterFinalizer (obj, _Jv_FinalizeObject);
|
|
|
|
|
|
2000-04-02 17:34:17 +02:00
|
|
|
|
#ifdef ENABLE_JVMPI
|
|
|
|
|
// Service JVMPI request.
|
|
|
|
|
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (_Jv_JVMPI_Notify_OBJECT_ALLOC != 0, 0))
|
2000-04-02 17:34:17 +02:00
|
|
|
|
{
|
|
|
|
|
JVMPI_Event event;
|
|
|
|
|
|
|
|
|
|
event.event_type = JVMPI_EVENT_OBJECT_ALLOC;
|
|
|
|
|
event.env_id = NULL;
|
|
|
|
|
event.u.obj_alloc.arena_id = 0;
|
|
|
|
|
event.u.obj_alloc.class_id = (jobjectID) c;
|
|
|
|
|
event.u.obj_alloc.is_array = 0;
|
|
|
|
|
event.u.obj_alloc.size = size;
|
|
|
|
|
event.u.obj_alloc.obj_id = (jobjectID) obj;
|
|
|
|
|
|
|
|
|
|
_Jv_DisableGC ();
|
|
|
|
|
(*_Jv_JVMPI_Notify_OBJECT_ALLOC) (&event);
|
|
|
|
|
_Jv_EnableGC ();
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Allocate a new array of Java objects. Each object is of type
|
|
|
|
|
// `elementClass'. `init' is used to initialize each slot in the
|
|
|
|
|
// array.
|
|
|
|
|
jobjectArray
|
|
|
|
|
_Jv_NewObjectArray (jsize count, jclass elementClass, jobject init)
|
|
|
|
|
{
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (count < 0, 0))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JvThrow (new java::lang::NegativeArraySizeException);
|
|
|
|
|
|
1999-11-25 01:36:51 +01:00
|
|
|
|
JvAssert (! elementClass->isPrimitive ());
|
|
|
|
|
|
|
|
|
|
jobjectArray obj = NULL;
|
|
|
|
|
size_t size = (size_t) _Jv_GetArrayElementFromElementType (obj,
|
|
|
|
|
elementClass);
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
// Check for overflow.
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect ((size_t) count >
|
2000-04-27 13:47:13 +02:00
|
|
|
|
(SIZE_T_MAX - size) / sizeof (jobject), 0))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JvThrow (no_memory);
|
|
|
|
|
|
1999-11-25 01:36:51 +01:00
|
|
|
|
size += count * sizeof (jobject);
|
[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
|
|
|
|
|
|
|
|
|
// FIXME: second argument should be "current loader" //
|
|
|
|
|
jclass clas = _Jv_FindArrayClass (elementClass, 0);
|
|
|
|
|
|
1999-11-25 01:36:51 +01:00
|
|
|
|
obj = (jobjectArray) _Jv_AllocArray (size);
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (! obj, 0))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JvThrow (no_memory);
|
|
|
|
|
obj->length = count;
|
|
|
|
|
jobject* ptr = elements(obj);
|
|
|
|
|
// We know the allocator returns zeroed memory. So don't bother
|
|
|
|
|
// zeroing it again.
|
|
|
|
|
if (init)
|
|
|
|
|
{
|
|
|
|
|
while (--count >= 0)
|
|
|
|
|
*ptr++ = init;
|
|
|
|
|
}
|
|
|
|
|
// Set the vtbl last to avoid problems if the GC happens during the
|
|
|
|
|
// window in this function between the allocation and this
|
|
|
|
|
// assignment.
|
|
|
|
|
*((_Jv_VTable **) obj) = clas->vtable;
|
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Allocate a new array of primitives. ELTYPE is the type of the
|
|
|
|
|
// element, COUNT is the size of the array.
|
|
|
|
|
jobject
|
|
|
|
|
_Jv_NewPrimArray (jclass eltype, jint count)
|
|
|
|
|
{
|
|
|
|
|
int elsize = eltype->size();
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (count < 0, 0))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JvThrow (new java::lang::NegativeArraySizeException ());
|
|
|
|
|
|
1999-11-25 01:36:51 +01:00
|
|
|
|
JvAssert (eltype->isPrimitive ());
|
|
|
|
|
jobject dummy = NULL;
|
|
|
|
|
size_t size = (size_t) _Jv_GetArrayElementFromElementType (dummy, eltype);
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
// Check for overflow.
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect ((size_t) count >
|
|
|
|
|
(SIZE_T_MAX - size) / elsize, 0))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JvThrow (no_memory);
|
|
|
|
|
|
1999-11-25 01:36:51 +01:00
|
|
|
|
__JArray *arr = (__JArray*) _Jv_AllocObj (size + elsize * count);
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (! arr, 0))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JvThrow (no_memory);
|
|
|
|
|
arr->length = count;
|
|
|
|
|
// Note that we assume we are given zeroed memory by the allocator.
|
|
|
|
|
|
[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_FindArrayClass (eltype, 0);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
// Set the vtbl last to avoid problems if the GC happens during the
|
|
|
|
|
// window in this function between the allocation and this
|
|
|
|
|
// assignment.
|
|
|
|
|
*((_Jv_VTable **) arr) = klass->vtable;
|
|
|
|
|
return arr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobject
|
|
|
|
|
_Jv_NewArray (jint type, jint size)
|
|
|
|
|
{
|
|
|
|
|
switch (type)
|
|
|
|
|
{
|
|
|
|
|
case 4: return JvNewBooleanArray (size);
|
|
|
|
|
case 5: return JvNewCharArray (size);
|
|
|
|
|
case 6: return JvNewFloatArray (size);
|
|
|
|
|
case 7: return JvNewDoubleArray (size);
|
|
|
|
|
case 8: return JvNewByteArray (size);
|
|
|
|
|
case 9: return JvNewShortArray (size);
|
|
|
|
|
case 10: return JvNewIntArray (size);
|
|
|
|
|
case 11: return JvNewLongArray (size);
|
|
|
|
|
}
|
|
|
|
|
JvFail ("newarray - bad type code");
|
|
|
|
|
return NULL; // Placate compiler.
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobject
|
|
|
|
|
_Jv_NewMultiArray (jclass type, jint dimensions, jint *sizes)
|
|
|
|
|
{
|
|
|
|
|
JvAssert (type->isArray());
|
|
|
|
|
jclass element_type = type->getComponentType();
|
|
|
|
|
jobject result;
|
|
|
|
|
if (element_type->isPrimitive())
|
|
|
|
|
result = _Jv_NewPrimArray (element_type, sizes[0]);
|
|
|
|
|
else
|
|
|
|
|
result = _Jv_NewObjectArray (sizes[0], element_type, NULL);
|
|
|
|
|
|
|
|
|
|
if (dimensions > 1)
|
|
|
|
|
{
|
|
|
|
|
JvAssert (! element_type->isPrimitive());
|
|
|
|
|
JvAssert (element_type->isArray());
|
|
|
|
|
jobject *contents = elements ((jobjectArray) result);
|
|
|
|
|
for (int i = 0; i < sizes[0]; ++i)
|
|
|
|
|
contents[i] = _Jv_NewMultiArray (element_type, dimensions - 1,
|
|
|
|
|
sizes + 1);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jobject
|
|
|
|
|
_Jv_NewMultiArray (jclass array_type, jint dimensions, ...)
|
|
|
|
|
{
|
|
|
|
|
va_list args;
|
|
|
|
|
jint sizes[dimensions];
|
|
|
|
|
va_start (args, dimensions);
|
|
|
|
|
for (int i = 0; i < dimensions; ++i)
|
|
|
|
|
{
|
|
|
|
|
jint size = va_arg (args, jint);
|
|
|
|
|
sizes[i] = size;
|
|
|
|
|
}
|
|
|
|
|
va_end (args);
|
|
|
|
|
|
|
|
|
|
return _Jv_NewMultiArray (array_type, dimensions, sizes);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class _Jv_PrimClass : public java::lang::Class
|
|
|
|
|
{
|
|
|
|
|
public:
|
|
|
|
|
// FIXME: calling convention is weird. If we use the natural types
|
|
|
|
|
// then the compiler will complain because they aren't Java types.
|
|
|
|
|
_Jv_PrimClass (jobject cname, jbyte sig, jint len)
|
|
|
|
|
{
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
|
|
|
|
|
// We must initialize every field of the class. We do this in
|
|
|
|
|
// the same order they are declared in Class.h.
|
|
|
|
|
next = NULL;
|
|
|
|
|
name = _Jv_makeUtf8Const ((char *) cname, -1);
|
|
|
|
|
accflags = Modifier::PUBLIC | Modifier::FINAL;
|
|
|
|
|
superclass = NULL;
|
|
|
|
|
constants.size = 0;
|
|
|
|
|
constants.tags = NULL;
|
|
|
|
|
constants.data = NULL;
|
|
|
|
|
methods = NULL;
|
|
|
|
|
method_count = sig;
|
|
|
|
|
vtable_method_count = 0;
|
|
|
|
|
fields = NULL;
|
|
|
|
|
size_in_bytes = len;
|
|
|
|
|
field_count = 0;
|
|
|
|
|
static_field_count = 0;
|
|
|
|
|
vtable = JV_PRIMITIVE_VTABLE;
|
|
|
|
|
interfaces = NULL;
|
|
|
|
|
loader = NULL;
|
|
|
|
|
interface_count = 0;
|
2000-01-17 19:56:43 +01:00
|
|
|
|
state = JV_STATE_NOTHING;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
thread = NULL;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
#define DECLARE_PRIM_TYPE(NAME, SIG, LEN) \
|
|
|
|
|
_Jv_PrimClass _Jv_##NAME##Class((jobject) #NAME, (jbyte) SIG, (jint) LEN)
|
|
|
|
|
|
|
|
|
|
DECLARE_PRIM_TYPE(byte, 'B', 1);
|
|
|
|
|
DECLARE_PRIM_TYPE(short, 'S', 2);
|
|
|
|
|
DECLARE_PRIM_TYPE(int, 'I', 4);
|
|
|
|
|
DECLARE_PRIM_TYPE(long, 'J', 8);
|
|
|
|
|
DECLARE_PRIM_TYPE(boolean, 'Z', 1);
|
|
|
|
|
DECLARE_PRIM_TYPE(char, 'C', 2);
|
|
|
|
|
DECLARE_PRIM_TYPE(float, 'F', 4);
|
|
|
|
|
DECLARE_PRIM_TYPE(double, 'D', 8);
|
|
|
|
|
DECLARE_PRIM_TYPE(void, 'V', 0);
|
|
|
|
|
|
|
|
|
|
jclass
|
|
|
|
|
_Jv_FindClassFromSignature (char *sig, java::lang::ClassLoader *loader)
|
|
|
|
|
{
|
|
|
|
|
switch (*sig)
|
|
|
|
|
{
|
|
|
|
|
case 'B':
|
|
|
|
|
return JvPrimClass (byte);
|
|
|
|
|
case 'S':
|
|
|
|
|
return JvPrimClass (short);
|
|
|
|
|
case 'I':
|
|
|
|
|
return JvPrimClass (int);
|
|
|
|
|
case 'J':
|
|
|
|
|
return JvPrimClass (long);
|
|
|
|
|
case 'Z':
|
|
|
|
|
return JvPrimClass (boolean);
|
|
|
|
|
case 'C':
|
|
|
|
|
return JvPrimClass (char);
|
|
|
|
|
case 'F':
|
|
|
|
|
return JvPrimClass (float);
|
|
|
|
|
case 'D':
|
|
|
|
|
return JvPrimClass (double);
|
|
|
|
|
case 'V':
|
|
|
|
|
return JvPrimClass (void);
|
|
|
|
|
case 'L':
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
for (i = 1; sig[i] && sig[i] != ';'; ++i)
|
|
|
|
|
;
|
|
|
|
|
_Jv_Utf8Const *name = _Jv_makeUtf8Const (&sig[1], i - 1);
|
|
|
|
|
return _Jv_FindClass (name, loader);
|
[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
|
|
|
|
}
|
|
|
|
|
case '[':
|
[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 _Jv_FindArrayClass (_Jv_FindClassFromSignature (&sig[1], loader),
|
|
|
|
|
loader);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
JvFail ("couldn't understand class signature");
|
|
|
|
|
return NULL; // Placate compiler.
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
JArray<jstring> *
|
|
|
|
|
JvConvertArgv (int argc, const char **argv)
|
|
|
|
|
{
|
|
|
|
|
if (argc < 0)
|
|
|
|
|
argc = 0;
|
|
|
|
|
jobjectArray ar = JvNewObjectArray(argc, &StringClass, NULL);
|
|
|
|
|
jobject* ptr = elements(ar);
|
|
|
|
|
for (int i = 0; i < argc; i++)
|
|
|
|
|
{
|
|
|
|
|
const char *arg = argv[i];
|
|
|
|
|
// FIXME - should probably use JvNewStringUTF.
|
|
|
|
|
*ptr++ = JvNewStringLatin1(arg, strlen(arg));
|
|
|
|
|
}
|
|
|
|
|
return (JArray<jstring>*) ar;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// FIXME: These variables are static so that they will be
|
|
|
|
|
// automatically scanned by the Boehm collector. This is needed
|
|
|
|
|
// because with qthreads the collector won't scan the initial stack --
|
|
|
|
|
// it will only scan the qthreads stacks.
|
|
|
|
|
|
|
|
|
|
// Command line arguments.
|
|
|
|
|
static jobject arg_vec;
|
|
|
|
|
|
|
|
|
|
// The primary threadgroup.
|
|
|
|
|
static java::lang::ThreadGroup *main_group;
|
|
|
|
|
|
|
|
|
|
// The primary thread.
|
|
|
|
|
static java::lang::Thread *main_thread;
|
|
|
|
|
|
2000-01-17 16:45:24 +01:00
|
|
|
|
char *
|
|
|
|
|
_Jv_ThisExecutable (void)
|
|
|
|
|
{
|
|
|
|
|
return _Jv_execName;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_ThisExecutable (const char *name)
|
|
|
|
|
{
|
|
|
|
|
if (name)
|
|
|
|
|
{
|
|
|
|
|
_Jv_execName = new char[strlen (name) + 1];
|
|
|
|
|
strcpy (_Jv_execName, name);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2000-03-15 23:03:19 +01:00
|
|
|
|
#ifdef USE_WIN32_SIGNALLING
|
|
|
|
|
|
|
|
|
|
extern "C" int* win32_get_restart_frame (void *);
|
|
|
|
|
|
|
|
|
|
LONG CALLBACK
|
|
|
|
|
win32_exception_handler (LPEXCEPTION_POINTERS e)
|
|
|
|
|
{
|
|
|
|
|
int* setjmp_buf;
|
|
|
|
|
if (e->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
|
|
|
|
|
setjmp_buf = win32_get_restart_frame (nullp);
|
|
|
|
|
else if (e->ExceptionRecord->ExceptionCode == EXCEPTION_INT_DIVIDE_BY_ZERO)
|
|
|
|
|
setjmp_buf = win32_get_restart_frame (arithexception);
|
|
|
|
|
else
|
|
|
|
|
return EXCEPTION_CONTINUE_SEARCH;
|
|
|
|
|
|
|
|
|
|
e->ContextRecord->Ebp = setjmp_buf[0];
|
|
|
|
|
// FIXME: Why does i386-signal.h increment the PC here, do we need to do it?
|
|
|
|
|
e->ContextRecord->Eip = setjmp_buf[1];
|
|
|
|
|
// FIXME: Is this the stack pointer? Do we need it?
|
|
|
|
|
e->ContextRecord->Esp = setjmp_buf[2];
|
|
|
|
|
|
|
|
|
|
return EXCEPTION_CONTINUE_EXECUTION;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-09-23 20:50:59 +02:00
|
|
|
|
static void
|
2000-01-17 16:45:24 +01:00
|
|
|
|
main_init ()
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
1999-04-20 08:27:11 +02:00
|
|
|
|
INIT_SEGV;
|
1999-07-21 17:11:56 +02:00
|
|
|
|
#ifdef HANDLE_FPE
|
1999-04-20 08:27:11 +02:00
|
|
|
|
INIT_FPE;
|
1999-07-21 17:11:56 +02:00
|
|
|
|
#else
|
|
|
|
|
arithexception = new java::lang::ArithmeticException
|
|
|
|
|
(JvNewStringLatin1 ("/ by zero"));
|
|
|
|
|
#endif
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
no_memory = new java::lang::OutOfMemoryError;
|
|
|
|
|
|
1999-05-05 16:19:24 +02:00
|
|
|
|
#ifdef USE_LTDL
|
|
|
|
|
LTDL_SET_PRELOADED_SYMBOLS ();
|
|
|
|
|
#endif
|
|
|
|
|
|
2000-03-15 23:03:19 +01:00
|
|
|
|
#ifdef USE_WINSOCK
|
|
|
|
|
// Initialise winsock for networking
|
|
|
|
|
WSADATA data;
|
|
|
|
|
if (WSAStartup (MAKEWORD (1, 1), &data))
|
|
|
|
|
MessageBox (NULL, "Error initialising winsock library.", "Error", MB_OK | MB_ICONEXCLAMATION);
|
|
|
|
|
#endif /* USE_WINSOCK */
|
|
|
|
|
|
|
|
|
|
#ifdef USE_WIN32_SIGNALLING
|
|
|
|
|
// Install exception handler
|
|
|
|
|
SetUnhandledExceptionFilter (win32_exception_handler);
|
|
|
|
|
#else
|
|
|
|
|
// We only want this on POSIX systems.
|
1999-09-23 20:50:59 +02:00
|
|
|
|
struct sigaction act;
|
|
|
|
|
act.sa_handler = SIG_IGN;
|
|
|
|
|
sigemptyset (&act.sa_mask);
|
|
|
|
|
act.sa_flags = 0;
|
|
|
|
|
sigaction (SIGPIPE, &act, NULL);
|
2000-03-15 23:03:19 +01:00
|
|
|
|
#endif /* USE_WIN32_SIGNALLING */
|
2000-02-01 07:14:26 +01:00
|
|
|
|
|
|
|
|
|
_Jv_JNI_Init ();
|
1999-09-23 20:50:59 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-10-15 08:07:41 +02:00
|
|
|
|
#ifndef DISABLE_GETENV_PROPERTIES
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
next_property_key (char *s, size_t *length)
|
|
|
|
|
{
|
|
|
|
|
size_t l = 0;
|
|
|
|
|
|
|
|
|
|
JvAssert (s);
|
|
|
|
|
|
|
|
|
|
// Skip over whitespace
|
|
|
|
|
while (isspace (*s))
|
|
|
|
|
s++;
|
|
|
|
|
|
|
|
|
|
// If we've reached the end, return NULL. Also return NULL if for
|
|
|
|
|
// some reason we've come across a malformed property string.
|
|
|
|
|
if (*s == 0
|
|
|
|
|
|| *s == ':'
|
|
|
|
|
|| *s == '=')
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
// Determine the length of the property key.
|
|
|
|
|
while (s[l] != 0
|
|
|
|
|
&& ! isspace (s[l])
|
|
|
|
|
&& s[l] != ':'
|
|
|
|
|
&& s[l] != '=')
|
|
|
|
|
{
|
|
|
|
|
if (s[l] == '\\'
|
|
|
|
|
&& s[l+1] != 0)
|
|
|
|
|
l++;
|
|
|
|
|
l++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*length = l;
|
|
|
|
|
|
|
|
|
|
return s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static char *
|
|
|
|
|
next_property_value (char *s, size_t *length)
|
|
|
|
|
{
|
|
|
|
|
size_t l = 0;
|
|
|
|
|
|
|
|
|
|
JvAssert (s);
|
|
|
|
|
|
|
|
|
|
while (isspace (*s))
|
|
|
|
|
s++;
|
|
|
|
|
|
|
|
|
|
if (*s == ':'
|
|
|
|
|
|| *s == '=')
|
|
|
|
|
s++;
|
|
|
|
|
|
|
|
|
|
while (isspace (*s))
|
|
|
|
|
s++;
|
|
|
|
|
|
|
|
|
|
// If we've reached the end, return NULL.
|
|
|
|
|
if (*s == 0)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
// Determine the length of the property value.
|
|
|
|
|
while (s[l] != 0
|
|
|
|
|
&& ! isspace (s[l])
|
|
|
|
|
&& s[l] != ':'
|
|
|
|
|
&& s[l] != '=')
|
|
|
|
|
{
|
|
|
|
|
if (s[l] == '\\'
|
|
|
|
|
&& s[l+1] != 0)
|
|
|
|
|
l += 2;
|
|
|
|
|
else
|
|
|
|
|
l++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
*length = l;
|
|
|
|
|
|
|
|
|
|
return s;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
process_gcj_properties ()
|
|
|
|
|
{
|
|
|
|
|
char *props = getenv("GCJ_PROPERTIES");
|
|
|
|
|
char *p = props;
|
|
|
|
|
size_t length;
|
|
|
|
|
size_t property_count = 0;
|
|
|
|
|
|
|
|
|
|
if (NULL == props)
|
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
// Whip through props quickly in order to count the number of
|
|
|
|
|
// property values.
|
|
|
|
|
while (p && (p = next_property_key (p, &length)))
|
|
|
|
|
{
|
|
|
|
|
// Skip to the end of the key
|
|
|
|
|
p += length;
|
|
|
|
|
|
|
|
|
|
p = next_property_value (p, &length);
|
|
|
|
|
if (p)
|
|
|
|
|
p += length;
|
|
|
|
|
|
|
|
|
|
property_count++;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Allocate an array of property value/key pairs.
|
|
|
|
|
_Jv_Environment_Properties =
|
|
|
|
|
(property_pair *) malloc (sizeof(property_pair)
|
|
|
|
|
* (property_count + 1));
|
|
|
|
|
|
|
|
|
|
// Go through the properties again, initializing _Jv_Properties
|
|
|
|
|
// along the way.
|
|
|
|
|
p = props;
|
|
|
|
|
property_count = 0;
|
|
|
|
|
while (p && (p = next_property_key (p, &length)))
|
|
|
|
|
{
|
|
|
|
|
_Jv_Environment_Properties[property_count].key = p;
|
|
|
|
|
_Jv_Environment_Properties[property_count].key_length = length;
|
|
|
|
|
|
|
|
|
|
// Skip to the end of the key
|
|
|
|
|
p += length;
|
|
|
|
|
|
|
|
|
|
p = next_property_value (p, &length);
|
|
|
|
|
|
|
|
|
|
_Jv_Environment_Properties[property_count].value = p;
|
|
|
|
|
_Jv_Environment_Properties[property_count].value_length = length;
|
|
|
|
|
|
|
|
|
|
if (p)
|
|
|
|
|
p += length;
|
|
|
|
|
|
|
|
|
|
property_count++;
|
|
|
|
|
}
|
|
|
|
|
memset ((void *) &_Jv_Environment_Properties[property_count],
|
|
|
|
|
0, sizeof (property_pair));
|
|
|
|
|
{
|
|
|
|
|
size_t i = 0;
|
|
|
|
|
|
|
|
|
|
// Null terminate the strings.
|
|
|
|
|
while (_Jv_Environment_Properties[i].key)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Environment_Properties[i].key[_Jv_Environment_Properties[i].key_length] = 0;
|
|
|
|
|
_Jv_Environment_Properties[i++].value[_Jv_Environment_Properties[i].value_length] = 0;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
#endif // DISABLE_GETENV_PROPERTIES
|
|
|
|
|
|
1999-09-23 20:50:59 +02:00
|
|
|
|
void
|
|
|
|
|
JvRunMain (jclass klass, int argc, const char **argv)
|
|
|
|
|
{
|
1999-10-15 08:07:41 +02:00
|
|
|
|
PROCESS_GCJ_PROPERTIES;
|
|
|
|
|
|
1999-09-23 20:50:59 +02:00
|
|
|
|
main_init ();
|
2000-01-17 16:45:24 +01:00
|
|
|
|
#ifdef HAVE_PROC_SELF_EXE
|
|
|
|
|
char exec_name[20];
|
|
|
|
|
sprintf (exec_name, "/proc/%d/exe", getpid ());
|
|
|
|
|
_Jv_ThisExecutable (exec_name);
|
|
|
|
|
#else
|
|
|
|
|
_Jv_ThisExecutable (argv[0]);
|
|
|
|
|
#endif
|
1999-09-23 20:50:59 +02:00
|
|
|
|
|
1999-08-18 16:16:42 +02:00
|
|
|
|
arg_vec = JvConvertArgv (argc - 1, argv + 1);
|
|
|
|
|
main_group = new java::lang::ThreadGroup (23);
|
2000-03-05 23:26:30 +01:00
|
|
|
|
main_thread = new gnu::gcj::runtime::FirstThread (main_group,
|
|
|
|
|
klass, arg_vec);
|
1999-08-18 16:16:42 +02:00
|
|
|
|
|
|
|
|
|
main_thread->start();
|
|
|
|
|
_Jv_ThreadWait ();
|
|
|
|
|
|
|
|
|
|
java::lang::Runtime::getRuntime ()->exit (0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_RunMain (const char *class_name, int argc, const char **argv)
|
|
|
|
|
{
|
1999-10-15 08:07:41 +02:00
|
|
|
|
PROCESS_GCJ_PROPERTIES;
|
|
|
|
|
|
1999-09-23 20:50:59 +02:00
|
|
|
|
main_init ();
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2000-01-18 15:37:34 +01:00
|
|
|
|
#ifdef HAVE_PROC_SELF_EXE
|
|
|
|
|
char exec_name[20];
|
|
|
|
|
sprintf (exec_name, "/proc/%d/exe", getpid ());
|
|
|
|
|
_Jv_ThisExecutable (exec_name);
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-08-18 16:16:42 +02:00
|
|
|
|
arg_vec = JvConvertArgv (argc - 1, argv + 1);
|
|
|
|
|
main_group = new java::lang::ThreadGroup (23);
|
2000-03-05 23:26:30 +01:00
|
|
|
|
main_thread = new gnu::gcj::runtime::FirstThread (main_group,
|
|
|
|
|
JvNewStringLatin1 (class_name),
|
|
|
|
|
arg_vec);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
main_thread->start();
|
|
|
|
|
_Jv_ThreadWait ();
|
|
|
|
|
|
|
|
|
|
java::lang::Runtime::getRuntime ()->exit (0);
|
|
|
|
|
}
|
|
|
|
|
|
1999-10-22 21:43:41 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Parse a string and return a heap size.
|
|
|
|
|
static size_t
|
|
|
|
|
parse_heap_size (const char *spec)
|
|
|
|
|
{
|
|
|
|
|
char *end;
|
|
|
|
|
unsigned long val = strtoul (spec, &end, 10);
|
1999-11-05 18:34:32 +01:00
|
|
|
|
if (*end == 'k' || *end == 'K')
|
|
|
|
|
val *= 1024;
|
|
|
|
|
else if (*end == 'm' || *end == 'M')
|
|
|
|
|
val *= 1048576;
|
1999-10-22 21:43:41 +02:00
|
|
|
|
return (size_t) val;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Set the initial heap size. This might be ignored by the GC layer.
|
|
|
|
|
// This must be called before _Jv_RunMain.
|
|
|
|
|
void
|
|
|
|
|
_Jv_SetInitialHeapSize (const char *arg)
|
|
|
|
|
{
|
|
|
|
|
size_t size = parse_heap_size (arg);
|
|
|
|
|
_Jv_GCSetInitialHeapSize (size);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Set the maximum heap size. This might be ignored by the GC layer.
|
|
|
|
|
// This must be called before _Jv_RunMain.
|
|
|
|
|
void
|
|
|
|
|
_Jv_SetMaximumHeapSize (const char *arg)
|
|
|
|
|
{
|
|
|
|
|
size_t size = parse_heap_size (arg);
|
|
|
|
|
_Jv_GCSetMaximumHeapSize (size);
|
|
|
|
|
}
|
[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
|
|
|
|
|
|
|
|
|
|
2000-02-01 07:14:26 +01:00
|
|
|
|
void *
|
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_Malloc (jsize size)
|
2000-02-01 07:14:26 +01:00
|
|
|
|
{
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (size == 0, 0))
|
2000-02-01 07:14:26 +01:00
|
|
|
|
size = 1;
|
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 *ptr = malloc ((size_t) size);
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (ptr == NULL, 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
|
|
|
|
JvThrow (no_memory);
|
|
|
|
|
return ptr;
|
2000-02-01 07:14:26 +01:00
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
void *
|
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_Realloc (void *ptr, jsize size)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (size == 0, 0))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
size = 1;
|
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
|
|
|
|
ptr = realloc (ptr, (size_t) size);
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (ptr == NULL, 0))
|
1999-04-07 16:42:40 +02:00
|
|
|
|
JvThrow (no_memory);
|
|
|
|
|
return ptr;
|
|
|
|
|
}
|
|
|
|
|
|
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_MallocUnchecked (jsize size)
|
|
|
|
|
{
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (size == 0, 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
|
|
|
|
size = 1;
|
|
|
|
|
return malloc ((size_t) size);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_Free (void* ptr)
|
|
|
|
|
{
|
|
|
|
|
return free (ptr);
|
|
|
|
|
}
|
1999-07-21 17:11:56 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// In theory, these routines can be #ifdef'd away on machines which
|
|
|
|
|
// support divide overflow signals. However, we never know if some
|
|
|
|
|
// code might have been compiled with "-fuse-divide-subroutine", so we
|
|
|
|
|
// always include them in libgcj.
|
|
|
|
|
|
|
|
|
|
jint
|
|
|
|
|
_Jv_divI (jint dividend, jint divisor)
|
|
|
|
|
{
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (divisor == 0, 0))
|
1999-07-21 17:11:56 +02:00
|
|
|
|
_Jv_Throw (arithexception);
|
|
|
|
|
|
[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
|
|
|
|
if (dividend == (jint) 0x80000000L && divisor == -1)
|
1999-07-21 17:11:56 +02:00
|
|
|
|
return dividend;
|
|
|
|
|
|
|
|
|
|
return dividend / divisor;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jint
|
|
|
|
|
_Jv_remI (jint dividend, jint divisor)
|
|
|
|
|
{
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (divisor == 0, 0))
|
1999-07-21 17:11:56 +02:00
|
|
|
|
_Jv_Throw (arithexception);
|
|
|
|
|
|
[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
|
|
|
|
if (dividend == (jint) 0x80000000L && divisor == -1)
|
1999-07-21 17:11:56 +02:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
return dividend % divisor;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jlong
|
|
|
|
|
_Jv_divJ (jlong dividend, jlong divisor)
|
|
|
|
|
{
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (divisor == 0, 0))
|
1999-07-21 17:11:56 +02:00
|
|
|
|
_Jv_Throw (arithexception);
|
|
|
|
|
|
[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
|
|
|
|
if (dividend == (jlong) 0x8000000000000000LL && divisor == -1)
|
1999-07-21 17:11:56 +02:00
|
|
|
|
return dividend;
|
|
|
|
|
|
|
|
|
|
return dividend / divisor;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jlong
|
|
|
|
|
_Jv_remJ (jlong dividend, jlong divisor)
|
|
|
|
|
{
|
2000-04-22 19:09:39 +02:00
|
|
|
|
if (__builtin_expect (divisor == 0, 0))
|
1999-07-21 17:11:56 +02:00
|
|
|
|
_Jv_Throw (arithexception);
|
|
|
|
|
|
[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
|
|
|
|
if (dividend == (jlong) 0x8000000000000000LL && divisor == -1)
|
1999-07-21 17:11:56 +02:00
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
return dividend % divisor;
|
|
|
|
|
}
|