Mercurial > hg > jdk9-shenandoah > hotspot
changeset 6708:dc377db2f956
8031203: remove SafepointPollOffset
Reviewed-by: kvn, roland
author | twisti |
---|---|
date | Wed, 19 Mar 2014 11:37:58 -0700 |
parents | 23ad096319b5 |
children | 2f459c5235f9 |
files | src/cpu/sparc/vm/c1_globals_sparc.hpp src/cpu/x86/vm/c1_LIRAssembler_x86.cpp src/cpu/x86/vm/c1_globals_x86.hpp src/share/vm/c1/c1_globals.hpp src/share/vm/runtime/arguments.cpp |
diffstat | 5 files changed, 3 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/src/cpu/sparc/vm/c1_globals_sparc.hpp Tue Mar 18 14:22:42 2014 +0100 +++ b/src/cpu/sparc/vm/c1_globals_sparc.hpp Wed Mar 19 11:37:58 2014 -0700 @@ -66,6 +66,4 @@ define_pd_global(bool, CSEArrayLength, true ); define_pd_global(bool, TwoOperandLIRForm, false); -define_pd_global(intx, SafepointPollOffset, 0 ); - #endif // CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP
--- a/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Tue Mar 18 14:22:42 2014 +0100 +++ b/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp Wed Mar 19 11:37:58 2014 -0700 @@ -604,8 +604,7 @@ // Note: we do not need to round double result; float result has the right precision // the poll sets the condition code, but no data registers - AddressLiteral polling_page(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size()), - relocInfo::poll_return_type); + AddressLiteral polling_page(os::get_polling_page(), relocInfo::poll_return_type); if (Assembler::is_polling_page_far()) { __ lea(rscratch1, polling_page); @@ -619,8 +618,7 @@ int LIR_Assembler::safepoint_poll(LIR_Opr tmp, CodeEmitInfo* info) { - AddressLiteral polling_page(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size()), - relocInfo::poll_type); + AddressLiteral polling_page(os::get_polling_page(), relocInfo::poll_type); guarantee(info != NULL, "Shouldn't be NULL"); int offset = __ offset(); if (Assembler::is_polling_page_far()) {
--- a/src/cpu/x86/vm/c1_globals_x86.hpp Tue Mar 18 14:22:42 2014 +0100 +++ b/src/cpu/x86/vm/c1_globals_x86.hpp Wed Mar 19 11:37:58 2014 -0700 @@ -65,6 +65,4 @@ define_pd_global(bool, CSEArrayLength, false); define_pd_global(bool, TwoOperandLIRForm, true ); -define_pd_global(intx, SafepointPollOffset, 256 ); - #endif // CPU_X86_VM_C1_GLOBALS_X86_HPP
--- a/src/share/vm/c1/c1_globals.hpp Tue Mar 18 14:22:42 2014 +0100 +++ b/src/share/vm/c1/c1_globals.hpp Wed Mar 19 11:37:58 2014 -0700 @@ -308,9 +308,6 @@ develop(intx, InstructionCountCutoff, 37000, \ "If GraphBuilder adds this many instructions, bails out") \ \ - product_pd(intx, SafepointPollOffset, \ - "Offset added to polling address (Intel only)") \ - \ develop(bool, ComputeExactFPURegisterUsage, true, \ "Compute additional live set for fpu registers to simplify fpu stack merge (Intel only)") \ \
--- a/src/share/vm/runtime/arguments.cpp Tue Mar 18 14:22:42 2014 +0100 +++ b/src/share/vm/runtime/arguments.cpp Wed Mar 19 11:37:58 2014 -0700 @@ -301,6 +301,7 @@ { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseStringCache", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) }, + { "SafepointPollOffset", JDK_Version::jdk(9), JDK_Version::jdk(10) }, #ifdef PRODUCT { "DesiredMethodLimit", JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },