archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-18 18:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8031203: remove SafepointPollOffset

Browse source 
Reviewed-by: kvn, roland
This commit is contained in:
Christian Thalinger 2014-03-19 11:37:58 -07:00
parent 5827f6e16c
commit 315e4838e9
5 changed files with 3 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hotspot/src/cpu/sparc/vm/c1_globals_sparc.hpp
View file

@ -66,6 +66,4 @@ define_pd_global(bool, OptimizeSinglePrecision, false);
define_pd_global(bool, CSEArrayLength, true ); define_pd_global(bool, CSEArrayLength, true );
define_pd_global(bool, TwoOperandLIRForm, false); define_pd_global(bool, TwoOperandLIRForm, false);
define_pd_global(intx, SafepointPollOffset, 0 );
#endif // CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP #endif // CPU_SPARC_VM_C1_GLOBALS_SPARC_HPP

6
hotspot/src/cpu/x86/vm/c1_LIRAssembler_x86.cpp
View file

@ -604,8 +604,7 @@ void LIR_Assembler::return_op(LIR_Opr result) {
// Note: we do not need to round double result; float result has the right precision // 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 // the poll sets the condition code, but no data registers
AddressLiteral polling_page(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size()), AddressLiteral polling_page(os::get_polling_page(), relocInfo::poll_return_type);
relocInfo::poll_return_type);
if (Assembler::is_polling_page_far()) { if (Assembler::is_polling_page_far()) {
__ lea(rscratch1, polling_page); __ lea(rscratch1, polling_page);
@ -619,8 +618,7 @@ void LIR_Assembler::return_op(LIR_Opr result) {
int LIR_Assembler::safepoint_poll(LIR_Opr tmp, CodeEmitInfo* info) { int LIR_Assembler::safepoint_poll(LIR_Opr tmp, CodeEmitInfo* info) {
AddressLiteral polling_page(os::get_polling_page() + (SafepointPollOffset % os::vm_page_size()), AddressLiteral polling_page(os::get_polling_page(), relocInfo::poll_type);
relocInfo::poll_type);
guarantee(info != NULL, "Shouldn't be NULL"); guarantee(info != NULL, "Shouldn't be NULL");
int offset = __ offset(); int offset = __ offset();
if (Assembler::is_polling_page_far()) { if (Assembler::is_polling_page_far()) {

2
hotspot/src/cpu/x86/vm/c1_globals_x86.hpp
View file

@ -65,6 +65,4 @@ define_pd_global(bool, OptimizeSinglePrecision, true );
define_pd_global(bool, CSEArrayLength, false); define_pd_global(bool, CSEArrayLength, false);
define_pd_global(bool, TwoOperandLIRForm, true ); define_pd_global(bool, TwoOperandLIRForm, true );
define_pd_global(intx, SafepointPollOffset, 256 );
#endif // CPU_X86_VM_C1_GLOBALS_X86_HPP #endif // CPU_X86_VM_C1_GLOBALS_X86_HPP

3
hotspot/src/share/vm/c1/c1_globals.hpp
View file

@ -308,9 +308,6 @@
develop(intx, InstructionCountCutoff, 37000, \ develop(intx, InstructionCountCutoff, 37000, \
"If GraphBuilder adds this many instructions, bails out") \ "If GraphBuilder adds this many instructions, bails out") \
\ \
product_pd(intx, SafepointPollOffset, \
"Offset added to polling address (Intel only)") \
\
develop(bool, ComputeExactFPURegisterUsage, true, \ develop(bool, ComputeExactFPURegisterUsage, true, \
"Compute additional live set for fpu registers to simplify fpu stack merge (Intel only)") \ "Compute additional live set for fpu registers to simplify fpu stack merge (Intel only)") \
\ \

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

@ -301,6 +301,7 @@ static ObsoleteFlag obsolete_jvm_flags[] = {
{ "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) }, { "UseMPSS", JDK_Version::jdk(8), JDK_Version::jdk(9) },
{ "UseStringCache", 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) }, { "UseOldInlining", JDK_Version::jdk(9), JDK_Version::jdk(10) },
{ "SafepointPollOffset", JDK_Version::jdk(9), JDK_Version::jdk(10) },
#ifdef PRODUCT #ifdef PRODUCT
{ "DesiredMethodLimit", { "DesiredMethodLimit",
JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },