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

8209801: Rename C1_WRITE_ACCESS and C1_READ_ACCESS decorators to ACCESS_READ and ACCESS_WRITE

Browse source 
Reviewed-by: kbarrett, pliden
This commit is contained in:
Roman Kennke 2018-08-22 13:01:26 +02:00
parent 417149e74a
commit d8ffa83e7a
4 changed files with 12 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hotspot/share/c1/c1_Decorators.hpp
View file

@ -34,9 +34,5 @@ const DecoratorSet C1_NEEDS_PATCHING = DECORATOR_LAST << 1;
// Use the C1_MASK_BOOLEAN decorator for boolean accesses where the value // Use the C1_MASK_BOOLEAN decorator for boolean accesses where the value
// needs to be masked. // needs to be masked.
const DecoratorSet C1_MASK_BOOLEAN = DECORATOR_LAST << 2; const DecoratorSet C1_MASK_BOOLEAN = DECORATOR_LAST << 2;
// The C1_WRITE_ACCESS decorator is used to mark writing accesses.
const DecoratorSet C1_WRITE_ACCESS = DECORATOR_LAST << 3;
// The C1_READ_ACCESS decorator is used to mark reading accesses.
const DecoratorSet C1_READ_ACCESS = DECORATOR_LAST << 4;
#endif // SHARE_VM_C1_C1_DECORATORS_HPP #endif // SHARE_VM_C1_C1_DECORATORS_HPP

18
src/hotspot/share/c1/c1_LIRGenerator.cpp
View file

@ -1615,7 +1615,7 @@ void LIRGenerator::do_StoreIndexed(StoreIndexed* x) {
void LIRGenerator::access_load_at(DecoratorSet decorators, BasicType type, void LIRGenerator::access_load_at(DecoratorSet decorators, BasicType type,
LIRItem& base, LIR_Opr offset, LIR_Opr result, LIRItem& base, LIR_Opr offset, LIR_Opr result,
CodeEmitInfo* patch_info, CodeEmitInfo* load_emit_info) { CodeEmitInfo* patch_info, CodeEmitInfo* load_emit_info) {
decorators |= C1_READ_ACCESS; decorators |= ACCESS_READ;
LIRAccess access(this, decorators, base, offset, type, patch_info, load_emit_info); LIRAccess access(this, decorators, base, offset, type, patch_info, load_emit_info);
if (access.is_raw()) { if (access.is_raw()) {
_barrier_set->BarrierSetC1::load_at(access, result); _barrier_set->BarrierSetC1::load_at(access, result);
@ -1626,7 +1626,7 @@ void LIRGenerator::access_load_at(DecoratorSet decorators, BasicType type,
void LIRGenerator::access_load(DecoratorSet decorators, BasicType type, void LIRGenerator::access_load(DecoratorSet decorators, BasicType type,
LIR_Opr addr, LIR_Opr result) { LIR_Opr addr, LIR_Opr result) {
decorators |= C1_READ_ACCESS; decorators |= ACCESS_READ;
LIRAccess access(this, decorators, LIR_OprFact::illegalOpr, LIR_OprFact::illegalOpr, type); LIRAccess access(this, decorators, LIR_OprFact::illegalOpr, LIR_OprFact::illegalOpr, type);
access.set_resolved_addr(addr); access.set_resolved_addr(addr);
if (access.is_raw()) { if (access.is_raw()) {
@ -1639,7 +1639,7 @@ void LIRGenerator::access_load(DecoratorSet decorators, BasicType type,
void LIRGenerator::access_store_at(DecoratorSet decorators, BasicType type, void LIRGenerator::access_store_at(DecoratorSet decorators, BasicType type,
LIRItem& base, LIR_Opr offset, LIR_Opr value, LIRItem& base, LIR_Opr offset, LIR_Opr value,
CodeEmitInfo* patch_info, CodeEmitInfo* store_emit_info) { CodeEmitInfo* patch_info, CodeEmitInfo* store_emit_info) {
decorators |= C1_WRITE_ACCESS; decorators |= ACCESS_WRITE;
LIRAccess access(this, decorators, base, offset, type, patch_info, store_emit_info); LIRAccess access(this, decorators, base, offset, type, patch_info, store_emit_info);
if (access.is_raw()) { if (access.is_raw()) {
_barrier_set->BarrierSetC1::store_at(access, value); _barrier_set->BarrierSetC1::store_at(access, value);
@ -1650,9 +1650,9 @@ void LIRGenerator::access_store_at(DecoratorSet decorators, BasicType type,
LIR_Opr LIRGenerator::access_atomic_cmpxchg_at(DecoratorSet decorators, BasicType type, LIR_Opr LIRGenerator::access_atomic_cmpxchg_at(DecoratorSet decorators, BasicType type,
LIRItem& base, LIRItem& offset, LIRItem& cmp_value, LIRItem& new_value) { LIRItem& base, LIRItem& offset, LIRItem& cmp_value, LIRItem& new_value) {
decorators |= ACCESS_READ;
decorators |= ACCESS_WRITE;
// Atomic operations are SEQ_CST by default // Atomic operations are SEQ_CST by default
decorators |= C1_READ_ACCESS;
decorators |= C1_WRITE_ACCESS;
decorators |= ((decorators & MO_DECORATOR_MASK) != 0) ? MO_SEQ_CST : 0; decorators |= ((decorators & MO_DECORATOR_MASK) != 0) ? MO_SEQ_CST : 0;
LIRAccess access(this, decorators, base, offset, type); LIRAccess access(this, decorators, base, offset, type);
if (access.is_raw()) { if (access.is_raw()) {
@ -1664,9 +1664,9 @@ LIR_Opr LIRGenerator::access_atomic_cmpxchg_at(DecoratorSet decorators, BasicTyp
LIR_Opr LIRGenerator::access_atomic_xchg_at(DecoratorSet decorators, BasicType type, LIR_Opr LIRGenerator::access_atomic_xchg_at(DecoratorSet decorators, BasicType type,
LIRItem& base, LIRItem& offset, LIRItem& value) { LIRItem& base, LIRItem& offset, LIRItem& value) {
decorators |= ACCESS_READ;
decorators |= ACCESS_WRITE;
// Atomic operations are SEQ_CST by default // Atomic operations are SEQ_CST by default
decorators |= C1_READ_ACCESS;
decorators |= C1_WRITE_ACCESS;
decorators |= ((decorators & MO_DECORATOR_MASK) != 0) ? MO_SEQ_CST : 0; decorators |= ((decorators & MO_DECORATOR_MASK) != 0) ? MO_SEQ_CST : 0;
LIRAccess access(this, decorators, base, offset, type); LIRAccess access(this, decorators, base, offset, type);
if (access.is_raw()) { if (access.is_raw()) {
@ -1678,9 +1678,9 @@ LIR_Opr LIRGenerator::access_atomic_xchg_at(DecoratorSet decorators, BasicType t
LIR_Opr LIRGenerator::access_atomic_add_at(DecoratorSet decorators, BasicType type, LIR_Opr LIRGenerator::access_atomic_add_at(DecoratorSet decorators, BasicType type,
LIRItem& base, LIRItem& offset, LIRItem& value) { LIRItem& base, LIRItem& offset, LIRItem& value) {
decorators |= ACCESS_READ;
decorators |= ACCESS_WRITE;
// Atomic operations are SEQ_CST by default // Atomic operations are SEQ_CST by default
decorators |= C1_READ_ACCESS;
decorators |= C1_WRITE_ACCESS;
decorators |= ((decorators & MO_DECORATOR_MASK) != 0) ? MO_SEQ_CST : 0; decorators |= ((decorators & MO_DECORATOR_MASK) != 0) ? MO_SEQ_CST : 0;
LIRAccess access(this, decorators, base, offset, type); LIRAccess access(this, decorators, base, offset, type);
if (access.is_raw()) { if (access.is_raw()) {

2
src/hotspot/share/gc/shared/c1/modRefBarrierSetC1.cpp
View file

@ -86,7 +86,7 @@ LIR_Opr ModRefBarrierSetC1::atomic_xchg_at_resolved(LIRAccess& access, LIRItem&
LIR_Opr ModRefBarrierSetC1::resolve_address(LIRAccess& access, bool resolve_in_register) { LIR_Opr ModRefBarrierSetC1::resolve_address(LIRAccess& access, bool resolve_in_register) {
DecoratorSet decorators = access.decorators(); DecoratorSet decorators = access.decorators();
bool needs_patching = (decorators & C1_NEEDS_PATCHING) != 0; bool needs_patching = (decorators & C1_NEEDS_PATCHING) != 0;
bool is_write = (decorators & C1_WRITE_ACCESS) != 0; bool is_write = (decorators & ACCESS_WRITE) != 0;
bool is_array = (decorators & IS_ARRAY) != 0; bool is_array = (decorators & IS_ARRAY) != 0;
bool on_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0; bool on_anonymous = (decorators & ON_UNKNOWN_OOP_REF) != 0;
bool precise = is_array || on_anonymous; bool precise = is_array || on_anonymous;

4
src/hotspot/share/gc/z/c1/zBarrierSetC1.cpp
View file

@ -190,8 +190,8 @@ static void pre_load_barrier(LIRAccess& access) {
// Downgrade access to MO_UNORDERED // Downgrade access to MO_UNORDERED
decorators = (decorators & ~MO_DECORATOR_MASK) | MO_UNORDERED; decorators = (decorators & ~MO_DECORATOR_MASK) | MO_UNORDERED;
// Remove C1_WRITE_ACCESS // Remove ACCESS_WRITE
decorators = (decorators & ~C1_WRITE_ACCESS); decorators = (decorators & ~ACCESS_WRITE);
// Generate synthetic load at // Generate synthetic load at
access.gen()->access_load_at(decorators, access.gen()->access_load_at(decorators,