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

8224828: aarch64: rflags is not correct after safepoint poll

Browse Source 
Reviewed-by: aph, adinn
This commit is contained in:
Xiang Yuan 2019-05-30 10:29:55 +08:00 committed by Fei Yang
parent 26fe539bbd
commit 76361f63bd
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hotspot/cpu/aarch64/aarch64.ad
View File

@ -14551,9 +14551,10 @@ instruct cmpFastUnlock(rFlagsReg cr, iRegP object, iRegP box, iRegPNoSp tmp, iRe
// TODO
// provide a near and far version of this code
instruct safePoint(iRegP poll)
instruct safePoint(rFlagsReg cr, iRegP poll)
%{
match(SafePoint poll);
effect(KILL cr);
format %{
"ldrw zr, [$poll]\t# Safepoint: poll for GC"

5
src/hotspot/cpu/aarch64/sharedRuntime_aarch64.cpp
View File

@ -135,8 +135,7 @@ OopMap* RegisterSaver::save_live_registers(MacroAssembler* masm, int additional_
int frame_size_in_words = frame_size_in_bytes / wordSize;
*total_frame_words = frame_size_in_words;
// Save registers, fpu state, and flags.
// Save Integer and Float registers.
__ enter();
__ push_CPU_state(save_vectors);
@ -2880,7 +2879,7 @@ SafepointBlob* SharedRuntime::generate_handler_blob(address call_ptr, int poll_t
bool cause_return = (poll_type == POLL_AT_RETURN);
bool save_vectors = (poll_type == POLL_AT_VECTOR_LOOP);
// Save registers, fpu state, and flags
// Save Integer and Float registers.
map = RegisterSaver::save_live_registers(masm, 0, &frame_size_in_words, save_vectors);
// The following is basically a call_VM. However, we need the precise