1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8342042: PPC64: compiler_fast_unlock_object flags failure instead of success

Browse Source 
Reviewed-by: mdoerr, aboldtch, fbredberg
This commit is contained in:
Richard Reingruber 2024-10-17 07:19:54 +00:00
parent e0dabfb4bf
commit fa39e84d64
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/hotspot/cpu/ppc/macroAssembler_ppc.cpp
View File

@ -2739,14 +2739,14 @@ void MacroAssembler::compiler_fast_unlock_object(ConditionRegister flag, Registe
// Check if there is a successor. // Check if there is a successor.
ld(temp, in_bytes(ObjectMonitor::succ_offset()), current_header); ld(temp, in_bytes(ObjectMonitor::succ_offset()), current_header);
cmpdi(flag, temp, 0); cmpdi(flag, temp, 0);
bne(flag, success); // If so we are done. // Invert equal bit
crnand(flag, Assembler::equal, flag, Assembler::equal);
beq(flag, success); // If there is a successor we are done.
// Save the monitor pointer in the current thread, so we can try // Save the monitor pointer in the current thread, so we can try
// to reacquire the lock in SharedRuntime::monitor_exit_helper(). // to reacquire the lock in SharedRuntime::monitor_exit_helper().
std(current_header, in_bytes(JavaThread::unlocked_inflated_monitor_offset()), R16_thread); std(current_header, in_bytes(JavaThread::unlocked_inflated_monitor_offset()), R16_thread);
b(failure); // flag == NE
crxor(flag, Assembler::equal, flag, Assembler::equal); // Set flag = NE => slow path
b(failure);
// flag == EQ indicates success, decrement held monitor count // flag == EQ indicates success, decrement held monitor count
// flag == NE indicates failure // flag == NE indicates failure
@ -3053,7 +3053,6 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister f
bind(not_recursive); bind(not_recursive);
Label set_eq_unlocked;
const Register t2 = tmp2; const Register t2 = tmp2;
// Set owner to null. // Set owner to null.
@ -3075,17 +3074,14 @@ void MacroAssembler::compiler_fast_unlock_lightweight_object(ConditionRegister f
// Check if there is a successor. // Check if there is a successor.
ld(t, in_bytes(ObjectMonitor::succ_offset()), monitor); ld(t, in_bytes(ObjectMonitor::succ_offset()), monitor);
cmpdi(CCR0, t, 0); cmpdi(CCR0, t, 0);
bne(CCR0, set_eq_unlocked); // If so we are done. // Invert equal bit
crnand(flag, Assembler::equal, flag, Assembler::equal);
beq(CCR0, unlocked); // If there is a successor we are done.
// Save the monitor pointer in the current thread, so we can try // Save the monitor pointer in the current thread, so we can try
// to reacquire the lock in SharedRuntime::monitor_exit_helper(). // to reacquire the lock in SharedRuntime::monitor_exit_helper().
std(monitor, in_bytes(JavaThread::unlocked_inflated_monitor_offset()), R16_thread); std(monitor, in_bytes(JavaThread::unlocked_inflated_monitor_offset()), R16_thread);
b(slow_path); // flag == NE
crxor(CCR0, Assembler::equal, CCR0, Assembler::equal); // Set flag = NE => slow path
b(slow_path);
bind(set_eq_unlocked);
crorc(CCR0, Assembler::equal, CCR0, Assembler::equal); // Set flag = EQ => fast path
} }
bind(unlocked); bind(unlocked);