archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Joseph Provino 2015-11-11 23:47:41 +00:00
commit 539395ffbf
434 changed files with 2943 additions and 3039 deletions
Download patch file Download diff file Expand all files Collapse all files

65
hotspot/src/share/vm/runtime/arguments.cpp
View file

@ -364,6 +364,7 @@ static SpecialFlag const special_jvm_flags[] = {
{ "LazyBootClassLoader", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "StarvationMonitorInterval", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "PreInflateSpin", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "JNIDetachReleasesMonitors", JDK_Version::undefined(), JDK_Version::jdk(9), JDK_Version::jdk(10) },
#ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS
{ "dep > obs", JDK_Version::jdk(9), JDK_Version::jdk(8), JDK_Version::undefined() },
@ -817,9 +818,15 @@ static bool set_numeric_flag(const char* name, char* value, Flag::Flags origin)
int int_v;
intx intx_v;
bool is_neg = false;
Flag* result = Flag::find_flag(name, strlen(name));
if (result == NULL) {
return false;
}
// Check the sign first since atomull() parses only unsigned values.
if (*value == '-') {
if ((CommandLineFlags::intxAt(name, &intx_v) != Flag::SUCCESS) && (CommandLineFlags::intAt(name, &int_v) != Flag::SUCCESS)) {
if (!result->is_intx() && !result->is_int()) {
return false;
}
value++;
@ -828,37 +835,33 @@ static bool set_numeric_flag(const char* name, char* value, Flag::Flags origin)
if (!atomull(value, &v)) {
return false;
}
int_v = (int) v;
if (is_neg) {
int_v = -int_v;
if (result->is_int()) {
int_v = (int) v;
if (is_neg) {
int_v = -int_v;
}
return CommandLineFlags::intAtPut(result, &int_v, origin) == Flag::SUCCESS;
} else if (result->is_uint()) {
uint uint_v = (uint) v;
return CommandLineFlags::uintAtPut(result, &uint_v, origin) == Flag::SUCCESS;
} else if (result->is_intx()) {
intx_v = (intx) v;
if (is_neg) {
intx_v = -intx_v;
}
return CommandLineFlags::intxAtPut(result, &intx_v, origin) == Flag::SUCCESS;
} else if (result->is_uintx()) {
uintx uintx_v = (uintx) v;
return CommandLineFlags::uintxAtPut(result, &uintx_v, origin) == Flag::SUCCESS;
} else if (result->is_uint64_t()) {
uint64_t uint64_t_v = (uint64_t) v;
return CommandLineFlags::uint64_tAtPut(result, &uint64_t_v, origin) == Flag::SUCCESS;
} else if (result->is_size_t()) {
size_t size_t_v = (size_t) v;
return CommandLineFlags::size_tAtPut(result, &size_t_v, origin) == Flag::SUCCESS;
} else {
return false;
}
if (CommandLineFlags::intAtPut(name, &int_v, origin) == Flag::SUCCESS) {
return true;
}
uint uint_v = (uint) v;
if (!is_neg && CommandLineFlags::uintAtPut(name, &uint_v, origin) == Flag::SUCCESS) {
return true;
}
intx_v = (intx) v;
if (is_neg) {
intx_v = -intx_v;
}
if (CommandLineFlags::intxAtPut(name, &intx_v, origin) == Flag::SUCCESS) {
return true;
}
uintx uintx_v = (uintx) v;
if (!is_neg && (CommandLineFlags::uintxAtPut(name, &uintx_v, origin) == Flag::SUCCESS)) {
return true;
}
uint64_t uint64_t_v = (uint64_t) v;
if (!is_neg && (CommandLineFlags::uint64_tAtPut(name, &uint64_t_v, origin) == Flag::SUCCESS)) {
return true;
}
size_t size_t_v = (size_t) v;
if (!is_neg && (CommandLineFlags::size_tAtPut(name, &size_t_v, origin) == Flag::SUCCESS)) {
return true;
}
return false;
}
static bool set_string_flag(const char* name, const char* value, Flag::Flags origin) {