Mercurial > hg > truffle
comparison src/share/vm/runtime/arguments.cpp @ 2106:91fe28b03d6a
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Wed, 26 Jan 2011 18:17:37 +0100 |
parents | 06f017f7daa7 36c186bcc085 |
children | d25d4ca69222 |
comparison
equal
deleted
inserted
replaced
2062:231bf6b9f5ad | 2106:91fe28b03d6a |
---|---|
2301 round_to((int)long_ThreadStackSize, K) / K); | 2301 round_to((int)long_ThreadStackSize, K) / K); |
2302 // -Xoss | 2302 // -Xoss |
2303 } else if (match_option(option, "-Xoss", &tail)) { | 2303 } else if (match_option(option, "-Xoss", &tail)) { |
2304 // HotSpot does not have separate native and Java stacks, ignore silently for compatibility | 2304 // HotSpot does not have separate native and Java stacks, ignore silently for compatibility |
2305 // -Xmaxjitcodesize | 2305 // -Xmaxjitcodesize |
2306 } else if (match_option(option, "-Xmaxjitcodesize", &tail)) { | 2306 } else if (match_option(option, "-Xmaxjitcodesize", &tail) || |
2307 match_option(option, "-XX:ReservedCodeCacheSize=", &tail)) { | |
2307 julong long_ReservedCodeCacheSize = 0; | 2308 julong long_ReservedCodeCacheSize = 0; |
2308 ArgsRange errcode = parse_memory_size(tail, &long_ReservedCodeCacheSize, | 2309 ArgsRange errcode = parse_memory_size(tail, &long_ReservedCodeCacheSize, |
2309 (size_t)InitialCodeCacheSize); | 2310 (size_t)InitialCodeCacheSize); |
2310 if (errcode != arg_in_range) { | 2311 if (errcode != arg_in_range) { |
2311 jio_fprintf(defaultStream::error_stream(), | 2312 jio_fprintf(defaultStream::error_stream(), |
2312 "Invalid maximum code cache size: %s\n", | 2313 "Invalid maximum code cache size: %s. Should be greater than InitialCodeCacheSize=%dK\n", |
2313 option->optionString); | 2314 option->optionString, InitialCodeCacheSize/K); |
2314 describe_range_error(errcode); | 2315 describe_range_error(errcode); |
2315 return JNI_EINVAL; | 2316 return JNI_EINVAL; |
2316 } | 2317 } |
2317 FLAG_SET_CMDLINE(uintx, ReservedCodeCacheSize, (uintx)long_ReservedCodeCacheSize); | 2318 FLAG_SET_CMDLINE(uintx, ReservedCodeCacheSize, (uintx)long_ReservedCodeCacheSize); |
2318 // -green | 2319 // -green |