stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6989297: Integrate additional portability improvements

Browse Source 
Reviewed-by: vladidan, dholmes
This commit is contained in:
Bob Vandette 2010-10-07 15:12:57 -04:00
parent afc563751f
commit 72616ad2bc
9 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hotspot/src/cpu/sparc/vm/globals_sparc.hpp
View File

@ -62,3 +62,5 @@ define_pd_global(intx, PreInflateSpin, 40); // Determined by running desi
define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true); define_pd_global(bool, RewriteFrequentPairs, true);
define_pd_global(bool, UseMembar, false);

2
hotspot/src/cpu/x86/vm/globals_x86.hpp
View File

@ -63,3 +63,5 @@ define_pd_global(intx, PreInflateSpin, 10);
define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true); define_pd_global(bool, RewriteFrequentPairs, true);
define_pd_global(bool, UseMembar, false);

2
hotspot/src/cpu/x86/vm/methodHandles_x86.cpp
View File

@ -346,7 +346,7 @@ void trace_method_handle_stub(const char* adaptername,
if (stack_dump_count > 64) stack_dump_count = 48; if (stack_dump_count > 64) stack_dump_count = 48;
for (i = 0; i < stack_dump_count; i += 4) { for (i = 0; i < stack_dump_count; i += 4) {
printf(" dump at SP[%d] "INTPTR_FORMAT": "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT"\n", printf(" dump at SP[%d] "INTPTR_FORMAT": "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT" "INTPTR_FORMAT"\n",
i, &entry_sp[i+0], entry_sp[i+0], entry_sp[i+1], entry_sp[i+2], entry_sp[i+3]); i, (intptr_t)&entry_sp[i+0], entry_sp[i+0], entry_sp[i+1], entry_sp[i+2], entry_sp[i+3]);
} }
print_method_handle(mh); print_method_handle(mh);
} }

2
hotspot/src/cpu/zero/vm/globals_zero.hpp
View File

@ -45,3 +45,5 @@ define_pd_global(intx, StackShadowPages, 5 LP64_ONLY(+1) DEBUG_ONLY(+3));
define_pd_global(bool, RewriteBytecodes, true); define_pd_global(bool, RewriteBytecodes, true);
define_pd_global(bool, RewriteFrequentPairs, true); define_pd_global(bool, RewriteFrequentPairs, true);
define_pd_global(bool, UseMembar, false);

4
hotspot/src/os/linux/vm/attachListener_linux.cpp
View File

@ -176,10 +176,10 @@ int LinuxAttachListener::init() {
int n = snprintf(path, UNIX_PATH_MAX, "%s/.java_pid%d", int n = snprintf(path, UNIX_PATH_MAX, "%s/.java_pid%d",
os::get_temp_directory(), os::current_process_id()); os::get_temp_directory(), os::current_process_id());
if (n <= (int)UNIX_PATH_MAX) { if (n < (int)UNIX_PATH_MAX) {
n = snprintf(initial_path, UNIX_PATH_MAX, "%s.tmp", path); n = snprintf(initial_path, UNIX_PATH_MAX, "%s.tmp", path);
} }
if (n > (int)UNIX_PATH_MAX) { if (n >= (int)UNIX_PATH_MAX) {
return -1; return -1;
} }

1
hotspot/src/share/vm/includeDB_core
View File

@ -3229,6 +3229,7 @@ orderAccess.hpp allocation.hpp
orderAccess.hpp os.hpp orderAccess.hpp os.hpp
orderAccess_<os_arch>.inline.hpp orderAccess.hpp orderAccess_<os_arch>.inline.hpp orderAccess.hpp
orderAccess_<os_arch>.inline.hpp vm_version_<arch>.hpp
os.cpp allocation.inline.hpp os.cpp allocation.inline.hpp
os.cpp arguments.hpp os.cpp arguments.hpp

4
hotspot/src/share/vm/runtime/globals.hpp
View File

@ -323,10 +323,10 @@ class CommandLineFlags {
/* UseMembar is theoretically a temp flag used for memory barrier \ /* UseMembar is theoretically a temp flag used for memory barrier \
* removal testing. It was supposed to be removed before FCS but has \ * removal testing. It was supposed to be removed before FCS but has \
* been re-added (see 6401008) */ \ * been re-added (see 6401008) */ \
product(bool, UseMembar, false, \ product_pd(bool, UseMembar, \
"(Unstable) Issues membars on thread state transitions") \ "(Unstable) Issues membars on thread state transitions") \
\ \
/* Temporary: See 6948537 */ \ /* Temporary: See 6948537 */ \
experimental(bool, UseMemSetInBOT, true, \ experimental(bool, UseMemSetInBOT, true, \
"(Unstable) uses memset in BOT updates in GC code") \ "(Unstable) uses memset in BOT updates in GC code") \
\ \

3
hotspot/src/share/vm/runtime/sharedRuntime.cpp
View File

@ -302,6 +302,9 @@ double SharedRuntime::dabs(double f) {
return (f <= (double)0.0) ? (double)0.0 - f : f; return (f <= (double)0.0) ? (double)0.0 - f : f;
} }
#endif
#if defined(__SOFTFP__) || defined(PPC)
double SharedRuntime::dsqrt(double f) { double SharedRuntime::dsqrt(double f) {
return sqrt(f); return sqrt(f);
} }

3
hotspot/src/share/vm/runtime/sharedRuntime.hpp
View File

@ -116,6 +116,9 @@ class SharedRuntime: AllStatic {
#if defined(__SOFTFP__) || defined(E500V2) #if defined(__SOFTFP__) || defined(E500V2)
static double dabs(double f); static double dabs(double f);
#endif
#if defined(__SOFTFP__) || defined(PPC)
static double dsqrt(double f); static double dsqrt(double f);
#endif #endif