1999-04-07 16:42:40 +02:00
|
|
|
|
// prims.cc - Code for core of runtime environment.
|
|
|
|
|
|
2006-01-06 02:03:45 +01:00
|
|
|
|
/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 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>
|
2002-02-07 06:26:42 +01:00
|
|
|
|
#include <platform.h>
|
2000-03-15 23:03:19 +01:00
|
|
|
|
|
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>
|
2004-07-13 23:03:03 +02:00
|
|
|
|
#include <java-interp.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2000-04-02 17:34:17 +02:00
|
|
|
|
#ifdef ENABLE_JVMPI
|
|
|
|
|
#include <jvmpi.h>
|
2001-05-22 08:47:48 +02:00
|
|
|
|
#include <java/lang/ThreadGroup.h>
|
2000-04-02 17:34:17 +02:00
|
|
|
|
#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>
|
2000-08-26 21:25:13 +02:00
|
|
|
|
#include <java/lang/ClassLoader.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/Runtime.h>
|
|
|
|
|
#include <java/lang/String.h>
|
|
|
|
|
#include <java/lang/Thread.h>
|
|
|
|
|
#include <java/lang/ThreadGroup.h>
|
|
|
|
|
#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>
|
2006-02-01 14:40:05 +01:00
|
|
|
|
#include <java/lang/ClassNotFoundException.h>
|
2001-12-16 23:28:35 +01:00
|
|
|
|
#include <java/lang/InternalError.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/NegativeArraySizeException.h>
|
2006-02-01 14:40:05 +01:00
|
|
|
|
#include <java/lang/NoClassDefFoundError.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/NullPointerException.h>
|
|
|
|
|
#include <java/lang/OutOfMemoryError.h>
|
|
|
|
|
#include <java/lang/System.h>
|
2005-03-24 01:04:22 +01:00
|
|
|
|
#include <java/lang/VMClassLoader.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#include <java/lang/reflect/Modifier.h>
|
|
|
|
|
#include <java/io/PrintStream.h>
|
2001-05-22 08:47:48 +02:00
|
|
|
|
#include <java/lang/UnsatisfiedLinkError.h>
|
2001-10-11 00:25:43 +02:00
|
|
|
|
#include <java/lang/VirtualMachineError.h>
|
2005-04-01 21:19:13 +02:00
|
|
|
|
#include <gnu/gcj/runtime/ExtensionClassLoader.h>
|
2001-10-11 00:25:43 +02:00
|
|
|
|
#include <gnu/gcj/runtime/FinalizerThread.h>
|
2004-11-25 04:47:08 +01:00
|
|
|
|
#include <execution.h>
|
2006-08-24 20:55:53 +02:00
|
|
|
|
#include <gnu/classpath/jdwp/Jdwp.h>
|
|
|
|
|
#include <gnu/classpath/jdwp/VMVirtualMachine.h>
|
|
|
|
|
#include <gnu/classpath/jdwp/event/VmDeathEvent.h>
|
|
|
|
|
#include <gnu/classpath/jdwp/event/VmInitEvent.h>
|
2004-07-04 17:27:05 +02:00
|
|
|
|
#include <gnu/java/lang/MainThread.h>
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
1999-05-05 16:19:24 +02:00
|
|
|
|
#ifdef USE_LTDL
|
|
|
|
|
#include <ltdl.h>
|
|
|
|
|
#endif
|
1999-04-13 11:18:09 +02:00
|
|
|
|
|
2004-11-25 04:47:08 +01:00
|
|
|
|
// Execution engine for compiled code.
|
|
|
|
|
_Jv_CompiledEngine _Jv_soleCompiledEngine;
|
|
|
|
|
|
2006-05-10 19:17:20 +02:00
|
|
|
|
// Execution engine for code compiled with -findirect-classes
|
|
|
|
|
_Jv_IndirectCompiledEngine _Jv_soleIndirectCompiledEngine;
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
// We allocate a single OutOfMemoryError exception which we keep
|
|
|
|
|
// around for use if we run out of memory.
|
|
|
|
|
static java::lang::OutOfMemoryError *no_memory;
|
|
|
|
|
|
2003-10-16 23:19:53 +02:00
|
|
|
|
// Number of bytes in largest array object we create. This could be
|
|
|
|
|
// increased to the largest size_t value, so long as the appropriate
|
|
|
|
|
// functions are changed to take a size_t argument instead of jint.
|
|
|
|
|
#define MAX_OBJECT_SIZE ((1<<31) - 1)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
1999-10-22 21:43:41 +02:00
|
|
|
|
// Properties set at compile time.
|
2005-02-23 18:36:26 +01:00
|
|
|
|
const char **_Jv_Compiler_Properties = NULL;
|
|
|
|
|
int _Jv_Properties_Count = 0;
|
1999-10-22 21:43:41 +02:00
|
|
|
|
|
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
|
|
|
|
|
2000-10-02 07:14:25 +02:00
|
|
|
|
// Stash the argv pointer to benefit native libraries that need it.
|
|
|
|
|
const char **_Jv_argv;
|
|
|
|
|
int _Jv_argc;
|
|
|
|
|
|
2006-08-24 20:55:53 +02:00
|
|
|
|
// Debugging options
|
|
|
|
|
static bool remoteDebug = false;
|
|
|
|
|
static char *jdwpOptions = "";
|
|
|
|
|
|
2003-04-25 18:48:13 +02:00
|
|
|
|
// Argument support.
|
|
|
|
|
int
|
|
|
|
|
_Jv_GetNbArgs (void)
|
|
|
|
|
{
|
|
|
|
|
// _Jv_argc is 0 if not explicitly initialized.
|
|
|
|
|
return _Jv_argc;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
const char *
|
|
|
|
|
_Jv_GetSafeArg (int index)
|
|
|
|
|
{
|
|
|
|
|
if (index >=0 && index < _Jv_GetNbArgs ())
|
|
|
|
|
return _Jv_argv[index];
|
|
|
|
|
else
|
|
|
|
|
return "";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
_Jv_SetArgs (int argc, const char **argv)
|
|
|
|
|
{
|
|
|
|
|
_Jv_argc = argc;
|
|
|
|
|
_Jv_argv = argv;
|
|
|
|
|
}
|
|
|
|
|
|
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
|
|
|
|
|
|
|
|
|
|
2004-09-26 22:38:49 +02:00
|
|
|
|
#if defined (HANDLE_SEGV) || defined(HANDLE_FPE)
|
2003-08-20 16:32:16 +02:00
|
|
|
|
/* Unblock a signal. Unless we do this, the signal may only be sent
|
|
|
|
|
once. */
|
|
|
|
|
static void
|
2004-09-26 22:38:49 +02:00
|
|
|
|
unblock_signal (int signum __attribute__ ((__unused__)))
|
2003-08-20 16:32:16 +02:00
|
|
|
|
{
|
|
|
|
|
#ifdef _POSIX_VERSION
|
|
|
|
|
sigset_t sigs;
|
|
|
|
|
|
|
|
|
|
sigemptyset (&sigs);
|
|
|
|
|
sigaddset (&sigs, signum);
|
|
|
|
|
sigprocmask (SIG_UNBLOCK, &sigs, NULL);
|
|
|
|
|
#endif
|
|
|
|
|
}
|
2004-09-26 22:38:49 +02:00
|
|
|
|
#endif
|
2003-08-20 16:32:16 +02:00
|
|
|
|
|
1999-04-20 08:27:11 +02:00
|
|
|
|
#ifdef HANDLE_SEGV
|
|
|
|
|
SIGNAL_HANDLER (catch_segv)
|
|
|
|
|
{
|
2003-08-20 16:32:16 +02:00
|
|
|
|
unblock_signal (SIGSEGV);
|
2000-05-19 19:55:34 +02:00
|
|
|
|
MAKE_THROW_FRAME (nullp);
|
2005-03-10 20:02:21 +01:00
|
|
|
|
java::lang::NullPointerException *nullp
|
|
|
|
|
= new java::lang::NullPointerException;
|
2003-06-13 14:20:45 +02:00
|
|
|
|
throw nullp;
|
1999-04-20 08:27:11 +02:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
1999-07-21 17:11:56 +02:00
|
|
|
|
#ifdef HANDLE_FPE
|
1999-04-20 08:27:11 +02:00
|
|
|
|
SIGNAL_HANDLER (catch_fpe)
|
|
|
|
|
{
|
2003-08-20 16:32:16 +02:00
|
|
|
|
unblock_signal (SIGFPE);
|
1999-05-20 10:26:55 +02:00
|
|
|
|
#ifdef HANDLE_DIVIDE_OVERFLOW
|
|
|
|
|
HANDLE_DIVIDE_OVERFLOW;
|
|
|
|
|
#else
|
2000-05-19 19:55:34 +02:00
|
|
|
|
MAKE_THROW_FRAME (arithexception);
|
1999-05-20 10:26:55 +02:00
|
|
|
|
#endif
|
2005-03-10 20:02:21 +01:00
|
|
|
|
java::lang::ArithmeticException *arithexception
|
|
|
|
|
= new java::lang::ArithmeticException (JvNewStringLatin1 ("/ by zero"));
|
2003-06-13 14:20:45 +02:00
|
|
|
|
throw arithexception;
|
1999-04-20 08:27:11 +02:00
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
jboolean
|
2003-10-01 18:22:13 +02:00
|
|
|
|
_Jv_equalUtf8Consts (const Utf8Const* a, const Utf8Const *b)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-05-19 19:55:34 +02:00
|
|
|
|
int len;
|
2003-10-01 18:22:13 +02:00
|
|
|
|
const _Jv_ushort *aptr, *bptr;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
if (a == b)
|
|
|
|
|
return true;
|
|
|
|
|
if (a->hash != b->hash)
|
|
|
|
|
return false;
|
|
|
|
|
len = a->length;
|
|
|
|
|
if (b->length != len)
|
|
|
|
|
return false;
|
2003-10-01 18:22:13 +02:00
|
|
|
|
aptr = (const _Jv_ushort *)a->data;
|
|
|
|
|
bptr = (const _Jv_ushort *)b->data;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
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);
|
2000-05-19 19:55:34 +02:00
|
|
|
|
unsigned char* ptr = (unsigned char*) a->data;
|
|
|
|
|
unsigned char* limit = ptr + a->length;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
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);
|
2000-05-19 19:55:34 +02:00
|
|
|
|
unsigned char* ptr = (unsigned char*) a->data;
|
|
|
|
|
unsigned char* limit = ptr + a->length;
|
2000-01-04 09:46:52 +01:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2006-02-01 14:40:05 +01:00
|
|
|
|
// Determines whether the given Utf8Const object contains
|
|
|
|
|
// a type which is primitive or some derived form of it, eg.
|
|
|
|
|
// an array or multi-dimensional array variant.
|
|
|
|
|
jboolean
|
|
|
|
|
_Jv_isPrimitiveOrDerived(const Utf8Const *a)
|
|
|
|
|
{
|
|
|
|
|
unsigned char *aptr = (unsigned char *) a->data;
|
|
|
|
|
unsigned char *alimit = aptr + a->length;
|
|
|
|
|
int ac = UTF8_GET(aptr, alimit);
|
|
|
|
|
|
|
|
|
|
// Skips any leading array marks.
|
|
|
|
|
while (ac == '[')
|
|
|
|
|
ac = UTF8_GET(aptr, alimit);
|
|
|
|
|
|
|
|
|
|
// There should not be another character. This implies that
|
|
|
|
|
// the type name is only one character long.
|
|
|
|
|
if (UTF8_GET(aptr, alimit) == -1)
|
|
|
|
|
switch ( ac )
|
|
|
|
|
{
|
|
|
|
|
case 'Z':
|
|
|
|
|
case 'B':
|
|
|
|
|
case 'C':
|
|
|
|
|
case 'S':
|
|
|
|
|
case 'I':
|
|
|
|
|
case 'J':
|
|
|
|
|
case 'F':
|
|
|
|
|
case 'D':
|
|
|
|
|
return true;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Find out whether two _Jv_Utf8Const candidates contain the same
|
|
|
|
|
// classname.
|
|
|
|
|
// The method is written to handle the different formats of classnames.
|
|
|
|
|
// Eg. "Ljava/lang/Class;", "Ljava.lang.Class;", "java/lang/Class" and
|
|
|
|
|
// "java.lang.Class" will be seen as equal.
|
|
|
|
|
// Warning: This function is not smart enough to declare "Z" and "boolean"
|
|
|
|
|
// and similar cases as equal (and is not meant to be used this way)!
|
|
|
|
|
jboolean
|
|
|
|
|
_Jv_equalUtf8Classnames (const Utf8Const *a, const Utf8Const *b)
|
|
|
|
|
{
|
|
|
|
|
// If the class name's length differs by two characters
|
|
|
|
|
// it is possible that we have candidates which are given
|
|
|
|
|
// in the two different formats ("Lp1/p2/cn;" vs. "p1/p2/cn")
|
|
|
|
|
switch (a->length - b->length)
|
|
|
|
|
{
|
|
|
|
|
case -2:
|
|
|
|
|
case 0:
|
|
|
|
|
case 2:
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
unsigned char *aptr = (unsigned char *) a->data;
|
|
|
|
|
unsigned char *alimit = aptr + a->length;
|
|
|
|
|
unsigned char *bptr = (unsigned char *) b->data;
|
|
|
|
|
unsigned char *blimit = bptr + b->length;
|
|
|
|
|
|
|
|
|
|
if (alimit[-1] == ';')
|
|
|
|
|
alimit--;
|
|
|
|
|
|
|
|
|
|
if (blimit[-1] == ';')
|
|
|
|
|
blimit--;
|
|
|
|
|
|
|
|
|
|
int ac = UTF8_GET(aptr, alimit);
|
|
|
|
|
int bc = UTF8_GET(bptr, blimit);
|
|
|
|
|
|
|
|
|
|
// Checks whether both strings have the same amount of leading [ characters.
|
|
|
|
|
while (ac == '[')
|
|
|
|
|
{
|
|
|
|
|
if (bc == '[')
|
|
|
|
|
{
|
|
|
|
|
ac = UTF8_GET(aptr, alimit);
|
|
|
|
|
bc = UTF8_GET(bptr, blimit);
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Skips leading L character.
|
|
|
|
|
if (ac == 'L')
|
|
|
|
|
ac = UTF8_GET(aptr, alimit);
|
|
|
|
|
|
|
|
|
|
if (bc == 'L')
|
|
|
|
|
bc = UTF8_GET(bptr, blimit);
|
|
|
|
|
|
|
|
|
|
// Compares the remaining characters.
|
|
|
|
|
while (ac != -1 && bc != -1)
|
|
|
|
|
{
|
|
|
|
|
// Replaces package separating dots with slashes.
|
|
|
|
|
if (ac == '.')
|
|
|
|
|
ac = '/';
|
|
|
|
|
|
|
|
|
|
if (bc == '.')
|
|
|
|
|
bc = '/';
|
|
|
|
|
|
|
|
|
|
// Now classnames differ if there is at least one non-matching
|
|
|
|
|
// character.
|
|
|
|
|
if (ac != bc)
|
|
|
|
|
return false;
|
|
|
|
|
|
|
|
|
|
ac = UTF8_GET(aptr, alimit);
|
|
|
|
|
bc = UTF8_GET(bptr, blimit);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return (ac == bc);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
/* Count the number of Unicode chars encoded in a given Ut8 string. */
|
|
|
|
|
int
|
link.cc (_Jv_Linker::print_class_loaded): Declare string constants as "const char *".
2006-02-08 Bryce McKinlay <mckinlay@redhat.com>
* link.cc (_Jv_Linker::print_class_loaded): Declare string constants
as "const char *".
* verify.cc (verify_fail): Likewise.
* gnu/classpath/natSystemProperties.cc (file_encoding): Likewise.
* interpret.cc (throw_internal_error, throw_class_format_error):
Likewise.
* gcj/javaprims.h (_Jv_hashUtf8String, _Jv_Utf8Const::space_needed,
_Jv_Utf8Const::init, _Jv_makeUtf8Const): Likewise.
* java/lang/Class.h (_Jv_InitPrimClass): Likewise.
* include/jvm.h (_Jv_strLengthUtf8, _Jv_makeUtf8Const): Likewise.
* defineclass.cc (throw_internal_error, throw_no_class_def_found_error,
is_attribute_name): Likewise.
* prims.cc (_Jv_strLengthUtf8, _Jv_hashUtf8String, _Jv_Utf8Const::init,
_Jv_makeUtf8Const, _Jv_InitPrimClass): Likewise.
From-SVN: r110767
2006-02-08 21:38:13 +01:00
|
|
|
|
_Jv_strLengthUtf8(const char* str, int len)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-05-19 19:55:34 +02:00
|
|
|
|
unsigned char* ptr;
|
|
|
|
|
unsigned char* limit;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
int str_length;
|
|
|
|
|
|
|
|
|
|
ptr = (unsigned char*) str;
|
|
|
|
|
limit = ptr + len;
|
|
|
|
|
str_length = 0;
|
2001-05-24 07:40:37 +02:00
|
|
|
|
for (; ptr < limit; str_length++)
|
|
|
|
|
{
|
|
|
|
|
if (UTF8_GET (ptr, limit) < 0)
|
|
|
|
|
return (-1);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
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.
|
|
|
|
|
*/
|
2004-08-12 08:53:42 +02:00
|
|
|
|
jint
|
link.cc (_Jv_Linker::print_class_loaded): Declare string constants as "const char *".
2006-02-08 Bryce McKinlay <mckinlay@redhat.com>
* link.cc (_Jv_Linker::print_class_loaded): Declare string constants
as "const char *".
* verify.cc (verify_fail): Likewise.
* gnu/classpath/natSystemProperties.cc (file_encoding): Likewise.
* interpret.cc (throw_internal_error, throw_class_format_error):
Likewise.
* gcj/javaprims.h (_Jv_hashUtf8String, _Jv_Utf8Const::space_needed,
_Jv_Utf8Const::init, _Jv_makeUtf8Const): Likewise.
* java/lang/Class.h (_Jv_InitPrimClass): Likewise.
* include/jvm.h (_Jv_strLengthUtf8, _Jv_makeUtf8Const): Likewise.
* defineclass.cc (throw_internal_error, throw_no_class_def_found_error,
is_attribute_name): Likewise.
* prims.cc (_Jv_strLengthUtf8, _Jv_hashUtf8String, _Jv_Utf8Const::init,
_Jv_makeUtf8Const, _Jv_InitPrimClass): Likewise.
From-SVN: r110767
2006-02-08 21:38:13 +01:00
|
|
|
|
_Jv_hashUtf8String (const char* str, int len)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2000-05-19 19:55:34 +02:00
|
|
|
|
unsigned char* ptr = (unsigned char*) str;
|
|
|
|
|
unsigned char* limit = ptr + len;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
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;
|
|
|
|
|
}
|
|
|
|
|
|
2004-08-12 08:53:42 +02:00
|
|
|
|
void
|
link.cc (_Jv_Linker::print_class_loaded): Declare string constants as "const char *".
2006-02-08 Bryce McKinlay <mckinlay@redhat.com>
* link.cc (_Jv_Linker::print_class_loaded): Declare string constants
as "const char *".
* verify.cc (verify_fail): Likewise.
* gnu/classpath/natSystemProperties.cc (file_encoding): Likewise.
* interpret.cc (throw_internal_error, throw_class_format_error):
Likewise.
* gcj/javaprims.h (_Jv_hashUtf8String, _Jv_Utf8Const::space_needed,
_Jv_Utf8Const::init, _Jv_makeUtf8Const): Likewise.
* java/lang/Class.h (_Jv_InitPrimClass): Likewise.
* include/jvm.h (_Jv_strLengthUtf8, _Jv_makeUtf8Const): Likewise.
* defineclass.cc (throw_internal_error, throw_no_class_def_found_error,
is_attribute_name): Likewise.
* prims.cc (_Jv_strLengthUtf8, _Jv_hashUtf8String, _Jv_Utf8Const::init,
_Jv_makeUtf8Const, _Jv_InitPrimClass): Likewise.
From-SVN: r110767
2006-02-08 21:38:13 +01:00
|
|
|
|
_Jv_Utf8Const::init(const char *s, int len)
|
2004-08-12 08:53:42 +02:00
|
|
|
|
{
|
|
|
|
|
::memcpy (data, s, len);
|
|
|
|
|
data[len] = 0;
|
|
|
|
|
length = len;
|
|
|
|
|
hash = _Jv_hashUtf8String (s, len) & 0xFFFF;
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
_Jv_Utf8Const *
|
link.cc (_Jv_Linker::print_class_loaded): Declare string constants as "const char *".
2006-02-08 Bryce McKinlay <mckinlay@redhat.com>
* link.cc (_Jv_Linker::print_class_loaded): Declare string constants
as "const char *".
* verify.cc (verify_fail): Likewise.
* gnu/classpath/natSystemProperties.cc (file_encoding): Likewise.
* interpret.cc (throw_internal_error, throw_class_format_error):
Likewise.
* gcj/javaprims.h (_Jv_hashUtf8String, _Jv_Utf8Const::space_needed,
_Jv_Utf8Const::init, _Jv_makeUtf8Const): Likewise.
* java/lang/Class.h (_Jv_InitPrimClass): Likewise.
* include/jvm.h (_Jv_strLengthUtf8, _Jv_makeUtf8Const): Likewise.
* defineclass.cc (throw_internal_error, throw_no_class_def_found_error,
is_attribute_name): Likewise.
* prims.cc (_Jv_strLengthUtf8, _Jv_hashUtf8String, _Jv_Utf8Const::init,
_Jv_makeUtf8Const, _Jv_InitPrimClass): Likewise.
From-SVN: r110767
2006-02-08 21:38:13 +01:00
|
|
|
|
_Jv_makeUtf8Const (const char* s, int len)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
|
|
|
|
if (len < 0)
|
|
|
|
|
len = strlen (s);
|
2004-08-12 08:53:42 +02:00
|
|
|
|
Utf8Const* m
|
|
|
|
|
= (Utf8Const*) _Jv_AllocBytes (_Jv_Utf8Const::space_needed(s, len));
|
|
|
|
|
m->init(s, len);
|
|
|
|
|
return m;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
|
_Jv_Utf8Const *
|
|
|
|
|
_Jv_makeUtf8Const (jstring string)
|
|
|
|
|
{
|
|
|
|
|
jint hash = string->hashCode ();
|
|
|
|
|
jint len = _Jv_GetStringUTFLength (string);
|
|
|
|
|
|
|
|
|
|
Utf8Const* m = (Utf8Const*)
|
2001-05-24 07:40:37 +02:00
|
|
|
|
_Jv_AllocBytes (sizeof(Utf8Const) + len + 1);
|
[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
|
|
|
|
|
|
|
|
|
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
|
2001-10-23 07:42:03 +02:00
|
|
|
|
fprintf (stderr, "libgcj failure: %s\n", message);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
#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)
|
|
|
|
|
{
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::ArrayIndexOutOfBoundsException
|
|
|
|
|
(java::lang::String::valueOf (bad_index));
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-04-28 01:13:31 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_ThrowNullPointerException ()
|
|
|
|
|
{
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::NullPointerException;
|
2000-04-28 01:13:31 +02:00
|
|
|
|
}
|
|
|
|
|
|
2005-04-29 20:35:36 +02:00
|
|
|
|
// Resolve an entry in the constant pool and return the target
|
|
|
|
|
// address.
|
|
|
|
|
void *
|
|
|
|
|
_Jv_ResolvePoolEntry (jclass this_class, jint index)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Constants *pool = &this_class->constants;
|
|
|
|
|
|
|
|
|
|
if ((pool->tags[index] & JV_CONSTANT_ResolvedFlag) != 0)
|
|
|
|
|
return pool->data[index].field->u.addr;
|
|
|
|
|
|
|
|
|
|
JvSynchronize sync (this_class);
|
|
|
|
|
return (_Jv_Linker::resolve_pool_entry (this_class, index))
|
|
|
|
|
.field->u.addr;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
// Explicitly throw a no memory exception.
|
|
|
|
|
// The collector calls this when it encounters an out-of-memory condition.
|
|
|
|
|
void _Jv_ThrowNoMemory()
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2001-12-14 19:43:55 +01:00
|
|
|
|
throw no_memory;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2000-04-02 17:34:17 +02:00
|
|
|
|
#ifdef ENABLE_JVMPI
|
2004-08-23 23:31:53 +02:00
|
|
|
|
# define JVMPI_NOTIFY_ALLOC(klass,size,obj) \
|
|
|
|
|
if (__builtin_expect (_Jv_JVMPI_Notify_OBJECT_ALLOC != 0, false)) \
|
|
|
|
|
jvmpi_notify_alloc(klass,size,obj);
|
2001-12-14 19:43:55 +01:00
|
|
|
|
static void
|
|
|
|
|
jvmpi_notify_alloc(jclass klass, jint size, jobject obj)
|
|
|
|
|
{
|
|
|
|
|
// Service JVMPI allocation request.
|
2004-08-23 23:31:53 +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) klass;
|
|
|
|
|
event.u.obj_alloc.is_array = 0;
|
|
|
|
|
event.u.obj_alloc.size = size;
|
|
|
|
|
event.u.obj_alloc.obj_id = (jobjectID) obj;
|
|
|
|
|
|
|
|
|
|
// FIXME: This doesn't look right for the Boehm GC. A GC may
|
|
|
|
|
// already be in progress. _Jv_DisableGC () doesn't wait for it.
|
|
|
|
|
// More importantly, I don't see the need for disabling GC, since we
|
|
|
|
|
// blatantly have a pointer to obj on our stack, ensuring that the
|
|
|
|
|
// object can't be collected. Even for a nonconservative collector,
|
|
|
|
|
// it appears to me that this must be true, since we are about to
|
|
|
|
|
// return obj. Isn't this whole approach way too intrusive for
|
|
|
|
|
// a useful profiling interface? - HB
|
|
|
|
|
_Jv_DisableGC ();
|
|
|
|
|
(*_Jv_JVMPI_Notify_OBJECT_ALLOC) (&event);
|
|
|
|
|
_Jv_EnableGC ();
|
2001-12-14 19:43:55 +01:00
|
|
|
|
}
|
|
|
|
|
#else /* !ENABLE_JVMPI */
|
2004-08-23 23:31:53 +02:00
|
|
|
|
# define JVMPI_NOTIFY_ALLOC(klass,size,obj) /* do nothing */
|
2000-04-02 17:34:17 +02:00
|
|
|
|
#endif
|
|
|
|
|
|
2004-04-16 18:27:19 +02:00
|
|
|
|
// Allocate a new object of class KLASS.
|
2001-12-14 19:43:55 +01:00
|
|
|
|
// First a version that assumes that we have no finalizer, and that
|
|
|
|
|
// the class is already initialized.
|
|
|
|
|
// If we know that JVMPI is disabled, this can be replaced by a direct call
|
|
|
|
|
// to the allocator for the appropriate GC.
|
|
|
|
|
jobject
|
2004-04-16 18:27:19 +02:00
|
|
|
|
_Jv_AllocObjectNoInitNoFinalizer (jclass klass)
|
2001-12-14 19:43:55 +01:00
|
|
|
|
{
|
2004-04-16 18:27:19 +02:00
|
|
|
|
jint size = klass->size ();
|
2001-12-14 19:43:55 +01:00
|
|
|
|
jobject obj = (jobject) _Jv_AllocObj (size, klass);
|
2004-08-23 23:31:53 +02:00
|
|
|
|
JVMPI_NOTIFY_ALLOC (klass, size, obj);
|
2001-12-14 19:43:55 +01:00
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// And now a version that initializes if necessary.
|
|
|
|
|
jobject
|
2004-04-16 18:27:19 +02:00
|
|
|
|
_Jv_AllocObjectNoFinalizer (jclass klass)
|
2001-12-14 19:43:55 +01:00
|
|
|
|
{
|
2006-02-01 14:40:05 +01:00
|
|
|
|
if (_Jv_IsPhantomClass(klass) )
|
|
|
|
|
throw new java::lang::NoClassDefFoundError(klass->getName());
|
|
|
|
|
|
2001-12-14 19:43:55 +01:00
|
|
|
|
_Jv_InitClass (klass);
|
2004-04-16 18:27:19 +02:00
|
|
|
|
jint size = klass->size ();
|
2001-12-14 19:43:55 +01:00
|
|
|
|
jobject obj = (jobject) _Jv_AllocObj (size, klass);
|
2004-08-23 23:31:53 +02:00
|
|
|
|
JVMPI_NOTIFY_ALLOC (klass, size, obj);
|
2001-12-14 19:43:55 +01:00
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// And now the general version that registers a finalizer if necessary.
|
|
|
|
|
jobject
|
2004-04-16 18:27:19 +02:00
|
|
|
|
_Jv_AllocObject (jclass klass)
|
2001-12-14 19:43:55 +01:00
|
|
|
|
{
|
2004-04-16 18:27:19 +02:00
|
|
|
|
jobject obj = _Jv_AllocObjectNoFinalizer (klass);
|
|
|
|
|
|
2001-12-14 19:43:55 +01:00
|
|
|
|
// We assume that the compiler only generates calls to this routine
|
|
|
|
|
// if there really is an interesting finalizer.
|
|
|
|
|
// Unfortunately, we still have to the dynamic test, since there may
|
|
|
|
|
// be cni calls to this routine.
|
2002-12-05 01:49:30 +01:00
|
|
|
|
// Note that on IA64 get_finalizer() returns the starting address of the
|
2001-12-14 19:43:55 +01:00
|
|
|
|
// function, not a function pointer. Thus this still works.
|
|
|
|
|
if (klass->vtable->get_finalizer ()
|
|
|
|
|
!= java::lang::Object::class$.vtable->get_finalizer ())
|
|
|
|
|
_Jv_RegisterFinalizer (obj, _Jv_FinalizeObject);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
|
2004-04-16 18:27:19 +02:00
|
|
|
|
// Allocate a String, including variable length storage.
|
|
|
|
|
jstring
|
|
|
|
|
_Jv_AllocString(jsize len)
|
|
|
|
|
{
|
|
|
|
|
using namespace java::lang;
|
|
|
|
|
|
|
|
|
|
jsize sz = sizeof(java::lang::String) + len * sizeof(jchar);
|
|
|
|
|
|
|
|
|
|
// We assert that for strings allocated this way, the data field
|
|
|
|
|
// will always point to the object itself. Thus there is no reason
|
|
|
|
|
// for the garbage collector to scan any of it.
|
|
|
|
|
// Furthermore, we're about to overwrite the string data, so
|
|
|
|
|
// initialization of the object is not an issue.
|
|
|
|
|
|
|
|
|
|
// String needs no initialization, and there is no finalizer, so
|
|
|
|
|
// we can go directly to the collector's allocator interface.
|
|
|
|
|
jstring obj = (jstring) _Jv_AllocPtrFreeObj(sz, &String::class$);
|
|
|
|
|
|
|
|
|
|
obj->data = obj;
|
|
|
|
|
obj->boffset = sizeof(java::lang::String);
|
|
|
|
|
obj->count = len;
|
|
|
|
|
obj->cachedHashCode = 0;
|
|
|
|
|
|
2004-08-23 23:31:53 +02:00
|
|
|
|
JVMPI_NOTIFY_ALLOC (&String::class$, sz, obj);
|
2004-04-16 18:27:19 +02:00
|
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
// A version of the above that assumes the object contains no pointers,
|
|
|
|
|
// and requires no finalization. This can't happen if we need pointers
|
|
|
|
|
// to locks.
|
|
|
|
|
#ifdef JV_HASH_SYNCHRONIZATION
|
|
|
|
|
jobject
|
2004-04-16 18:27:19 +02:00
|
|
|
|
_Jv_AllocPtrFreeObject (jclass klass)
|
2001-05-24 07:40:37 +02:00
|
|
|
|
{
|
|
|
|
|
_Jv_InitClass (klass);
|
2004-04-16 18:27:19 +02:00
|
|
|
|
jint size = klass->size ();
|
2001-05-24 07:40:37 +02:00
|
|
|
|
|
|
|
|
|
jobject obj = (jobject) _Jv_AllocPtrFreeObj (size, klass);
|
|
|
|
|
|
2004-08-23 23:31:53 +02:00
|
|
|
|
JVMPI_NOTIFY_ALLOC (klass, size, obj);
|
2001-05-24 07:40:37 +02:00
|
|
|
|
|
|
|
|
|
return obj;
|
|
|
|
|
}
|
|
|
|
|
#endif /* JV_HASH_SYNCHRONIZATION */
|
|
|
|
|
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
// 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)
|
|
|
|
|
{
|
2006-02-01 14:40:05 +01:00
|
|
|
|
// Creating an array of an unresolved type is impossible. So we throw
|
|
|
|
|
// the NoClassDefFoundError.
|
|
|
|
|
if ( _Jv_IsPhantomClass(elementClass) )
|
|
|
|
|
throw new java::lang::NoClassDefFoundError(elementClass->getName());
|
|
|
|
|
|
2000-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (count < 0, false))
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::NegativeArraySizeException;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
1999-11-25 01:36:51 +01:00
|
|
|
|
JvAssert (! elementClass->isPrimitive ());
|
|
|
|
|
|
2001-01-09 00:28:56 +01:00
|
|
|
|
// Ensure that elements pointer is properly aligned.
|
1999-11-25 01:36:51 +01:00
|
|
|
|
jobjectArray obj = NULL;
|
2001-01-09 00:28:56 +01:00
|
|
|
|
size_t size = (size_t) elements (obj);
|
2003-10-16 23:19:53 +02:00
|
|
|
|
// Check for overflow.
|
|
|
|
|
if (__builtin_expect ((size_t) count >
|
|
|
|
|
(MAX_OBJECT_SIZE - 1 - size) / sizeof (jobject), false))
|
|
|
|
|
throw 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
|
|
|
|
|
2002-12-03 14:50:05 +01:00
|
|
|
|
jclass klass = _Jv_GetArrayClass (elementClass,
|
|
|
|
|
elementClass->getClassLoaderInternal());
|
[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
|
|
|
|
|
2000-09-30 11:56:58 +02:00
|
|
|
|
obj = (jobjectArray) _Jv_AllocArray (size, klass);
|
2000-11-27 05:05:23 +01:00
|
|
|
|
// Cast away const.
|
|
|
|
|
jsize *lp = const_cast<jsize *> (&obj->length);
|
|
|
|
|
*lp = count;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
// We know the allocator returns zeroed memory. So don't bother
|
|
|
|
|
// zeroing it again.
|
|
|
|
|
if (init)
|
|
|
|
|
{
|
2001-01-09 00:28:56 +01:00
|
|
|
|
jobject *ptr = elements(obj);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
while (--count >= 0)
|
|
|
|
|
*ptr++ = init;
|
|
|
|
|
}
|
|
|
|
|
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-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (count < 0, false))
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw new java::lang::NegativeArraySizeException;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
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 >
|
2003-10-16 23:19:53 +02:00
|
|
|
|
(MAX_OBJECT_SIZE - size) / elsize, false))
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw no_memory;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
2001-01-09 00:28:56 +01:00
|
|
|
|
jclass klass = _Jv_GetArrayClass (eltype, 0);
|
2000-09-30 11:56:58 +02:00
|
|
|
|
|
2001-05-24 07:40:37 +02:00
|
|
|
|
# ifdef JV_HASH_SYNCHRONIZATION
|
|
|
|
|
// Since the vtable is always statically allocated,
|
|
|
|
|
// these are completely pointerfree! Make sure the GC doesn't touch them.
|
|
|
|
|
__JArray *arr =
|
|
|
|
|
(__JArray*) _Jv_AllocPtrFreeObj (size + elsize * count, klass);
|
|
|
|
|
memset((char *)arr + size, 0, elsize * count);
|
|
|
|
|
# else
|
2000-09-30 11:56:58 +02:00
|
|
|
|
__JArray *arr = (__JArray*) _Jv_AllocObj (size + elsize * count, klass);
|
2001-05-24 07:40:37 +02:00
|
|
|
|
// Note that we assume we are given zeroed memory by the allocator.
|
|
|
|
|
# endif
|
2000-11-27 05:05:23 +01:00
|
|
|
|
// Cast away const.
|
|
|
|
|
jsize *lp = const_cast<jsize *> (&arr->length);
|
|
|
|
|
*lp = count;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
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);
|
|
|
|
|
}
|
2001-12-16 23:28:35 +01:00
|
|
|
|
throw new java::lang::InternalError
|
|
|
|
|
(JvNewStringLatin1 ("invalid type code in _Jv_NewArray"));
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2001-10-02 15:44:32 +02:00
|
|
|
|
// Allocate a possibly multi-dimensional array but don't check that
|
|
|
|
|
// any array length is <0.
|
|
|
|
|
static jobject
|
|
|
|
|
_Jv_NewMultiArrayUnchecked (jclass type, jint dimensions, jint *sizes)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
|
|
|
|
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)
|
2001-10-02 15:44:32 +02:00
|
|
|
|
contents[i] = _Jv_NewMultiArrayUnchecked (element_type, dimensions - 1,
|
|
|
|
|
sizes + 1);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2001-10-02 15:44:32 +02:00
|
|
|
|
jobject
|
|
|
|
|
_Jv_NewMultiArray (jclass type, jint dimensions, jint *sizes)
|
|
|
|
|
{
|
|
|
|
|
for (int i = 0; i < dimensions; ++i)
|
|
|
|
|
if (sizes[i] < 0)
|
|
|
|
|
throw new java::lang::NegativeArraySizeException;
|
|
|
|
|
|
|
|
|
|
return _Jv_NewMultiArrayUnchecked (type, dimensions, sizes);
|
|
|
|
|
}
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
jobject
|
|
|
|
|
_Jv_NewMultiArray (jclass array_type, jint dimensions, ...)
|
|
|
|
|
{
|
2006-05-04 20:44:53 +02:00
|
|
|
|
// Creating an array of an unresolved type is impossible. So we throw
|
|
|
|
|
// the NoClassDefFoundError.
|
|
|
|
|
if (_Jv_IsPhantomClass(array_type))
|
|
|
|
|
throw new java::lang::NoClassDefFoundError(array_type->getName());
|
|
|
|
|
|
1999-04-07 16:42:40 +02:00
|
|
|
|
va_list args;
|
|
|
|
|
jint sizes[dimensions];
|
|
|
|
|
va_start (args, dimensions);
|
|
|
|
|
for (int i = 0; i < dimensions; ++i)
|
|
|
|
|
{
|
|
|
|
|
jint size = va_arg (args, jint);
|
2001-10-02 15:44:32 +02:00
|
|
|
|
if (size < 0)
|
|
|
|
|
throw new java::lang::NegativeArraySizeException;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
sizes[i] = size;
|
|
|
|
|
}
|
|
|
|
|
va_end (args);
|
|
|
|
|
|
2001-10-02 15:44:32 +02:00
|
|
|
|
return _Jv_NewMultiArrayUnchecked (array_type, dimensions, sizes);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2002-03-10 04:53:16 +01:00
|
|
|
|
// Ensure 8-byte alignment, for hash synchronization.
|
2001-10-16 10:35:17 +02:00
|
|
|
|
#define DECLARE_PRIM_TYPE(NAME) \
|
2002-03-10 04:53:16 +01:00
|
|
|
|
java::lang::Class _Jv_##NAME##Class __attribute__ ((aligned (8)));
|
2001-10-16 10:35:17 +02:00
|
|
|
|
|
2002-12-28 07:38:52 +01:00
|
|
|
|
DECLARE_PRIM_TYPE(byte)
|
|
|
|
|
DECLARE_PRIM_TYPE(short)
|
|
|
|
|
DECLARE_PRIM_TYPE(int)
|
|
|
|
|
DECLARE_PRIM_TYPE(long)
|
|
|
|
|
DECLARE_PRIM_TYPE(boolean)
|
|
|
|
|
DECLARE_PRIM_TYPE(char)
|
|
|
|
|
DECLARE_PRIM_TYPE(float)
|
|
|
|
|
DECLARE_PRIM_TYPE(double)
|
|
|
|
|
DECLARE_PRIM_TYPE(void)
|
2001-10-16 10:35:17 +02:00
|
|
|
|
|
|
|
|
|
void
|
link.cc (_Jv_Linker::print_class_loaded): Declare string constants as "const char *".
2006-02-08 Bryce McKinlay <mckinlay@redhat.com>
* link.cc (_Jv_Linker::print_class_loaded): Declare string constants
as "const char *".
* verify.cc (verify_fail): Likewise.
* gnu/classpath/natSystemProperties.cc (file_encoding): Likewise.
* interpret.cc (throw_internal_error, throw_class_format_error):
Likewise.
* gcj/javaprims.h (_Jv_hashUtf8String, _Jv_Utf8Const::space_needed,
_Jv_Utf8Const::init, _Jv_makeUtf8Const): Likewise.
* java/lang/Class.h (_Jv_InitPrimClass): Likewise.
* include/jvm.h (_Jv_strLengthUtf8, _Jv_makeUtf8Const): Likewise.
* defineclass.cc (throw_internal_error, throw_no_class_def_found_error,
is_attribute_name): Likewise.
* prims.cc (_Jv_strLengthUtf8, _Jv_hashUtf8String, _Jv_Utf8Const::init,
_Jv_makeUtf8Const, _Jv_InitPrimClass): Likewise.
From-SVN: r110767
2006-02-08 21:38:13 +01:00
|
|
|
|
_Jv_InitPrimClass (jclass cl, const char *cname, char sig, int len)
|
2001-10-16 10:35:17 +02:00
|
|
|
|
{
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
|
2001-12-16 23:28:35 +01:00
|
|
|
|
// We must set the vtable for the class; the Java constructor
|
|
|
|
|
// doesn't do this.
|
|
|
|
|
(*(_Jv_VTable **) cl) = java::lang::Class::class$.vtable;
|
|
|
|
|
|
|
|
|
|
// Initialize the fields we care about. We do this in the same
|
|
|
|
|
// order they are declared in Class.h.
|
2001-10-16 10:35:17 +02:00
|
|
|
|
cl->name = _Jv_makeUtf8Const ((char *) cname, -1);
|
|
|
|
|
cl->accflags = Modifier::PUBLIC | Modifier::FINAL | Modifier::ABSTRACT;
|
|
|
|
|
cl->method_count = sig;
|
|
|
|
|
cl->size_in_bytes = len;
|
|
|
|
|
cl->vtable = JV_PRIMITIVE_VTABLE;
|
|
|
|
|
cl->state = JV_STATE_DONE;
|
|
|
|
|
cl->depth = -1;
|
|
|
|
|
}
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
jclass
|
2005-04-06 00:26:26 +02:00
|
|
|
|
_Jv_FindClassFromSignature (char *sig, java::lang::ClassLoader *loader,
|
|
|
|
|
char **endp)
|
1999-04-07 16:42:40 +02:00
|
|
|
|
{
|
2005-04-06 00:26:26 +02:00
|
|
|
|
// First count arrays.
|
|
|
|
|
int array_count = 0;
|
|
|
|
|
while (*sig == '[')
|
|
|
|
|
{
|
|
|
|
|
++sig;
|
|
|
|
|
++array_count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jclass result = NULL;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
switch (*sig)
|
|
|
|
|
{
|
|
|
|
|
case 'B':
|
2005-04-06 00:26:26 +02:00
|
|
|
|
result = JvPrimClass (byte);
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
case 'S':
|
2005-04-06 00:26:26 +02:00
|
|
|
|
result = JvPrimClass (short);
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
case 'I':
|
2005-04-06 00:26:26 +02:00
|
|
|
|
result = JvPrimClass (int);
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
case 'J':
|
2005-04-06 00:26:26 +02:00
|
|
|
|
result = JvPrimClass (long);
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
case 'Z':
|
2005-04-06 00:26:26 +02:00
|
|
|
|
result = JvPrimClass (boolean);
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
case 'C':
|
2005-04-06 00:26:26 +02:00
|
|
|
|
result = JvPrimClass (char);
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
case 'F':
|
2005-04-06 00:26:26 +02:00
|
|
|
|
result = JvPrimClass (float);
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
case 'D':
|
2005-04-06 00:26:26 +02:00
|
|
|
|
result = JvPrimClass (double);
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
case 'V':
|
2005-04-06 00:26:26 +02:00
|
|
|
|
result = JvPrimClass (void);
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
case 'L':
|
|
|
|
|
{
|
2005-04-06 00:26:26 +02:00
|
|
|
|
char *save = ++sig;
|
|
|
|
|
while (*sig && *sig != ';')
|
|
|
|
|
++sig;
|
|
|
|
|
// Do nothing if signature appears to be malformed.
|
|
|
|
|
if (*sig == ';')
|
|
|
|
|
{
|
|
|
|
|
_Jv_Utf8Const *name = _Jv_makeUtf8Const (save, sig - save);
|
|
|
|
|
result = _Jv_FindClass (name, loader);
|
|
|
|
|
}
|
|
|
|
|
break;
|
2001-03-23 20:17:22 +01:00
|
|
|
|
}
|
2005-04-06 00:26:26 +02:00
|
|
|
|
default:
|
|
|
|
|
// Do nothing -- bad signature.
|
|
|
|
|
break;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
2001-03-23 20:17:22 +01:00
|
|
|
|
|
2005-04-06 00:26:26 +02:00
|
|
|
|
if (endp)
|
|
|
|
|
{
|
|
|
|
|
// Not really the "end", but the last valid character that we
|
|
|
|
|
// looked at.
|
|
|
|
|
*endp = sig;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (! result)
|
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
|
|
// Find arrays.
|
|
|
|
|
while (array_count-- > 0)
|
|
|
|
|
result = _Jv_GetArrayClass (result, loader);
|
|
|
|
|
return result;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
2006-02-01 14:40:05 +01:00
|
|
|
|
|
|
|
|
|
jclass
|
|
|
|
|
_Jv_FindClassFromSignatureNoException (char *sig, java::lang::ClassLoader *loader,
|
|
|
|
|
char **endp)
|
|
|
|
|
{
|
|
|
|
|
jclass klass;
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
klass = _Jv_FindClassFromSignature(sig, loader, endp);
|
|
|
|
|
}
|
|
|
|
|
catch (java::lang::NoClassDefFoundError *ncdfe)
|
|
|
|
|
{
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
catch (java::lang::ClassNotFoundException *cnfe)
|
|
|
|
|
{
|
|
|
|
|
return NULL;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return klass;
|
|
|
|
|
}
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
JArray<jstring> *
|
|
|
|
|
JvConvertArgv (int argc, const char **argv)
|
|
|
|
|
{
|
|
|
|
|
if (argc < 0)
|
|
|
|
|
argc = 0;
|
2004-11-25 04:47:08 +01:00
|
|
|
|
jobjectArray ar = JvNewObjectArray(argc, &java::lang::String::class$, NULL);
|
2001-12-11 05:03:57 +01:00
|
|
|
|
jobject *ptr = elements(ar);
|
|
|
|
|
jbyteArray bytes = NULL;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
for (int i = 0; i < argc; i++)
|
|
|
|
|
{
|
|
|
|
|
const char *arg = argv[i];
|
2001-12-11 05:03:57 +01:00
|
|
|
|
int len = strlen (arg);
|
|
|
|
|
if (bytes == NULL || bytes->length < len)
|
|
|
|
|
bytes = JvNewByteArray (len);
|
|
|
|
|
jbyte *bytePtr = elements (bytes);
|
|
|
|
|
// We assume jbyte == char.
|
|
|
|
|
memcpy (bytePtr, arg, len);
|
|
|
|
|
|
|
|
|
|
// Now convert using the default encoding.
|
|
|
|
|
*ptr++ = new java::lang::String (bytes, 0, len);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
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.
|
2001-08-26 13:30:09 +02:00
|
|
|
|
static JArray<jstring> *arg_vec;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
|
|
|
|
|
// The primary thread.
|
|
|
|
|
static java::lang::Thread *main_thread;
|
|
|
|
|
|
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++;
|
|
|
|
|
|
|
|
|
|
// 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");
|
|
|
|
|
|
|
|
|
|
if (NULL == props)
|
|
|
|
|
return;
|
|
|
|
|
|
2006-01-24 19:10:39 +01:00
|
|
|
|
// Later on we will write \0s into this string. It is simplest to
|
|
|
|
|
// just duplicate it here.
|
|
|
|
|
props = strdup (props);
|
|
|
|
|
|
|
|
|
|
char *p = props;
|
|
|
|
|
size_t length;
|
|
|
|
|
size_t property_count = 0;
|
|
|
|
|
|
1999-10-15 08:07:41 +02:00
|
|
|
|
// 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));
|
|
|
|
|
|
2004-09-26 22:24:32 +02:00
|
|
|
|
// Null terminate the strings.
|
|
|
|
|
for (property_pair *prop = &_Jv_Environment_Properties[0];
|
|
|
|
|
prop->key != NULL;
|
|
|
|
|
prop++)
|
|
|
|
|
{
|
|
|
|
|
prop->key[prop->key_length] = 0;
|
|
|
|
|
prop->value[prop->value_length] = 0;
|
|
|
|
|
}
|
1999-10-15 08:07:41 +02:00
|
|
|
|
}
|
|
|
|
|
#endif // DISABLE_GETENV_PROPERTIES
|
|
|
|
|
|
2001-10-16 10:35:17 +02:00
|
|
|
|
namespace gcj
|
|
|
|
|
{
|
|
|
|
|
_Jv_Utf8Const *void_signature;
|
|
|
|
|
_Jv_Utf8Const *clinit_name;
|
|
|
|
|
_Jv_Utf8Const *init_name;
|
|
|
|
|
_Jv_Utf8Const *finit_name;
|
2001-10-23 07:42:03 +02:00
|
|
|
|
|
|
|
|
|
bool runtimeInitialized = false;
|
2005-05-13 03:02:39 +02:00
|
|
|
|
|
|
|
|
|
// When true, print debugging information about class loading.
|
|
|
|
|
bool verbose_class_flag;
|
|
|
|
|
|
|
|
|
|
// When true, enable the bytecode verifier and BC-ABI type verification.
|
|
|
|
|
bool verifyClasses = true;
|
2005-11-17 21:25:57 +01:00
|
|
|
|
|
|
|
|
|
// Thread stack size specified by the -Xss runtime argument.
|
|
|
|
|
size_t stack_size = 0;
|
2001-10-16 10:35:17 +02:00
|
|
|
|
}
|
|
|
|
|
|
2005-04-02 04:26:51 +02:00
|
|
|
|
// We accept all non-standard options accepted by Sun's java command,
|
|
|
|
|
// for compatibility with existing application launch scripts.
|
|
|
|
|
static jint
|
|
|
|
|
parse_x_arg (char* option_string)
|
|
|
|
|
{
|
|
|
|
|
if (strlen (option_string) <= 0)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if (! strcmp (option_string, "int"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: this should cause the vm to never load shared objects
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "mixed"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: allow interpreted and native code
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "batch"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: disable background JIT'ing
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "debug"))
|
|
|
|
|
{
|
2006-08-24 20:55:53 +02:00
|
|
|
|
remoteDebug = true;
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "runjdwp:", 8))
|
|
|
|
|
{
|
|
|
|
|
if (strlen (option_string) > 8)
|
|
|
|
|
jdwpOptions = &option_string[8];
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
fprintf (stderr,
|
|
|
|
|
"libgcj: argument required for JDWP options");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2005-04-02 04:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "bootclasspath:", 14))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: add a parse_bootclasspath_arg function
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "bootclasspath/a:", 16))
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "bootclasspath/p:", 16))
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "check:jni"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: enable strict JNI checking
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "future"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: enable strict class file format checks
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "noclassgc"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: disable garbage collection for classes
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "incgc"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: incremental garbage collection
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "loggc:", 6))
|
|
|
|
|
{
|
|
|
|
|
if (option_string[6] == '\0')
|
|
|
|
|
{
|
|
|
|
|
fprintf (stderr,
|
|
|
|
|
"libgcj: filename argument expected for loggc option\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
// FIXME: set gc logging filename
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "ms", 2))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: ignore this option until PR 20699 is fixed.
|
|
|
|
|
// _Jv_SetInitialHeapSize (option_string + 2);
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "mx", 2))
|
|
|
|
|
_Jv_SetMaximumHeapSize (option_string + 2);
|
|
|
|
|
else if (! strcmp (option_string, "prof"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: enable profiling of program running in vm
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "runhprof:", 9))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: enable specific type of vm profiling. add a
|
|
|
|
|
// parse_runhprof_arg function
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "rs"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: reduced system signal usage. disable thread dumps,
|
|
|
|
|
// only terminate in response to user-initiated calls,
|
|
|
|
|
// e.g. System.exit()
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "ss", 2))
|
|
|
|
|
{
|
2005-11-17 21:25:57 +01:00
|
|
|
|
_Jv_SetStackSize (option_string + 2);
|
2005-04-02 04:26:51 +02:00
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "X:+UseAltSigs"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: use signals other than SIGUSR1 and SIGUSR2
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "share:off"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: don't share class data
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "share:auto"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: share class data where possible
|
|
|
|
|
}
|
|
|
|
|
else if (! strcmp (option_string, "share:on"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: fail if impossible to share class data
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2005-02-23 18:36:26 +01:00
|
|
|
|
static jint
|
|
|
|
|
parse_verbose_args (char* option_string,
|
2005-04-02 04:26:51 +02:00
|
|
|
|
bool ignore_unrecognized)
|
2005-02-23 18:36:26 +01:00
|
|
|
|
{
|
2005-04-13 18:37:20 +02:00
|
|
|
|
size_t len = sizeof ("-verbose") - 1;
|
2005-02-23 18:36:26 +01:00
|
|
|
|
|
|
|
|
|
if (strlen (option_string) < len)
|
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
|
|
if (option_string[len] == ':'
|
|
|
|
|
&& option_string[len + 1] != '\0')
|
|
|
|
|
{
|
|
|
|
|
char* verbose_args = option_string + len + 1;
|
|
|
|
|
|
|
|
|
|
do
|
|
|
|
|
{
|
|
|
|
|
if (! strncmp (verbose_args,
|
2005-04-13 18:37:20 +02:00
|
|
|
|
"gc", sizeof ("gc") - 1))
|
|
|
|
|
{
|
|
|
|
|
if (verbose_args[sizeof ("gc") - 1] == '\0'
|
|
|
|
|
|| verbose_args[sizeof ("gc") - 1] == ',')
|
|
|
|
|
{
|
|
|
|
|
// FIXME: we should add functions to boehm-gc that
|
|
|
|
|
// toggle GC_print_stats, GC_PRINT_ADDRESS_MAP and
|
|
|
|
|
// GC_print_back_height.
|
|
|
|
|
verbose_args += sizeof ("gc") - 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
verbose_arg_err:
|
|
|
|
|
fprintf (stderr, "libgcj: unknown verbose option: %s\n",
|
|
|
|
|
option_string);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-02-23 18:36:26 +01:00
|
|
|
|
else if (! strncmp (verbose_args,
|
|
|
|
|
"class",
|
2005-04-13 18:37:20 +02:00
|
|
|
|
sizeof ("class") - 1))
|
|
|
|
|
{
|
|
|
|
|
if (verbose_args[sizeof ("class") - 1] == '\0'
|
|
|
|
|
|| verbose_args[sizeof ("class") - 1] == ',')
|
|
|
|
|
{
|
|
|
|
|
gcj::verbose_class_flag = true;
|
|
|
|
|
verbose_args += sizeof ("class") - 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
goto verbose_arg_err;
|
|
|
|
|
}
|
2005-02-23 18:36:26 +01:00
|
|
|
|
else if (! strncmp (verbose_args, "jni",
|
2005-04-13 18:37:20 +02:00
|
|
|
|
sizeof ("jni") - 1))
|
|
|
|
|
{
|
|
|
|
|
if (verbose_args[sizeof ("jni") - 1] == '\0'
|
|
|
|
|
|| verbose_args[sizeof ("jni") - 1] == ',')
|
|
|
|
|
{
|
|
|
|
|
// FIXME: enable JNI messages.
|
|
|
|
|
verbose_args += sizeof ("jni") - 1;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
goto verbose_arg_err;
|
|
|
|
|
}
|
2005-02-23 18:36:26 +01:00
|
|
|
|
else if (ignore_unrecognized
|
|
|
|
|
&& verbose_args[0] == 'X')
|
|
|
|
|
{
|
|
|
|
|
// ignore unrecognized non-standard verbose option
|
2005-04-13 18:37:20 +02:00
|
|
|
|
while (verbose_args[0] != '\0'
|
|
|
|
|
&& verbose_args[0] != ',')
|
|
|
|
|
verbose_args++;
|
2005-02-23 18:36:26 +01:00
|
|
|
|
}
|
2005-04-13 18:37:20 +02:00
|
|
|
|
else if (verbose_args[0] == ',')
|
|
|
|
|
{
|
|
|
|
|
verbose_args++;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
goto verbose_arg_err;
|
|
|
|
|
|
|
|
|
|
if (verbose_args[0] == ',')
|
|
|
|
|
verbose_args++;
|
2005-02-23 18:36:26 +01:00
|
|
|
|
}
|
2005-04-13 18:37:20 +02:00
|
|
|
|
while (verbose_args[0] != '\0');
|
2005-02-23 18:36:26 +01:00
|
|
|
|
}
|
|
|
|
|
else if (option_string[len] == 'g'
|
|
|
|
|
&& option_string[len + 1] == 'c'
|
|
|
|
|
&& option_string[len + 2] == '\0')
|
|
|
|
|
{
|
|
|
|
|
// FIXME: we should add functions to boehm-gc that
|
|
|
|
|
// toggle GC_print_stats, GC_PRINT_ADDRESS_MAP and
|
|
|
|
|
// GC_print_back_height.
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else if (option_string[len] == '\0')
|
|
|
|
|
{
|
|
|
|
|
gcj::verbose_class_flag = true;
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// unrecognized option beginning with -verbose
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static jint
|
|
|
|
|
parse_init_args (JvVMInitArgs* vm_args)
|
|
|
|
|
{
|
|
|
|
|
// if _Jv_Compiler_Properties is non-NULL then it needs to be
|
|
|
|
|
// re-allocated dynamically.
|
|
|
|
|
if (_Jv_Compiler_Properties)
|
|
|
|
|
{
|
|
|
|
|
const char** props = _Jv_Compiler_Properties;
|
|
|
|
|
_Jv_Compiler_Properties = NULL;
|
|
|
|
|
|
|
|
|
|
for (int i = 0; props[i]; i++)
|
|
|
|
|
{
|
|
|
|
|
_Jv_Compiler_Properties = (const char**) _Jv_Realloc
|
|
|
|
|
(_Jv_Compiler_Properties,
|
|
|
|
|
(_Jv_Properties_Count + 1) * sizeof (const char*));
|
|
|
|
|
_Jv_Compiler_Properties[_Jv_Properties_Count++] = props[i];
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (vm_args == NULL)
|
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
for (int i = 0; i < vm_args->nOptions; ++i)
|
|
|
|
|
{
|
|
|
|
|
char* option_string = vm_args->options[i].optionString;
|
|
|
|
|
if (! strcmp (option_string, "vfprintf")
|
|
|
|
|
|| ! strcmp (option_string, "exit")
|
|
|
|
|
|| ! strcmp (option_string, "abort"))
|
|
|
|
|
{
|
|
|
|
|
// FIXME: we are required to recognize these, but for
|
|
|
|
|
// now we don't handle them in any way.
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string,
|
|
|
|
|
"-verbose", sizeof ("-verbose") - 1))
|
|
|
|
|
{
|
|
|
|
|
jint result = parse_verbose_args (option_string,
|
2005-04-02 04:26:51 +02:00
|
|
|
|
vm_args->ignoreUnrecognized);
|
2005-02-23 18:36:26 +01:00
|
|
|
|
if (result < 0)
|
|
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
else if (! strncmp (option_string, "-D", 2))
|
|
|
|
|
{
|
|
|
|
|
_Jv_Compiler_Properties = (const char**) _Jv_Realloc
|
|
|
|
|
(_Jv_Compiler_Properties,
|
|
|
|
|
(_Jv_Properties_Count + 1) * sizeof (char*));
|
|
|
|
|
|
|
|
|
|
_Jv_Compiler_Properties[_Jv_Properties_Count++] =
|
|
|
|
|
strdup (option_string + 2);
|
|
|
|
|
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
else if (vm_args->ignoreUnrecognized)
|
2005-04-02 04:26:51 +02:00
|
|
|
|
{
|
|
|
|
|
if (option_string[0] == '_')
|
|
|
|
|
parse_x_arg (option_string + 1);
|
|
|
|
|
else if (! strncmp (option_string, "-X", 2))
|
|
|
|
|
parse_x_arg (option_string + 2);
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
unknown_option:
|
|
|
|
|
fprintf (stderr, "libgcj: unknown option: %s\n", option_string);
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
2005-02-23 18:36:26 +01:00
|
|
|
|
}
|
2005-04-02 04:26:51 +02:00
|
|
|
|
else
|
|
|
|
|
goto unknown_option;
|
2005-02-23 18:36:26 +01:00
|
|
|
|
}
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2001-05-22 08:47:48 +02:00
|
|
|
|
jint
|
2005-02-23 18:36:26 +01:00
|
|
|
|
_Jv_CreateJavaVM (JvVMInitArgs* vm_args)
|
1999-09-23 20:50:59 +02:00
|
|
|
|
{
|
2001-10-16 10:35:17 +02:00
|
|
|
|
using namespace gcj;
|
2005-02-23 18:36:26 +01:00
|
|
|
|
|
2001-10-23 07:42:03 +02:00
|
|
|
|
if (runtimeInitialized)
|
2001-10-16 10:35:17 +02:00
|
|
|
|
return -1;
|
|
|
|
|
|
2005-02-23 18:36:26 +01:00
|
|
|
|
jint result = parse_init_args (vm_args);
|
|
|
|
|
if (result < 0)
|
|
|
|
|
return -1;
|
|
|
|
|
|
1999-10-15 08:07:41 +02:00
|
|
|
|
PROCESS_GCJ_PROPERTIES;
|
|
|
|
|
|
2005-02-16 05:16:06 +01:00
|
|
|
|
/* Threads must be initialized before the GC, so that it inherits the
|
|
|
|
|
signal mask. */
|
2001-10-16 10:35:17 +02:00
|
|
|
|
_Jv_InitThreads ();
|
|
|
|
|
_Jv_InitGC ();
|
|
|
|
|
_Jv_InitializeSyncMutex ();
|
2004-07-13 23:03:03 +02:00
|
|
|
|
|
|
|
|
|
#ifdef INTERPRETER
|
|
|
|
|
_Jv_InitInterpreter ();
|
|
|
|
|
#endif
|
2001-10-16 10:35:17 +02:00
|
|
|
|
|
2004-06-18 15:59:04 +02:00
|
|
|
|
#ifdef HANDLE_SEGV
|
|
|
|
|
INIT_SEGV;
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
#ifdef HANDLE_FPE
|
|
|
|
|
INIT_FPE;
|
|
|
|
|
#endif
|
|
|
|
|
|
2001-10-16 10:35:17 +02:00
|
|
|
|
/* Initialize Utf8 constants declared in jvm.h. */
|
|
|
|
|
void_signature = _Jv_makeUtf8Const ("()V", 3);
|
|
|
|
|
clinit_name = _Jv_makeUtf8Const ("<clinit>", 8);
|
|
|
|
|
init_name = _Jv_makeUtf8Const ("<init>", 6);
|
|
|
|
|
finit_name = _Jv_makeUtf8Const ("finit$", 6);
|
|
|
|
|
|
|
|
|
|
/* Initialize built-in classes to represent primitive TYPEs. */
|
2004-07-24 03:17:29 +02:00
|
|
|
|
_Jv_InitPrimClass (&_Jv_byteClass, "byte", 'B', 1);
|
|
|
|
|
_Jv_InitPrimClass (&_Jv_shortClass, "short", 'S', 2);
|
|
|
|
|
_Jv_InitPrimClass (&_Jv_intClass, "int", 'I', 4);
|
|
|
|
|
_Jv_InitPrimClass (&_Jv_longClass, "long", 'J', 8);
|
|
|
|
|
_Jv_InitPrimClass (&_Jv_booleanClass, "boolean", 'Z', 1);
|
|
|
|
|
_Jv_InitPrimClass (&_Jv_charClass, "char", 'C', 2);
|
|
|
|
|
_Jv_InitPrimClass (&_Jv_floatClass, "float", 'F', 4);
|
|
|
|
|
_Jv_InitPrimClass (&_Jv_doubleClass, "double", 'D', 8);
|
|
|
|
|
_Jv_InitPrimClass (&_Jv_voidClass, "void", 'V', 0);
|
2001-10-16 10:35:17 +02:00
|
|
|
|
|
2004-01-14 23:49:58 +01:00
|
|
|
|
// We have to initialize this fairly early, to avoid circular class
|
|
|
|
|
// initialization. In particular we want to start the
|
|
|
|
|
// initialization of ClassLoader before we start the initialization
|
|
|
|
|
// of VMClassLoader.
|
|
|
|
|
_Jv_InitClass (&java::lang::ClassLoader::class$);
|
2004-06-18 15:59:04 +02:00
|
|
|
|
|
2005-03-24 01:04:22 +01:00
|
|
|
|
// Set up the system class loader and the bootstrap class loader.
|
2005-04-01 21:19:13 +02:00
|
|
|
|
gnu::gcj::runtime::ExtensionClassLoader::initialize();
|
|
|
|
|
java::lang::VMClassLoader::initialize(JvNewStringLatin1(TOOLEXECLIBDIR));
|
2004-01-14 23:49:58 +01:00
|
|
|
|
|
2005-01-10 20:39:26 +01:00
|
|
|
|
_Jv_RegisterBootstrapPackages();
|
|
|
|
|
|
2001-05-22 08:47:48 +02:00
|
|
|
|
no_memory = new java::lang::OutOfMemoryError;
|
2004-01-14 23:49:58 +01:00
|
|
|
|
|
2001-05-22 08:47:48 +02:00
|
|
|
|
#ifdef USE_LTDL
|
|
|
|
|
LTDL_SET_PRELOADED_SYMBOLS ();
|
|
|
|
|
#endif
|
|
|
|
|
|
2002-02-07 19:59:52 +01:00
|
|
|
|
_Jv_platform_initialize ();
|
2001-05-22 08:47:48 +02:00
|
|
|
|
|
|
|
|
|
_Jv_JNI_Init ();
|
2006-09-01 19:42:23 +02:00
|
|
|
|
_Jv_JVMTI_Init ();
|
2001-05-22 08:47:48 +02:00
|
|
|
|
|
2001-10-11 00:25:43 +02:00
|
|
|
|
_Jv_GCInitializeFinalizers (&::gnu::gcj::runtime::FinalizerThread::finalizerReady);
|
|
|
|
|
|
|
|
|
|
// Start the GC finalizer thread. A VirtualMachineError can be
|
2004-07-11 23:19:47 +02:00
|
|
|
|
// thrown by the runtime if, say, threads aren't available.
|
2001-10-11 00:25:43 +02:00
|
|
|
|
try
|
|
|
|
|
{
|
|
|
|
|
using namespace gnu::gcj::runtime;
|
|
|
|
|
FinalizerThread *ft = new FinalizerThread ();
|
|
|
|
|
ft->start ();
|
|
|
|
|
}
|
|
|
|
|
catch (java::lang::VirtualMachineError *ignore)
|
|
|
|
|
{
|
|
|
|
|
}
|
|
|
|
|
|
2006-07-28 09:40:17 +02:00
|
|
|
|
runtimeInitialized = true;
|
|
|
|
|
|
2001-05-22 08:47:48 +02:00
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void
|
2005-04-02 04:26:51 +02:00
|
|
|
|
_Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc,
|
|
|
|
|
const char **argv, bool is_jar)
|
2001-05-22 08:47:48 +02:00
|
|
|
|
{
|
2004-07-20 19:57:58 +02:00
|
|
|
|
#ifndef DISABLE_MAIN_ARGS
|
2003-04-25 18:48:13 +02:00
|
|
|
|
_Jv_SetArgs (argc, argv);
|
2004-07-20 19:57:58 +02:00
|
|
|
|
#endif
|
2000-10-02 07:14:25 +02:00
|
|
|
|
|
2001-08-26 13:30:09 +02:00
|
|
|
|
java::lang::Runtime *runtime = NULL;
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
|
{
|
2005-04-02 04:26:51 +02:00
|
|
|
|
if (_Jv_CreateJavaVM (vm_args) < 0)
|
2005-02-23 18:36:26 +01:00
|
|
|
|
{
|
|
|
|
|
fprintf (stderr, "libgcj: couldn't create virtual machine\n");
|
|
|
|
|
exit (1);
|
|
|
|
|
}
|
2000-01-18 15:37:34 +01:00
|
|
|
|
|
2001-08-26 13:30:09 +02:00
|
|
|
|
// Get the Runtime here. We want to initialize it before searching
|
|
|
|
|
// for `main'; that way it will be set up if `main' is a JNI method.
|
|
|
|
|
runtime = java::lang::Runtime::getRuntime ();
|
2001-06-16 01:22:02 +02:00
|
|
|
|
|
2002-02-07 04:24:12 +01:00
|
|
|
|
#ifdef DISABLE_MAIN_ARGS
|
|
|
|
|
arg_vec = JvConvertArgv (0, 0);
|
|
|
|
|
#else
|
2001-08-26 13:30:09 +02:00
|
|
|
|
arg_vec = JvConvertArgv (argc - 1, argv + 1);
|
2002-02-07 04:24:12 +01:00
|
|
|
|
#endif
|
2001-12-11 05:03:57 +01:00
|
|
|
|
|
2004-07-04 17:27:05 +02:00
|
|
|
|
using namespace gnu::java::lang;
|
2001-08-26 13:30:09 +02:00
|
|
|
|
if (klass)
|
2004-07-04 17:27:05 +02:00
|
|
|
|
main_thread = new MainThread (klass, arg_vec);
|
2001-08-26 13:30:09 +02:00
|
|
|
|
else
|
2006-06-01 09:45:55 +02:00
|
|
|
|
main_thread = new MainThread (JvNewStringUTF (name),
|
2004-07-04 17:27:05 +02:00
|
|
|
|
arg_vec, is_jar);
|
2006-08-24 20:55:53 +02:00
|
|
|
|
_Jv_AttachCurrentThread (main_thread);
|
|
|
|
|
|
|
|
|
|
// Start JDWP
|
|
|
|
|
if (remoteDebug)
|
|
|
|
|
{
|
|
|
|
|
using namespace gnu::classpath::jdwp;
|
|
|
|
|
VMVirtualMachine::initialize ();
|
|
|
|
|
Jdwp *jdwp = new Jdwp ();
|
|
|
|
|
jdwp->setDaemon (true);
|
|
|
|
|
jdwp->configure (JvNewStringLatin1 (jdwpOptions));
|
|
|
|
|
jdwp->start ();
|
|
|
|
|
|
|
|
|
|
// Wait for JDWP to initialize and start
|
|
|
|
|
jdwp->join ();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Send VmInit
|
|
|
|
|
gnu::classpath::jdwp::event::VmInitEvent *event;
|
|
|
|
|
event = new gnu::classpath::jdwp::event::VmInitEvent (main_thread);
|
|
|
|
|
gnu::classpath::jdwp::Jdwp::notify (event);
|
2000-08-21 08:05:20 +02:00
|
|
|
|
}
|
2001-08-26 13:30:09 +02:00
|
|
|
|
catch (java::lang::Throwable *t)
|
2000-08-21 08:05:20 +02:00
|
|
|
|
{
|
2001-08-26 13:30:09 +02:00
|
|
|
|
java::lang::System::err->println (JvNewStringLatin1
|
|
|
|
|
("Exception during runtime initialization"));
|
|
|
|
|
t->printStackTrace();
|
2005-03-24 01:04:22 +01:00
|
|
|
|
if (runtime)
|
2006-04-05 01:25:09 +02:00
|
|
|
|
java::lang::Runtime::exitNoChecksAccessor (1);
|
2005-03-24 01:04:22 +01:00
|
|
|
|
// In case the runtime creation failed.
|
|
|
|
|
::exit (1);
|
2000-08-21 08:05:20 +02:00
|
|
|
|
}
|
2000-09-13 08:36:25 +02:00
|
|
|
|
|
2001-08-26 13:30:09 +02:00
|
|
|
|
_Jv_ThreadRun (main_thread);
|
|
|
|
|
|
2006-08-24 20:55:53 +02:00
|
|
|
|
// Notify debugger of VM's death
|
|
|
|
|
if (gnu::classpath::jdwp::Jdwp::isDebugging)
|
|
|
|
|
{
|
|
|
|
|
using namespace gnu::classpath::jdwp;
|
|
|
|
|
event::VmDeathEvent *event = new event::VmDeathEvent ();
|
|
|
|
|
Jdwp::notify (event);
|
|
|
|
|
}
|
|
|
|
|
|
2006-01-06 02:03:45 +01:00
|
|
|
|
// If we got here then something went wrong, as MainThread is not
|
|
|
|
|
// supposed to terminate.
|
|
|
|
|
::exit (1);
|
2001-08-26 13:30:09 +02:00
|
|
|
|
}
|
2000-09-13 08:36:25 +02:00
|
|
|
|
|
2005-04-02 04:26:51 +02:00
|
|
|
|
void
|
|
|
|
|
_Jv_RunMain (jclass klass, const char *name, int argc, const char **argv,
|
|
|
|
|
bool is_jar)
|
|
|
|
|
{
|
|
|
|
|
_Jv_RunMain (NULL, klass, name, argc, argv, is_jar);
|
|
|
|
|
}
|
|
|
|
|
|
2001-08-26 13:30:09 +02:00
|
|
|
|
void
|
|
|
|
|
JvRunMain (jclass klass, int argc, const char **argv)
|
|
|
|
|
{
|
|
|
|
|
_Jv_RunMain (klass, NULL, argc, argv, false);
|
1999-04-07 16:42:40 +02:00
|
|
|
|
}
|
|
|
|
|
|
1999-10-22 21:43:41 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Parse a string and return a heap size.
|
|
|
|
|
static size_t
|
2005-11-17 21:25:57 +01:00
|
|
|
|
parse_memory_size (const char *spec)
|
1999-10-22 21:43:41 +02:00
|
|
|
|
{
|
|
|
|
|
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)
|
|
|
|
|
{
|
2005-11-17 21:25:57 +01:00
|
|
|
|
size_t size = parse_memory_size (arg);
|
1999-10-22 21:43:41 +02:00
|
|
|
|
_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)
|
|
|
|
|
{
|
2005-11-17 21:25:57 +01:00
|
|
|
|
size_t size = parse_memory_size (arg);
|
1999-10-22 21:43:41 +02:00
|
|
|
|
_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
|
|
|
|
|
2005-11-17 21:25:57 +01:00
|
|
|
|
void
|
|
|
|
|
_Jv_SetStackSize (const char *arg)
|
|
|
|
|
{
|
|
|
|
|
size_t size = parse_memory_size (arg);
|
|
|
|
|
gcj::stack_size = size;
|
|
|
|
|
}
|
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-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (size == 0, false))
|
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-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (ptr == NULL, false))
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw no_memory;
|
resolve.cc (_Jv_SearchMethodInClass): New function.
2000-03-07 Bryce McKinlay <bryce@albatross.co.nz>
* resolve.cc (_Jv_SearchMethodInClass): New function.
(_Jv_ResolvePoolEntry): Search superinterfaces for interface
methods.
* java/lang/Class.h (_Jv_SearchMethodInClass): New prototype.
2000-03-07 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/Class.h (union _Jv_IDispatchTable): New declaration.
(struct _Jv_ifaces): New declaration.
JV_CLASS: New macro definition.
(getComponentType): Relocate below isArray() for inlining.
(getModifiers): Declare `inline'.
(getSuperclass): Ditto.
(isArray): Ditto.
(isPrimitive): Ditto.
(_Jv_IsAssignableFrom): New prototype.
(_Jv_LookupInterfaceMethodIdx): New prototype. Predeclare with "C"
linkage.
(_Jv_InitClass): Move from natClass.cc. Declare `inline'.
Check for JV_STATE_DONE before invoking initializeClass().
(_Jv_PrepareConstantTimeTables): New prototype.
(_Jv_GetInterfaces): Ditto.
(_Jv_GenerateITable): Ditto.
(_Jv_GetMethodString): Ditto.
(_Jv_AppendPartialITable): Ditto.
(_Jv_FindIIndex): Ditto.
depth, ancestors, idt: New class fields.
* java/lang/natClass.cc (isAssignableFrom): Move functionality to
inline function `_Jv_IsAssignableFrom'. Use that function.
(isInstance): Declare `inline'.
(initializeClass): Get lock on class before checking `state'. Unlock
before calling resolveClass0. Call _Jv_PrepareConstantTimeTables
with the lock held.
(_Jv_LookupInterfaceMethod): Use _Jv_GetMessageString.
(_Jv_IsAssignableFrom): New inline function. Test assignability
using class->depth and ancestor table.
(_Jv_IsInstanceOf): Use _Jv_IsAssignableFrom.
(_Jv_CheckCast): Move from prims.cc. Use JV_CLASS and
_Jv_IsAssignableFrom.
(_Jv_CheckArrayStore): Ditto.
(_Jv_LookupInterfaceMethodIdx): New function.
INITIAL_IOFFSETS_LEN, INITIAL_IFACES_LEN: New #defines.
(_Jv_PrepareConstantTimeTables): New function.
(_Jv_IndexOf): Ditto.
(_Jv_GetInterfaces): Ditto.
(_Jv_GenerateITable): Ditto.
(_Jv_GetMethodString): Ditto.
(_Jv_AppendPartialITable): Ditto.
iindex_mutex, iindex_mutex_initialized: New static fields.
(_Jv_FindIIndex): New function.
* java/lang/natClassLoader.cc (_Jv_NewClass): Set new jclass fields.
* prims.cc (_Jv_CheckCast): Moved to natClass.cc.
(_Jv_CheckArrayStore): Ditto.
(JvNewCharArray, JvNewBooleanArray, JvNewByteArray, JvNewShortArray,
JvNewIntArray, JvNewLongArray, JvNewFloatArray, JvNewDoubleArray):
Moved to gcj/array.h.
(_Jv_Realloc): New function.
* gcj/cni.h: Move _Jv_PrimClass definitions to gcj/array.h.
* gcj/array.h: _Jv_PrimClass definitions moved from gcj/cni.h.
(JvNewCharArray, JvNewBooleanArray, JvNewByteArray,
JvNewShortArray, JvNewIntArray, JvNewLongArray, JvNewFloatArray,
JvNewDoubleArray): Implementations moved from prims.cc and
declared `inline'.
* gcj/javaprims.h (_Jv_Realloc): Prototype.
* include/jvm.h (_Jv_LookupInterfaceMethodIdx): Prototype.
From-SVN: r32382
2000-03-07 10:52:56 +01:00
|
|
|
|
return 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-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (size == 0, false))
|
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-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (ptr == NULL, false))
|
exception.cc (java_eh_info): Make value type jthrowable.
* exception.cc (java_eh_info): Make value type jthrowable.
(_Jv_type_matcher): Remove now unneeded cast.
(_Jv_Throw): Make argument type jthrowable. Munge name
for SJLJ_EXCEPTIONS here ...
* gcj/cni.h: ... not here.
(JvThrow): Remove.
* gcj/javaprims.h (_Jv_Throw, _Jv_Sjlj_Throw): Update declarations.
* defineclass.cc, interpret.cc, jni.cc, posix-threads.cc,
prims.cc, resolve.cc, gnu/gcj/runtime/natFirstThread.cc,
gnu/gcj/xlib/natDrawable.cc, gnu/gcj/xlib/natFont.cc,
gnu/gcj/xlib/natWMSizeHints.cc, gnu/gcj/xlib/natWindowAttributes.cc,
gnu/gcj/xlib/natXImage.cc, java/io/natFile.cc,
java/io/natFileDescriptorEcos.cc, java/io/natFileDescriptorPosix.cc,
java/io/natFileDescriptorWin32.cc, java/io/natFileWin32.cc,
java/lang/natClass.cc, java/lang/natClassLoader.cc,
java/lang/natDouble.cc, java/lang/natObject.cc,
java/lang/natPosixProcess.cc, java/lang/natRuntime.cc,
java/lang/natString.cc, java/lang/natSystem.cc,
java/lang/natThread.cc, java/lang/reflect/natArray.cc,
java/lang/reflect/natConstructor.cc, java/lang/reflect/natField.cc,
java/lang/reflect/natMethod.cc, java/util/zip/natDeflater.cc,
java/util/zip/natInflater.cc:
Use throw, not JvThrow or _Jv_Throw.
From-SVN: r40838
2001-03-26 09:05:32 +02:00
|
|
|
|
throw no_memory;
|
1999-04-07 16:42:40 +02:00
|
|
|
|
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-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (size == 0, false))
|
resolve.cc (_Jv_SearchMethodInClass): New function.
2000-03-07 Bryce McKinlay <bryce@albatross.co.nz>
* resolve.cc (_Jv_SearchMethodInClass): New function.
(_Jv_ResolvePoolEntry): Search superinterfaces for interface
methods.
* java/lang/Class.h (_Jv_SearchMethodInClass): New prototype.
2000-03-07 Bryce McKinlay <bryce@albatross.co.nz>
* java/lang/Class.h (union _Jv_IDispatchTable): New declaration.
(struct _Jv_ifaces): New declaration.
JV_CLASS: New macro definition.
(getComponentType): Relocate below isArray() for inlining.
(getModifiers): Declare `inline'.
(getSuperclass): Ditto.
(isArray): Ditto.
(isPrimitive): Ditto.
(_Jv_IsAssignableFrom): New prototype.
(_Jv_LookupInterfaceMethodIdx): New prototype. Predeclare with "C"
linkage.
(_Jv_InitClass): Move from natClass.cc. Declare `inline'.
Check for JV_STATE_DONE before invoking initializeClass().
(_Jv_PrepareConstantTimeTables): New prototype.
(_Jv_GetInterfaces): Ditto.
(_Jv_GenerateITable): Ditto.
(_Jv_GetMethodString): Ditto.
(_Jv_AppendPartialITable): Ditto.
(_Jv_FindIIndex): Ditto.
depth, ancestors, idt: New class fields.
* java/lang/natClass.cc (isAssignableFrom): Move functionality to
inline function `_Jv_IsAssignableFrom'. Use that function.
(isInstance): Declare `inline'.
(initializeClass): Get lock on class before checking `state'. Unlock
before calling resolveClass0. Call _Jv_PrepareConstantTimeTables
with the lock held.
(_Jv_LookupInterfaceMethod): Use _Jv_GetMessageString.
(_Jv_IsAssignableFrom): New inline function. Test assignability
using class->depth and ancestor table.
(_Jv_IsInstanceOf): Use _Jv_IsAssignableFrom.
(_Jv_CheckCast): Move from prims.cc. Use JV_CLASS and
_Jv_IsAssignableFrom.
(_Jv_CheckArrayStore): Ditto.
(_Jv_LookupInterfaceMethodIdx): New function.
INITIAL_IOFFSETS_LEN, INITIAL_IFACES_LEN: New #defines.
(_Jv_PrepareConstantTimeTables): New function.
(_Jv_IndexOf): Ditto.
(_Jv_GetInterfaces): Ditto.
(_Jv_GenerateITable): Ditto.
(_Jv_GetMethodString): Ditto.
(_Jv_AppendPartialITable): Ditto.
iindex_mutex, iindex_mutex_initialized: New static fields.
(_Jv_FindIIndex): New function.
* java/lang/natClassLoader.cc (_Jv_NewClass): Set new jclass fields.
* prims.cc (_Jv_CheckCast): Moved to natClass.cc.
(_Jv_CheckArrayStore): Ditto.
(JvNewCharArray, JvNewBooleanArray, JvNewByteArray, JvNewShortArray,
JvNewIntArray, JvNewLongArray, JvNewFloatArray, JvNewDoubleArray):
Moved to gcj/array.h.
(_Jv_Realloc): New function.
* gcj/cni.h: Move _Jv_PrimClass definitions to gcj/array.h.
* gcj/array.h: _Jv_PrimClass definitions moved from gcj/cni.h.
(JvNewCharArray, JvNewBooleanArray, JvNewByteArray,
JvNewShortArray, JvNewIntArray, JvNewLongArray, JvNewFloatArray,
JvNewDoubleArray): Implementations moved from prims.cc and
declared `inline'.
* gcj/javaprims.h (_Jv_Realloc): Prototype.
* include/jvm.h (_Jv_LookupInterfaceMethodIdx): Prototype.
From-SVN: r32382
2000-03-07 10:52:56 +01:00
|
|
|
|
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-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (divisor == 0, false))
|
2003-06-13 14:20:45 +02:00
|
|
|
|
{
|
|
|
|
|
java::lang::ArithmeticException *arithexception
|
|
|
|
|
= new java::lang::ArithmeticException (JvNewStringLatin1 ("/ by zero"));
|
|
|
|
|
throw arithexception;
|
|
|
|
|
}
|
1999-07-21 17:11:56 +02:00
|
|
|
|
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
|
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-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (divisor == 0, false))
|
2003-06-13 14:20:45 +02:00
|
|
|
|
{
|
|
|
|
|
java::lang::ArithmeticException *arithexception
|
|
|
|
|
= new java::lang::ArithmeticException (JvNewStringLatin1 ("/ by zero"));
|
|
|
|
|
throw arithexception;
|
|
|
|
|
}
|
1999-07-21 17:11:56 +02:00
|
|
|
|
|
[multiple changes]
1999-08-09 Anthony Green <green@cygnus.com>
* gij.cc: New file.
* include/config.h.in: Rebuilt.
* acconfig.h: Add INTERPRETER.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
* Makefile.am (libffi_files): Identify the libffi object files for
inclusion in libgcj.
(LIBFFIINCS): Define.
* interpret.cc (gnu::gcj::runtime::MethodInvocation::continue1):
Dummy definition for configurations without an interpreter.
* java/net/natPlainSocketImpl.cc (getOption): Disamiguate call to
java::lang::Boolean constructor.
* include/java-interp.h: Always include java-cpool.h.
* java/lang/natClassLoader.cc (getVMClassLoader0): Always return 0
when INTERPRETER not defined.
* java/lang/Class.h (finalize): Define.
* gnu/gcj/util/path/DirectoryPathEntry.java (getURL): Catch
IOException from File.getCanonicalPath.
(getStream): Likewise.
* NEWS: More news.
* THANKS: More thanks.
1999-08-09 Kresten Krab Thorup <krab@gnu.org>
* resolve.cc (get_ffi_type_from_signature): Generate uint16 for
jchar type.
(_Jv_PrepareClass): Allow non-abstract classes to
have abstract subclasses.
(_Jv_ResolvePoolEntry): Revert subclass check for protected
fields and methods.
* interpret.cc (continue1/perform_invoke): Don't sign extend
uint16 return val.
(continue1/lshl,lshr): Push long, not int.
(continue1/ulshr): Use UINT64, not long long.
* defineclass.cc (handleFieldsEnd): Handle case when all fields
are static.
* java/lang/natClass.cc (forName): Add call to _Jv_InitClass.
* java/lang/FirstThread.java (run): Add top-level exception
handler.
(run0): Renamed from run.
1999-08-08 Kresten Krab Thorup <krab@gnu.org>
* configure.in (--with-interpreter): Added.
* include/config.h.in (INTERPRETER): Added.
* java/lang/ClassLoader.java: File replaced.
* java/lang/VMClassLoader.java: New file.
* java/lang/natClassLoader.cc: New file.
* gnu/gcj/runtime/MethodInvocation.java: New file.
* gnu/gcj/util/path/SearchPath.java: New file.
* gnu/gcj/util/path/PathEntry.java: New file.
* gnu/gcj/util/path/DirectoryPathEntry.java: New file.
* gnu/gcj/util/path/ZipPathEntry.java: New file.
* gnu/gcj/util/path/URLPathEntry.java: New file.
* gnu/gcj/util/path/CacheEntry.java: New file.
* include/java-interp.h: New file.
* include/java-cpool.h: New file.
* include/java-insns.h: New file.
* defineclass.cc: New file.
* interpret.cc: New file.
* resolve.cc: New file.
* java/lang/natClass.cc (loaded_classes, _Jv_RegisterClass,
_Jv_RegisterClasses, _Jv_FindClassInCache, _Jv_FindClass,
_Jv_NewClass, _Jv_FindArrayClass): Moved to natClassLoader.cc.
(finalize): New.
(STATE_NOTHING, STATE_RESOLVED, STATE_IN_PROGRESS, STATE_DONE,
STATE_ERROR): Moved to java/lang/Class.h and renamed with JV_
prefix.
(initializeClass): Use new JV_ prefixed names. Also, call
ClassLoader::resolveClass instead of _Jv_ResolveClass.
* java/lang/Class.h (JV_STATE_PRELOADING, JV_STATE_LOADING,
JV_STATE_LOADED, JV_STATE_COMPILED, JV_STATE_PREPARED,
JV_STATE_LINKED): New.
(_Jv_WaitForState, _Jv_RegisterInitiatingLoader,
_Jv_UnregisterClass, _Jv_InternClassStrings): New friends.
(_Jv_IsInterpretedClass, _Jv_InitField, _Jv_LookupDeclaredMethod,
_Jv_DetermineVTableIndex, _Jv_ResolvePoolEntry, _Jv_PrepareClass,
_Jv_ClassReader, _Jv_InterpClass, _Jv_InterpMethod,
_Jv_InterpMethodInvocation): New friends for interpreter.
(finalize): New.
(CONSTANT_Class, CONSTANT_String, etc.): Moved to
include/java-cpool.h and renamed with JV_ prefix.
* include/jvm.h (_Jv_makeUtf8Const, _Jv_makeUtf8TypeConst): New
decls.
(_Jv_UnregisterClass): New decl.
* java/lang/natClassLoader.cc (_Jv_FindArrayClass): Added
class loader argument.
(_Jv_FindClass): Use class loader.
* prims.cc (_Jv_makeUtf8Const): New function.
(_Jv_NewObjectArray): Change use of _Jv_FindArrayClass.
(_Jv_NewPrimArray): Ditto.
(_Jv_FindClassFromSignature): Ditto.
* java/lang/reflect/natArray.cc (newInstance): Ditto.
* java/lang/reflect/natMethod.cc (getType): Ditto.
* include/java-field.h (_Jv_Field::isRef): Make robust for
non-resolved contexts.
* boehm.cc (_Jv_MarkObj): Mark interpreter-related fields.
Also, don't mark class->next field.
* java/lang/VirtualMachineError.java: Added FIXME note.
* configure.in (INTERPSPEC): New spec.
* libgcj.spec.in: Added INTERPSPEC.
* Makefile.am: Added gcjh friends for java/lang/VMClassLoader and
gnu/gcj/runtime/MethodInvocation.
(libgcj_la_SOURCES): Added resolve.cc defineclass.cc interpret.cc.
(ordinary_java_source_files): Added above mentioned java classes.
* configure: Rebuilt.
* Makefile.in: Rebuilt.
From-SVN: r28597
1999-08-08 16:06:23 +02:00
|
|
|
|
if (dividend == (jint) 0x80000000L && divisor == -1)
|
1999-07-21 17:11:56 +02:00
|
|
|
|
return 0;
|
2003-06-13 14:20:45 +02:00
|
|
|
|
|
1999-07-21 17:11:56 +02:00
|
|
|
|
return dividend % divisor;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
jlong
|
|
|
|
|
_Jv_divJ (jlong dividend, jlong divisor)
|
|
|
|
|
{
|
2000-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (divisor == 0, false))
|
2003-06-13 14:20:45 +02:00
|
|
|
|
{
|
|
|
|
|
java::lang::ArithmeticException *arithexception
|
|
|
|
|
= new java::lang::ArithmeticException (JvNewStringLatin1 ("/ by zero"));
|
|
|
|
|
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-05-05 04:56:14 +02:00
|
|
|
|
if (__builtin_expect (divisor == 0, false))
|
2003-06-13 14:20:45 +02:00
|
|
|
|
{
|
|
|
|
|
java::lang::ArithmeticException *arithexception
|
|
|
|
|
= new java::lang::ArithmeticException (JvNewStringLatin1 ("/ by zero"));
|
|
|
|
|
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;
|
|
|
|
|
}
|
2003-07-21 03:54:06 +02:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Return true if SELF_KLASS can access a field or method in
|
|
|
|
|
// OTHER_KLASS. The field or method's access flags are specified in
|
|
|
|
|
// FLAGS.
|
|
|
|
|
jboolean
|
|
|
|
|
_Jv_CheckAccess (jclass self_klass, jclass other_klass, jint flags)
|
|
|
|
|
{
|
|
|
|
|
using namespace java::lang::reflect;
|
|
|
|
|
return ((self_klass == other_klass)
|
|
|
|
|
|| ((flags & Modifier::PUBLIC) != 0)
|
|
|
|
|
|| (((flags & Modifier::PROTECTED) != 0)
|
2005-09-06 18:01:31 +02:00
|
|
|
|
&& _Jv_IsAssignableFromSlow (self_klass, other_klass))
|
2003-07-21 03:54:06 +02:00
|
|
|
|
|| (((flags & Modifier::PRIVATE) == 0)
|
|
|
|
|
&& _Jv_ClassNameSamePackage (self_klass->name,
|
|
|
|
|
other_klass->name)));
|
|
|
|
|
}
|
2006-05-30 23:38:51 +02:00
|
|
|
|
|
|
|
|
|
// Prepend GCJ_VERSIONED_LIBDIR to a module search path stored in a C
|
|
|
|
|
// char array, if the path is not already prefixed by
|
|
|
|
|
// GCJ_VERSIONED_LIBDIR. Return a newly JvMalloc'd char buffer. The
|
|
|
|
|
// result should be freed using JvFree.
|
|
|
|
|
char*
|
|
|
|
|
_Jv_PrependVersionedLibdir (char* libpath)
|
|
|
|
|
{
|
|
|
|
|
char* retval = 0;
|
|
|
|
|
|
|
|
|
|
if (libpath && libpath[0] != '\0')
|
|
|
|
|
{
|
|
|
|
|
if (! strncmp (libpath,
|
|
|
|
|
GCJ_VERSIONED_LIBDIR,
|
|
|
|
|
sizeof (GCJ_VERSIONED_LIBDIR) - 1))
|
|
|
|
|
{
|
|
|
|
|
// LD_LIBRARY_PATH is already prefixed with
|
|
|
|
|
// GCJ_VERSIONED_LIBDIR.
|
|
|
|
|
retval = (char*) _Jv_Malloc (strlen (libpath) + 1);
|
|
|
|
|
strcpy (retval, libpath);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// LD_LIBRARY_PATH is not prefixed with
|
|
|
|
|
// GCJ_VERSIONED_LIBDIR.
|
|
|
|
|
jsize total = (sizeof (GCJ_VERSIONED_LIBDIR) - 1)
|
|
|
|
|
+ (sizeof (PATH_SEPARATOR) - 1) + strlen (libpath) + 1;
|
|
|
|
|
retval = (char*) _Jv_Malloc (total);
|
|
|
|
|
strcpy (retval, GCJ_VERSIONED_LIBDIR);
|
|
|
|
|
strcat (retval, PATH_SEPARATOR);
|
|
|
|
|
strcat (retval, libpath);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
// LD_LIBRARY_PATH was not specified or is empty.
|
|
|
|
|
retval = (char*) _Jv_Malloc (sizeof (GCJ_VERSIONED_LIBDIR));
|
|
|
|
|
strcpy (retval, GCJ_VERSIONED_LIBDIR);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return retval;
|
|
|
|
|
}
|