truffle: src/share/vm/runtime/java.cpp comparison

comparison src/share/vm/runtime/java.cpp @ 356:1ee8caae33af

Merge

author	tonyp
date	Thu, 21 Aug 2008 23:36:31 -0400
parents	d95b224e9f17
children	fb1a39993f69

comparison

equal deleted inserted replaced

-:0edda524b58c
+:1ee8caae33af
 /*
-* Copyright 1997-2007 Sun Microsystems, Inc.  All Rights Reserved.
+* Copyright 1997-2008 Sun Microsystems, Inc.  All Rights Reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 {
 vm_perform_shutdown_actions();
 os::shutdown();
 }
-void vm_abort() {
+void vm_abort(bool dump_core) {
 vm_perform_shutdown_actions();
-os::abort(PRODUCT_ONLY(false));
+os::abort(dump_core);
 ShouldNotReachHere();
 }
 void vm_notify_during_shutdown(const char* error, const char* message) {
 if (error != NULL) {
 java_lang_Throwable::print(exception, tty);
 tty->cr();
 java_lang_Throwable::print_stack_trace(exception(), tty);
 tty->cr();
 vm_notify_during_shutdown(NULL, NULL);
-vm_abort();
+// Failure during initialization, we don't want to dump core
+vm_abort(false);
 }
 void vm_exit_during_initialization(symbolHandle ex, const char* message) {
 ResourceMark rm;
 vm_notify_during_shutdown(ex->as_C_string(), message);
-vm_abort();
+// Failure during initialization, we don't want to dump core
+vm_abort(false);
 }
 void vm_exit_during_initialization(const char* error, const char* message) {
 vm_notify_during_shutdown(error, message);
-vm_abort();
+// Failure during initialization, we don't want to dump core
+vm_abort(false);
 }
 void vm_shutdown_during_initialization(const char* error, const char* message) {
 vm_notify_during_shutdown(error, message);
 vm_shutdown();
 }
-jdk_version_info JDK_Version::_version_info = {0};
+JDK_Version JDK_Version::_current;
-bool JDK_Version::_pre_jdk16_version = false;
-int  JDK_Version::_jdk_version = 0;
 void JDK_Version::initialize() {
+jdk_version_info info;
+assert(!_current.is_valid(), "Don't initialize twice");
 void *lib_handle = os::native_java_library();
-jdk_version_info_fn_t func =
+jdk_version_info_fn_t func = CAST_TO_FN_PTR(jdk_version_info_fn_t,
-CAST_TO_FN_PTR(jdk_version_info_fn_t, hpi::dll_lookup(lib_handle, "JDK_GetVersionInfo0"));
+os::dll_lookup(lib_handle, "JDK_GetVersionInfo0"));
 if (func == NULL) {
 // JDK older than 1.6
-_pre_jdk16_version = true;
+_current._partially_initialized = true;
-return;
-}
-if (func != NULL) {
-(*func)(&_version_info, sizeof(_version_info));
-}
-if (jdk_major_version() == 1) {
-_jdk_version = jdk_minor_version();
 } else {
-// If the release version string is changed to n.x.x (e.g. 7.0.0) in a future release
+(*func)(&info, sizeof(info));
-_jdk_version = jdk_major_version();
-}
+int major = JDK_VERSION_MAJOR(info.jdk_version);
+int minor = JDK_VERSION_MINOR(info.jdk_version);
+int micro = JDK_VERSION_MICRO(info.jdk_version);
+int build = JDK_VERSION_BUILD(info.jdk_version);
+if (major == 1 && minor > 4) {
+// We represent "1.5.0" as "5.0", but 1.4.2 as itself.
+major = minor;
+minor = micro;
+micro = 0;
+}
+_current = JDK_Version(major, minor, micro, info.update_version,
+info.special_update_version, build,
+info.thread_park_blocker == 1);
+}
+}
+void JDK_Version::fully_initialize(
+uint8_t major, uint8_t minor, uint8_t micro, uint8_t update) {
+// This is only called when current is less than 1.6 and we've gotten
+// far enough in the initialization to determine the exact version.
+assert(major < 6, "not needed for JDK version >= 6");
+assert(is_partially_initialized(), "must not initialize");
+if (major < 5) {
+// JDK verison sequence: 1.2.x, 1.3.x, 1.4.x, 5.0.x, 6.0.x, etc.
+micro = minor;
+minor = major;
+major = 1;
+}
+_current = JDK_Version(major, minor, micro, update);
 }
 void JDK_Version_init() {
 JDK_Version::initialize();
 }
+static int64_t encode_jdk_version(const JDK_Version& v) {
+return
+((int64_t)v.major_version()          << (BitsPerByte * 5)) |
+((int64_t)v.minor_version()          << (BitsPerByte * 4)) |
+((int64_t)v.micro_version()          << (BitsPerByte * 3)) |
+((int64_t)v.update_version()         << (BitsPerByte * 2)) |
+((int64_t)v.special_update_version() << (BitsPerByte * 1)) |
+((int64_t)v.build_number()           << (BitsPerByte * 0));
+}
+int JDK_Version::compare(const JDK_Version& other) const {
+assert(is_valid() && other.is_valid(), "Invalid version (uninitialized?)");
+if (!is_partially_initialized() && other.is_partially_initialized()) {
+return -(other.compare(*this)); // flip the comparators
+}
+assert(!other.is_partially_initialized(), "Not initialized yet");
+if (is_partially_initialized()) {
+assert(other.major_version() >= 6,
+"Invalid JDK version comparison during initialization");
+return -1;
+} else {
+uint64_t e = encode_jdk_version(*this);
+uint64_t o = encode_jdk_version(other);
+return (e > o) ? 1 : ((e == o) ? 0 : -1);
+}
+}
+void JDK_Version::to_string(char* buffer, size_t buflen) const {
+size_t index = 0;
+if (!is_valid()) {
+jio_snprintf(buffer, buflen, "%s", "(uninitialized)");
+} else if (is_partially_initialized()) {
+jio_snprintf(buffer, buflen, "%s", "(uninitialized) pre-1.6.0");
+} else {
+index += jio_snprintf(
+&buffer[index], buflen - index, "%d.%d", _major, _minor);
+if (_micro > 0) {
+index += jio_snprintf(&buffer[index], buflen - index, ".%d", _micro);
+}
+if (_update > 0) {
+index += jio_snprintf(&buffer[index], buflen - index, "_%02d", _update);
+}
+if (_special > 0) {
+index += jio_snprintf(&buffer[index], buflen - index, "%c", _special);
+}
+if (_build > 0) {
+index += jio_snprintf(&buffer[index], buflen - index, "-b%02d", _build);
+}
+}
+}

Mercurial > hg > truffle

comparison src/share/vm/runtime/java.cpp @ 356:1ee8caae33af