// prims.cc - Code for core of runtime environment.
-/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation
+/* Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
This file is part of libgcj.
#include <java/lang/ThreadGroup.h>
#endif
+#include <jvmti.h>
+#include "jvmti-int.h"
+
#ifndef DISABLE_GETENV_PROPERTIES
#include <ctype.h>
#include <java-props.h>
#include <java/lang/ArrayIndexOutOfBoundsException.h>
#include <java/lang/ArithmeticException.h>
#include <java/lang/ClassFormatError.h>
+#include <java/lang/ClassNotFoundException.h>
#include <java/lang/InternalError.h>
#include <java/lang/NegativeArraySizeException.h>
+#include <java/lang/NoClassDefFoundError.h>
#include <java/lang/NullPointerException.h>
#include <java/lang/OutOfMemoryError.h>
#include <java/lang/System.h>
-#include <java/lang/VMThrowable.h>
#include <java/lang/VMClassLoader.h>
#include <java/lang/reflect/Modifier.h>
#include <java/io/PrintStream.h>
#include <java/lang/UnsatisfiedLinkError.h>
#include <java/lang/VirtualMachineError.h>
-#include <gnu/gcj/runtime/VMClassLoader.h>
+#include <gnu/gcj/runtime/ExtensionClassLoader.h>
#include <gnu/gcj/runtime/FinalizerThread.h>
#include <execution.h>
+#include <gnu/classpath/jdwp/Jdwp.h>
+#include <gnu/classpath/jdwp/VMVirtualMachine.h>
#include <gnu/java/lang/MainThread.h>
#ifdef USE_LTDL
// Execution engine for compiled code.
_Jv_CompiledEngine _Jv_soleCompiledEngine;
+// Execution engine for code compiled with -findirect-classes
+_Jv_IndirectCompiledEngine _Jv_soleIndirectCompiledEngine;
+
// We allocate a single OutOfMemoryError exception which we keep
// around for use if we run out of memory.
static java::lang::OutOfMemoryError *no_memory;
// 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)
+#define MAX_OBJECT_SIZE (((size_t)1<<31) - 1)
// Properties set at compile time.
const char **_Jv_Compiler_Properties = NULL;
int _Jv_Properties_Count = 0;
-// The JAR file to add to the beginning of java.class.path.
-const char *_Jv_Jar_Class_Path;
-
#ifndef DISABLE_GETENV_PROPERTIES
// Property key/value pairs.
property_pair *_Jv_Environment_Properties;
const char **_Jv_argv;
int _Jv_argc;
+// Debugging options
+static bool remoteDebug = false;
+static char defaultJdwpOptions[] = "";
+static char *jdwpOptions = defaultJdwpOptions;
+
+// Typedefs for JVMTI agent functions.
+typedef jint jvmti_agent_onload_func (JavaVM *vm, char *options,
+ void *reserved);
+typedef jint jvmti_agent_onunload_func (JavaVM *vm);
+
+// JVMTI agent function pointers.
+static jvmti_agent_onload_func *jvmti_agentonload = NULL;
+static jvmti_agent_onunload_func *jvmti_agentonunload = NULL;
+static char *jvmti_agent_opts;
+
// Argument support.
int
_Jv_GetNbArgs (void)
}
#endif
-\f
jboolean
_Jv_equalUtf8Consts (const Utf8Const* a, const Utf8Const *b)
return true;
}
+// 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);
+}
+
/* Count the number of Unicode chars encoded in a given Ut8 string. */
int
-_Jv_strLengthUtf8(char* str, int len)
+_Jv_strLengthUtf8(const char* str, int len)
{
unsigned char* ptr;
unsigned char* limit;
* This returns the same hash value as specified or java.lang.String.hashCode.
*/
jint
-_Jv_hashUtf8String (char* str, int len)
+_Jv_hashUtf8String (const char* str, int len)
{
unsigned char* ptr = (unsigned char*) str;
unsigned char* limit = ptr + len;
}
void
-_Jv_Utf8Const::init(char *s, int len)
+_Jv_Utf8Const::init(const char *s, int len)
{
::memcpy (data, s, len);
data[len] = 0;
}
_Jv_Utf8Const *
-_Jv_makeUtf8Const (char* s, int len)
+_Jv_makeUtf8Const (const char* s, int len)
{
if (len < 0)
len = strlen (s);
#else
fprintf (stderr, "libgcj failure: %s\n", message);
#endif
+ fflush (stderr);
abort ();
}
throw new java::lang::NullPointerException;
}
+// 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;
+}
+
+
// Explicitly throw a no memory exception.
// The collector calls this when it encounters an out-of-memory condition.
void _Jv_ThrowNoMemory()
jobject
_Jv_AllocObjectNoFinalizer (jclass klass)
{
+ if (_Jv_IsPhantomClass(klass) )
+ throw new java::lang::NoClassDefFoundError(klass->getName());
+
_Jv_InitClass (klass);
jint size = klass->size ();
jobject obj = (jobject) _Jv_AllocObj (size, klass);
jobjectArray
_Jv_NewObjectArray (jsize count, jclass elementClass, jobject init)
{
+ // 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());
+
if (__builtin_expect (count < 0, false))
throw new java::lang::NegativeArraySizeException;
jobject
_Jv_NewMultiArray (jclass array_type, jint dimensions, ...)
{
+ // 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());
+
va_list args;
jint sizes[dimensions];
va_start (args, dimensions);
DECLARE_PRIM_TYPE(void)
void
-_Jv_InitPrimClass (jclass cl, char *cname, char sig, int len)
+_Jv_InitPrimClass (jclass cl, const char *cname, char sig, int len)
{
using namespace java::lang::reflect;
}
jclass
-_Jv_FindClassFromSignature (char *sig, java::lang::ClassLoader *loader)
+_Jv_FindClassFromSignature (char *sig, java::lang::ClassLoader *loader,
+ char **endp)
{
+ // First count arrays.
+ int array_count = 0;
+ while (*sig == '[')
+ {
+ ++sig;
+ ++array_count;
+ }
+
+ jclass result = NULL;
switch (*sig)
{
case 'B':
- return JvPrimClass (byte);
+ result = JvPrimClass (byte);
+ break;
case 'S':
- return JvPrimClass (short);
+ result = JvPrimClass (short);
+ break;
case 'I':
- return JvPrimClass (int);
+ result = JvPrimClass (int);
+ break;
case 'J':
- return JvPrimClass (long);
+ result = JvPrimClass (long);
+ break;
case 'Z':
- return JvPrimClass (boolean);
+ result = JvPrimClass (boolean);
+ break;
case 'C':
- return JvPrimClass (char);
+ result = JvPrimClass (char);
+ break;
case 'F':
- return JvPrimClass (float);
+ result = JvPrimClass (float);
+ break;
case 'D':
- return JvPrimClass (double);
+ result = JvPrimClass (double);
+ break;
case 'V':
- return JvPrimClass (void);
+ result = JvPrimClass (void);
+ break;
case 'L':
{
- int i;
- for (i = 1; sig[i] && sig[i] != ';'; ++i)
- ;
- _Jv_Utf8Const *name = _Jv_makeUtf8Const (&sig[1], i - 1);
- return _Jv_FindClass (name, loader);
- }
- case '[':
- {
- jclass klass = _Jv_FindClassFromSignature (&sig[1], loader);
- if (! klass)
- return NULL;
- return _Jv_GetArrayClass (klass, loader);
+ 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;
}
+ default:
+ // Do nothing -- bad signature.
+ break;
+ }
+
+ if (endp)
+ {
+ // Not really the "end", but the last valid character that we
+ // looked at.
+ *endp = sig;
}
- return NULL; // Placate compiler.
+ if (! result)
+ return NULL;
+
+ // Find arrays.
+ while (array_count-- > 0)
+ result = _Jv_GetArrayClass (result, loader);
+ return result;
}
-\f
+
+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;
+}
JArray<jstring> *
JvConvertArgv (int argc, const char **argv)
while (isspace (*s))
s++;
- // If we've reached the end, return NULL.
- if (*s == 0)
- return NULL;
-
// Determine the length of the property value.
while (s[l] != 0
&& ! isspace (s[l])
process_gcj_properties ()
{
char *props = getenv("GCJ_PROPERTIES");
- char *p = props;
- size_t length;
- size_t property_count = 0;
if (NULL == props)
return;
+ // 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;
+
// Whip through props quickly in order to count the number of
// property values.
while (p && (p = next_property_key (p, &length)))
_Jv_Utf8Const *finit_name;
bool runtimeInitialized = false;
+
+ // 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;
+
+ // Thread stack size specified by the -Xss runtime argument.
+ size_t stack_size = 0;
+
+ // Start time of the VM
+ jlong startTime = 0;
+
+ // Arguments passed to the VM
+ JArray<jstring>* vmArgs;
+
+ // Currently loaded classes
+ jint loadedClasses = 0;
+
+ // Unloaded classes
+ jlong unloadedClasses = 0;
+}
+
+// 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"))
+ {
+ 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;
+ }
+ }
+ 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))
+ {
+ _Jv_SetStackSize (option_string + 2);
+ }
+ 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;
}
static jint
parse_verbose_args (char* option_string,
- bool ignore_unrecognized)
+ bool ignore_unrecognized)
{
- size_t len = sizeof ("-verbose");
+ size_t len = sizeof ("-verbose") - 1;
if (strlen (option_string) < len)
return -1;
&& option_string[len + 1] != '\0')
{
char* verbose_args = option_string + len + 1;
- size_t last = 0;
do
{
if (! strncmp (verbose_args,
- "gc", (last = sizeof ("gc")) - 1)
- && (verbose_args[last] == '\0'
- || verbose_args[last] == ','))
- {
- // FIXME: we should add functions to boehm-gc that
- // toggle GC_print_stats, GC_PRINT_ADDRESS_MAP and
- // GC_print_back_height.
-
- }
+ "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;
+ }
+ }
else if (! strncmp (verbose_args,
"class",
- (last = sizeof ("class")) - 1)
- && (verbose_args[last] == '\0'
- || verbose_args[last] == ','))
- {
- gcj::verbose_class_flag = true;
- }
+ 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;
+ }
else if (! strncmp (verbose_args, "jni",
- (last = sizeof ("jni")) - 1)
- && (verbose_args[last] == '\0'
- || verbose_args[last] == ','))
- {
- // FIXME: enable JNI messages.
- }
+ 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;
+ }
else if (ignore_unrecognized
&& verbose_args[0] == 'X')
{
// ignore unrecognized non-standard verbose option
- last = 0;
- while (verbose_args[last] != '\0'
- && verbose_args[last++] != ',');
+ while (verbose_args[0] != '\0'
+ && verbose_args[0] != ',')
+ verbose_args++;
}
-
- if (strlen (verbose_args) >= last)
- {
- if (verbose_args[last] == ',')
- {
- if (verbose_args[last + 1] == '\0')
- // trailing comma
- return -1;
- else
- {
- verbose_args = verbose_args + last + 1;
- last = 0;
- }
- }
- // here verbose_args[last] is either '\0' or
- // the first character in the next verbose
- // argument.
- }
- else
- // partial option
- return -1;
-
- // verbose_args[last] will be '\0' here if we're
- // done.
+ else if (verbose_args[0] == ',')
+ {
+ verbose_args++;
+ }
+ else
+ goto verbose_arg_err;
+
+ if (verbose_args[0] == ',')
+ verbose_args++;
}
- while (verbose_args[last] != '\0');
+ while (verbose_args[0] != '\0');
}
else if (option_string[len] == 'g'
&& option_string[len + 1] == 'c'
return 0;
}
+// This function loads the agent functions for JVMTI from the library indicated
+// by name. It returns a negative value on failure, the value of which
+// indicates where ltdl failed, it also prints an error message.
+static jint
+load_jvmti_agent (const char *name)
+{
+#ifdef USE_LTDL
+ if (lt_dlinit ())
+ {
+ fprintf (stderr,
+ "libgcj: Error in ltdl init while loading agent library.\n");
+ return -1;
+ }
+
+ lt_dlhandle lib = lt_dlopenext (name);
+ if (!lib)
+ {
+ fprintf (stderr,
+ "libgcj: Error opening agent library.\n");
+ return -2;
+ }
+
+ if (lib)
+ {
+ jvmti_agentonload
+ = (jvmti_agent_onload_func *) lt_dlsym (lib, "Agent_OnLoad");
+
+ if (!jvmti_agentonload)
+ {
+ fprintf (stderr,
+ "libgcj: Error finding agent function in library %s.\n",
+ name);
+ lt_dlclose (lib);
+ lib = NULL;
+ return -4;
+ }
+ else
+ {
+ jvmti_agentonunload
+ = (jvmti_agent_onunload_func *) lt_dlsym (lib, "Agent_OnUnload");
+
+ return 0;
+ }
+ }
+ else
+ {
+ fprintf (stderr, "libgcj: Library %s not found in library path.\n", name);
+ return -3;
+ }
+
+#endif /* USE_LTDL */
+
+ // If LTDL cannot be used, return an error code indicating this.
+ return -99;
+}
+
static jint
parse_init_args (JvVMInitArgs* vm_args)
{
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"))
"-verbose", sizeof ("-verbose") - 1))
{
jint result = parse_verbose_args (option_string,
- vm_args->ignoreUnrecognized);
+ vm_args->ignoreUnrecognized);
if (result < 0)
return result;
}
continue;
}
- else if (vm_args->ignoreUnrecognized)
+ else if (! strncmp (option_string, "-agentlib", sizeof ("-agentlib") - 1))
+ {
+ char *strPtr;
+
+ if (strlen(option_string) > (sizeof ("-agentlib:") - 1))
+ strPtr = &option_string[sizeof ("-agentlib:") - 1];
+ else
+ {
+ fprintf (stderr,
+ "libgcj: Malformed agentlib argument %s: expected lib name\n",
+ option_string);
+ return -1;
+ }
+
+ // These are optional arguments to pass to the agent library.
+ jvmti_agent_opts = strchr (strPtr, '=');
+
+ if (! strncmp (strPtr, "jdwp", 4))
+ {
+ // We want to run JDWP here so set the correct variables.
+ remoteDebug = true;
+ jdwpOptions = ++jvmti_agent_opts;
+ }
+ else
+ {
+ jint nameLength;
+
+ if (jvmti_agent_opts == NULL)
+ nameLength = strlen (strPtr);
+ else
+ {
+ nameLength = jvmti_agent_opts - strPtr;
+ jvmti_agent_opts++;
+ }
+
+ char lib_name[nameLength + 3 + 1];
+ strcpy (lib_name, "lib");
+ strncat (lib_name, strPtr, nameLength);
+
+ jint result = load_jvmti_agent (lib_name);
+
+ if (result < 0)
+ {
+ return -1;
+ }
+
+ // Mark JVMTI active
+ JVMTI::enabled = true;
+ }
+
+ continue;
+ }
+ else if (! strncmp (option_string, "-agentpath:",
+ sizeof ("-agentpath:") - 1))
{
- if (option_string[0] == '_'
- || ! strncmp (option_string, "-X", 2))
- continue;
+ char *strPtr;
+
+ if (strlen(option_string) > 10)
+ strPtr = &option_string[10];
+ else
+ {
+ fprintf (stderr,
+ "libgcj: Malformed agentlib argument %s: expected lib path\n",
+ option_string);
+ return -1;
+ }
+
+ // These are optional arguments to pass to the agent library.
+ jvmti_agent_opts = strchr (strPtr, '=');
+
+ jint nameLength;
+
+ if (jvmti_agent_opts == NULL)
+ nameLength = strlen (strPtr);
+ else
+ {
+ nameLength = jvmti_agent_opts - strPtr;
+ jvmti_agent_opts++;
+ }
+
+ char lib_name[nameLength + 3 + 1];
+ strcpy (lib_name, "lib");
+ strncat (lib_name, strPtr, nameLength);
+ jint result = load_jvmti_agent (strPtr);
+
+ if (result < 0)
+ {
+ return -1;
+ }
+
+ // Mark JVMTI active
+ JVMTI::enabled = true;
+ continue;
}
+ else if (vm_args->ignoreUnrecognized)
+ {
+ 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;
+ }
+ }
+ else
+ goto unknown_option;
}
return 0;
}
return -1;
runtimeInitialized = true;
+ startTime = _Jv_platform_gettimeofday();
jint result = parse_init_args (vm_args);
if (result < 0)
_Jv_InitPrimClass (&_Jv_doubleClass, "double", 'D', 8);
_Jv_InitPrimClass (&_Jv_voidClass, "void", 'V', 0);
- // Turn stack trace generation off while creating exception objects.
- _Jv_InitClass (&java::lang::VMThrowable::class$);
- java::lang::VMThrowable::trace_enabled = 0;
-
// 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
_Jv_InitClass (&java::lang::ClassLoader::class$);
// Set up the system class loader and the bootstrap class loader.
- gnu::gcj::runtime::VMClassLoader::initialize();
- java::lang::VMClassLoader::initBootLoader(JvNewStringLatin1(TOOLEXECLIBDIR));
+ gnu::gcj::runtime::ExtensionClassLoader::initialize();
+ java::lang::VMClassLoader::initialize(JvNewStringLatin1(TOOLEXECLIBDIR));
_Jv_RegisterBootstrapPackages();
no_memory = new java::lang::OutOfMemoryError;
- java::lang::VMThrowable::trace_enabled = 1;
-
#ifdef USE_LTDL
LTDL_SET_PRELOADED_SYMBOLS ();
#endif
_Jv_platform_initialize ();
_Jv_JNI_Init ();
+ _Jv_JVMTI_Init ();
_Jv_GCInitializeFinalizers (&::gnu::gcj::runtime::FinalizerThread::finalizerReady);
{
}
+ runtimeInitialized = true;
+
return 0;
}
void
-_Jv_RunMain (jclass klass, const char *name, int argc, const char **argv,
- bool is_jar)
+_Jv_RunMain (JvVMInitArgs *vm_args, jclass klass, const char *name, int argc,
+ const char **argv, bool is_jar)
{
#ifndef DISABLE_MAIN_ARGS
_Jv_SetArgs (argc, argv);
try
{
- // Set this very early so that it is seen when java.lang.System
- // is initialized.
- if (is_jar)
- _Jv_Jar_Class_Path = strdup (name);
-
- if (_Jv_CreateJavaVM (NULL) < 0)
+ if (_Jv_CreateJavaVM (vm_args) < 0)
{
fprintf (stderr, "libgcj: couldn't create virtual machine\n");
exit (1);
}
+
+ if (vm_args == NULL)
+ gcj::vmArgs = JvConvertArgv(0, NULL);
+ else
+ {
+ const char* vmArgs[vm_args->nOptions];
+ const char** vmPtr = vmArgs;
+ struct _Jv_VMOption* optionPtr = vm_args->options;
+ for (int i = 0; i < vm_args->nOptions; ++i)
+ *vmPtr++ = (*optionPtr++).optionString;
+ gcj::vmArgs = JvConvertArgv(vm_args->nOptions, vmArgs);
+ }
// 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.
if (klass)
main_thread = new MainThread (klass, arg_vec);
else
- main_thread = new MainThread (JvNewStringLatin1 (name),
+ main_thread = new MainThread (JvNewStringUTF (name),
arg_vec, is_jar);
+ _Jv_AttachCurrentThread (main_thread);
+
+ // Start JVMTI if an agent function has been found.
+ if (jvmti_agentonload)
+ (*jvmti_agentonload) (_Jv_GetJavaVM (), jvmti_agent_opts, NULL);
+
+ // 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
+ if (JVMTI_REQUESTED_EVENT (VMInit))
+ _Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_INIT, main_thread);
}
catch (java::lang::Throwable *t)
{
("Exception during runtime initialization"));
t->printStackTrace();
if (runtime)
- runtime->exit (1);
+ java::lang::Runtime::exitNoChecksAccessor (1);
// In case the runtime creation failed.
::exit (1);
}
- _Jv_AttachCurrentThread (main_thread);
_Jv_ThreadRun (main_thread);
- _Jv_ThreadWait ();
- int status = (int) java::lang::ThreadGroup::had_uncaught_exception;
- runtime->exit (status);
+ // Send VMDeath
+ if (JVMTI_REQUESTED_EVENT (VMDeath))
+ {
+ java::lang::Thread *thread = java::lang::Thread::currentThread ();
+ JNIEnv *jni_env = _Jv_GetCurrentJNIEnv ();
+ _Jv_JVMTI_PostEvent (JVMTI_EVENT_VM_DEATH, thread, jni_env);
+ }
+
+ // Run JVMTI AgentOnUnload if it exists and an agent is loaded.
+ if (jvmti_agentonunload)
+ (*jvmti_agentonunload) (_Jv_GetJavaVM ());
+
+ // If we got here then something went wrong, as MainThread is not
+ // supposed to terminate.
+ ::exit (1);
+}
+
+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);
}
void
_Jv_RunMain (klass, NULL, argc, argv, false);
}
+void
+JvRunMainName (const char *name, int argc, const char **argv)
+{
+ _Jv_RunMain (NULL, name, argc, argv, false);
+}
+
\f
// Parse a string and return a heap size.
static size_t
-parse_heap_size (const char *spec)
+parse_memory_size (const char *spec)
{
char *end;
unsigned long val = strtoul (spec, &end, 10);
void
_Jv_SetInitialHeapSize (const char *arg)
{
- size_t size = parse_heap_size (arg);
+ size_t size = parse_memory_size (arg);
_Jv_GCSetInitialHeapSize (size);
}
void
_Jv_SetMaximumHeapSize (const char *arg)
{
- size_t size = parse_heap_size (arg);
+ size_t size = parse_memory_size (arg);
_Jv_GCSetMaximumHeapSize (size);
}
-\f
+void
+_Jv_SetStackSize (const char *arg)
+{
+ size_t size = parse_memory_size (arg);
+ gcj::stack_size = size;
+}
void *
_Jv_Malloc (jsize size)
return ((self_klass == other_klass)
|| ((flags & Modifier::PUBLIC) != 0)
|| (((flags & Modifier::PROTECTED) != 0)
- && _Jv_IsAssignableFromSlow (other_klass, self_klass))
+ && _Jv_IsAssignableFromSlow (self_klass, other_klass))
|| (((flags & Modifier::PRIVATE) == 0)
&& _Jv_ClassNameSamePackage (self_klass->name,
other_klass->name)));
}
+
+// 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.
+ char path_sep[2];
+ path_sep[0] = (char) _Jv_platform_path_separator;
+ path_sep[1] = '\0';
+ jsize total = ((sizeof (GCJ_VERSIONED_LIBDIR) - 1)
+ + 1 /* path separator */ + strlen (libpath) + 1);
+ retval = (char*) _Jv_Malloc (total);
+ strcpy (retval, GCJ_VERSIONED_LIBDIR);
+ strcat (retval, path_sep);
+ 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;
+}