--- a/src/hotspot/cpu/s390/macroAssembler_s390.cpp Fri Aug 16 09:18:41 2019 +0200
+++ b/src/hotspot/cpu/s390/macroAssembler_s390.cpp Tue Aug 06 10:48:21 2019 +0200
@@ -3198,15 +3198,15 @@
// whether the epoch is still valid.
// Note that the runtime guarantees sufficient alignment of JavaThread
// pointers to allow age to be placed into low bits.
- assert(markOopDesc::age_shift == markOopDesc::lock_bits + markOopDesc::biased_lock_bits,
+ assert(markWord::age_shift == markWord::lock_bits + markWord::biased_lock_bits,
"biased locking makes assumptions about bit layout");
z_lr(temp_reg, mark_reg);
- z_nilf(temp_reg, markOopDesc::biased_lock_mask_in_place);
- z_chi(temp_reg, markOopDesc::biased_lock_pattern);
+ z_nilf(temp_reg, markWord::biased_lock_mask_in_place);
+ z_chi(temp_reg, markWord::biased_lock_pattern);
z_brne(cas_label); // Try cas if object is not biased, i.e. cannot be biased locked.
load_prototype_header(temp_reg, obj_reg);
- load_const_optimized(temp2_reg, ~((int) markOopDesc::age_mask_in_place));
+ load_const_optimized(temp2_reg, ~((int) markWord::age_mask_in_place));
z_ogr(temp_reg, Z_thread);
z_xgr(temp_reg, mark_reg);
@@ -3232,7 +3232,7 @@
// If the low three bits in the xor result aren't clear, that means
// the prototype header is no longer biased and we have to revoke
// the bias on this object.
- z_tmll(temp_reg, markOopDesc::biased_lock_mask_in_place);
+ z_tmll(temp_reg, markWord::biased_lock_mask_in_place);
z_brnaz(try_revoke_bias);
// Biasing is still enabled for this data type. See whether the
@@ -3244,7 +3244,7 @@
// that the current epoch is invalid in order to do this because
// otherwise the manipulations it performs on the mark word are
// illegal.
- z_tmll(temp_reg, markOopDesc::epoch_mask_in_place);
+ z_tmll(temp_reg, markWord::epoch_mask_in_place);
z_brnaz(try_rebias);
//----------------------------------------------------------------------------
@@ -3254,8 +3254,8 @@
// fails we will go in to the runtime to revoke the object's bias.
// Note that we first construct the presumed unbiased header so we
// don't accidentally blow away another thread's valid bias.
- z_nilf(mark_reg, markOopDesc::biased_lock_mask_in_place | markOopDesc::age_mask_in_place |
- markOopDesc::epoch_mask_in_place);
+ z_nilf(mark_reg, markWord::biased_lock_mask_in_place | markWord::age_mask_in_place |
+ markWord::epoch_mask_in_place);
z_lgr(temp_reg, Z_thread);
z_llgfr(mark_reg, mark_reg);
z_ogr(temp_reg, mark_reg);
@@ -3287,7 +3287,7 @@
// bias in the current epoch. In other words, we allow transfer of
// the bias from one thread to another directly in this situation.
- z_nilf(mark_reg, markOopDesc::biased_lock_mask_in_place | markOopDesc::age_mask_in_place | markOopDesc::epoch_mask_in_place);
+ z_nilf(mark_reg, markWord::biased_lock_mask_in_place | markWord::age_mask_in_place | markWord::epoch_mask_in_place);
load_prototype_header(temp_reg, obj_reg);
z_llgfr(mark_reg, mark_reg);
@@ -3348,9 +3348,9 @@
BLOCK_COMMENT("biased_locking_exit {");
z_lg(temp_reg, 0, mark_addr);
- z_nilf(temp_reg, markOopDesc::biased_lock_mask_in_place);
-
- z_chi(temp_reg, markOopDesc::biased_lock_pattern);
+ z_nilf(temp_reg, markWord::biased_lock_mask_in_place);
+
+ z_chi(temp_reg, markWord::biased_lock_pattern);
z_bre(done);
BLOCK_COMMENT("} biased_locking_exit");
}
@@ -3363,7 +3363,7 @@
BLOCK_COMMENT("compiler_fast_lock_object {");
- // Load markOop from oop into mark.
+ // Load markWord from oop into mark.
z_lg(displacedHeader, 0, oop);
if (try_bias) {
@@ -3372,13 +3372,13 @@
// Handle existing monitor.
// The object has an existing monitor iff (mark & monitor_value) != 0.
- guarantee(Immediate::is_uimm16(markOopDesc::monitor_value), "must be half-word");
+ guarantee(Immediate::is_uimm16(markWord::monitor_value), "must be half-word");
z_lr(temp, displacedHeader);
- z_nill(temp, markOopDesc::monitor_value);
+ z_nill(temp, markWord::monitor_value);
z_brne(object_has_monitor);
- // Set mark to markOop | markOopDesc::unlocked_value.
- z_oill(displacedHeader, markOopDesc::unlocked_value);
+ // Set mark to markWord | markWord::unlocked_value.
+ z_oill(displacedHeader, markWord::unlocked_value);
// Load Compare Value application register.
@@ -3386,7 +3386,7 @@
z_stg(displacedHeader, BasicLock::displaced_header_offset_in_bytes(), box);
// Memory Fence (in cmpxchgd)
- // Compare object markOop with mark and if equal exchange scratch1 with object markOop.
+ // Compare object markWord with mark and if equal exchange scratch1 with object markWord.
// If the compare-and-swap succeeded, then we found an unlocked object and we
// have now locked it.
@@ -3397,7 +3397,7 @@
// We did not see an unlocked object so try the fast recursive case.
z_sgr(currentHeader, Z_SP);
- load_const_optimized(temp, (~(os::vm_page_size()-1) | markOopDesc::lock_mask_in_place));
+ load_const_optimized(temp, (~(os::vm_page_size()-1) | markWord::lock_mask_in_place));
z_ngr(currentHeader, temp);
// z_brne(done);
@@ -3407,7 +3407,7 @@
z_bru(done);
Register zero = temp;
- Register monitor_tagged = displacedHeader; // Tagged with markOopDesc::monitor_value.
+ Register monitor_tagged = displacedHeader; // Tagged with markWord::monitor_value.
bind(object_has_monitor);
// The object's monitor m is unlocked iff m->owner == NULL,
// otherwise m->owner may contain a thread or a stack address.
@@ -3456,12 +3456,12 @@
// Handle existing monitor.
// The object has an existing monitor iff (mark & monitor_value) != 0.
z_lg(currentHeader, oopDesc::mark_offset_in_bytes(), oop);
- guarantee(Immediate::is_uimm16(markOopDesc::monitor_value), "must be half-word");
- z_nill(currentHeader, markOopDesc::monitor_value);
+ guarantee(Immediate::is_uimm16(markWord::monitor_value), "must be half-word");
+ z_nill(currentHeader, markWord::monitor_value);
z_brne(object_has_monitor);
// Check if it is still a light weight lock, this is true if we see
- // the stack address of the basicLock in the markOop of the object
+ // the stack address of the basicLock in the markWord of the object
// copy box to currentHeader such that csg does not kill it.
z_lgr(currentHeader, box);
z_csg(currentHeader, displacedHeader, 0, oop);