archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8295457: Make the signatures of write barrier methods consistent

Browse source 
Reviewed-by: tschatzl, shade
This commit is contained in:
Zixian Cai 2022-10-18 15:32:20 +00:00 • committed by Aleksey Shipilev
parent 7b2e83b395
commit 5dbd495115
7 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/hotspot/cpu/aarch64/macroAssembler_aarch64.cpp
View file

@ -4393,15 +4393,15 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators,
} }
void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
Address dst, Register src, Address dst, Register val,
Register tmp1, Register tmp2, Register tmp3) { Register tmp1, Register tmp2, Register tmp3) {
BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler(); BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
decorators = AccessInternal::decorator_fixup(decorators); decorators = AccessInternal::decorator_fixup(decorators);
bool as_raw = (decorators & AS_RAW) != 0; bool as_raw = (decorators & AS_RAW) != 0;
if (as_raw) { if (as_raw) {
bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3); bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
} else { } else {
bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3); bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
} }
} }
@ -4415,9 +4415,9 @@ void MacroAssembler::load_heap_oop_not_null(Register dst, Address src, Register
access_load_at(T_OBJECT, IN_HEAP | IS_NOT_NULL | decorators, dst, src, tmp1, tmp2); access_load_at(T_OBJECT, IN_HEAP | IS_NOT_NULL | decorators, dst, src, tmp1, tmp2);
} }
void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1, void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,
Register tmp2, Register tmp3, DecoratorSet decorators) { Register tmp2, Register tmp3, DecoratorSet decorators) {
access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, tmp2, tmp3); access_store_at(T_OBJECT, IN_HEAP | decorators, dst, val, tmp1, tmp2, tmp3);
} }
// Used for storing NULLs. // Used for storing NULLs.

4
src/hotspot/cpu/aarch64/macroAssembler_aarch64.hpp
View file

@ -843,7 +843,7 @@ public:
void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src, void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,
Register tmp1, Register tmp2); Register tmp1, Register tmp2);
void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src, void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register val,
Register tmp1, Register tmp2, Register tmp3); Register tmp1, Register tmp2, Register tmp3);
void load_heap_oop(Register dst, Address src, Register tmp1, void load_heap_oop(Register dst, Address src, Register tmp1,
@ -851,7 +851,7 @@ public:
void load_heap_oop_not_null(Register dst, Address src, Register tmp1, void load_heap_oop_not_null(Register dst, Address src, Register tmp1,
Register tmp2, DecoratorSet decorators = 0); Register tmp2, DecoratorSet decorators = 0);
void store_heap_oop(Address dst, Register src, Register tmp1, void store_heap_oop(Address dst, Register val, Register tmp1,
Register tmp2, Register tmp3, DecoratorSet decorators = 0); Register tmp2, Register tmp3, DecoratorSet decorators = 0);
// currently unimplemented // currently unimplemented

4
src/hotspot/cpu/ppc/macroAssembler_ppc.inline.hpp
View file

@ -398,11 +398,11 @@ inline void MacroAssembler::load_heap_oop(Register d, RegisterOrConstant offs, R
preservation_level, L_handle_null); preservation_level, L_handle_null);
} }
inline void MacroAssembler::store_heap_oop(Register d, RegisterOrConstant offs, Register s1, inline void MacroAssembler::store_heap_oop(Register val, RegisterOrConstant offs, Register base,
Register tmp1, Register tmp2, Register tmp3, Register tmp1, Register tmp2, Register tmp3,
MacroAssembler::PreservationLevel preservation_level, MacroAssembler::PreservationLevel preservation_level,
DecoratorSet decorators) { DecoratorSet decorators) {
access_store_at(T_OBJECT, decorators | IN_HEAP, s1, offs, d, tmp1, tmp2, tmp3, preservation_level); access_store_at(T_OBJECT, decorators | IN_HEAP, base, offs, val, tmp1, tmp2, tmp3, preservation_level);
} }
inline Register MacroAssembler::encode_heap_oop_not_null(Register d, Register src) { inline Register MacroAssembler::encode_heap_oop_not_null(Register d, Register src) {

10
src/hotspot/cpu/riscv/macroAssembler_riscv.cpp
View file

@ -2094,15 +2094,15 @@ void MacroAssembler::null_check(Register reg, int offset) {
} }
void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators,
Address dst, Register src, Address dst, Register val,
Register tmp1, Register tmp2, Register tmp3) { Register tmp1, Register tmp2, Register tmp3) {
BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler(); BarrierSetAssembler *bs = BarrierSet::barrier_set()->barrier_set_assembler();
decorators = AccessInternal::decorator_fixup(decorators); decorators = AccessInternal::decorator_fixup(decorators);
bool as_raw = (decorators & AS_RAW) != 0; bool as_raw = (decorators & AS_RAW) != 0;
if (as_raw) { if (as_raw) {
bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3); bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
} else { } else {
bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3); bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
} }
} }
@ -2269,9 +2269,9 @@ void MacroAssembler::decode_heap_oop(Register d, Register s) {
verify_oop_msg(d, "broken oop in decode_heap_oop"); verify_oop_msg(d, "broken oop in decode_heap_oop");
} }
void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1, void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,
Register tmp2, Register tmp3, DecoratorSet decorators) { Register tmp2, Register tmp3, DecoratorSet decorators) {
access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, tmp2, tmp3); access_store_at(T_OBJECT, IN_HEAP | decorators, dst, val, tmp1, tmp2, tmp3);
} }
void MacroAssembler::load_heap_oop(Register dst, Address src, Register tmp1, void MacroAssembler::load_heap_oop(Register dst, Address src, Register tmp1,

4
src/hotspot/cpu/riscv/macroAssembler_riscv.hpp
View file

@ -191,7 +191,7 @@ class MacroAssembler: public Assembler {
void access_load_at(BasicType type, DecoratorSet decorators, Register dst, void access_load_at(BasicType type, DecoratorSet decorators, Register dst,
Address src, Register tmp1, Register tmp2); Address src, Register tmp1, Register tmp2);
void access_store_at(BasicType type, DecoratorSet decorators, Address dst, void access_store_at(BasicType type, DecoratorSet decorators, Address dst,
Register src, Register tmp1, Register tmp2, Register tmp3); Register val, Register tmp1, Register tmp2, Register tmp3);
void load_klass(Register dst, Register src); void load_klass(Register dst, Register src);
void store_klass(Register dst, Register src); void store_klass(Register dst, Register src);
void cmp_klass(Register oop, Register trial_klass, Register tmp, Label &L); void cmp_klass(Register oop, Register trial_klass, Register tmp, Label &L);
@ -210,7 +210,7 @@ class MacroAssembler: public Assembler {
Register tmp2 = noreg, DecoratorSet decorators = 0); Register tmp2 = noreg, DecoratorSet decorators = 0);
void load_heap_oop_not_null(Register dst, Address src, Register tmp1 = noreg, void load_heap_oop_not_null(Register dst, Address src, Register tmp1 = noreg,
Register tmp2 = noreg, DecoratorSet decorators = 0); Register tmp2 = noreg, DecoratorSet decorators = 0);
void store_heap_oop(Address dst, Register src, Register tmp1 = noreg, void store_heap_oop(Address dst, Register val, Register tmp1 = noreg,
Register tmp2 = noreg, Register tmp3 = noreg, DecoratorSet decorators = 0); Register tmp2 = noreg, Register tmp3 = noreg, DecoratorSet decorators = 0);
void store_klass_gap(Register dst, Register src); void store_klass_gap(Register dst, Register src);

10
src/hotspot/cpu/x86/macroAssembler_x86.cpp
View file

@ -5104,15 +5104,15 @@ void MacroAssembler::access_load_at(BasicType type, DecoratorSet decorators, Reg
} }
} }
void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src, void MacroAssembler::access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register val,
Register tmp1, Register tmp2, Register tmp3) { Register tmp1, Register tmp2, Register tmp3) {
BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler(); BarrierSetAssembler* bs = BarrierSet::barrier_set()->barrier_set_assembler();
decorators = AccessInternal::decorator_fixup(decorators); decorators = AccessInternal::decorator_fixup(decorators);
bool as_raw = (decorators & AS_RAW) != 0; bool as_raw = (decorators & AS_RAW) != 0;
if (as_raw) { if (as_raw) {
bs->BarrierSetAssembler::store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3); bs->BarrierSetAssembler::store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
} else { } else {
bs->store_at(this, decorators, type, dst, src, tmp1, tmp2, tmp3); bs->store_at(this, decorators, type, dst, val, tmp1, tmp2, tmp3);
} }
} }
@ -5127,9 +5127,9 @@ void MacroAssembler::load_heap_oop_not_null(Register dst, Address src, Register
access_load_at(T_OBJECT, IN_HEAP | IS_NOT_NULL | decorators, dst, src, tmp1, thread_tmp); access_load_at(T_OBJECT, IN_HEAP | IS_NOT_NULL | decorators, dst, src, tmp1, thread_tmp);
} }
void MacroAssembler::store_heap_oop(Address dst, Register src, Register tmp1, void MacroAssembler::store_heap_oop(Address dst, Register val, Register tmp1,
Register tmp2, Register tmp3, DecoratorSet decorators) { Register tmp2, Register tmp3, DecoratorSet decorators) {
access_store_at(T_OBJECT, IN_HEAP | decorators, dst, src, tmp1, tmp2, tmp3); access_store_at(T_OBJECT, IN_HEAP | decorators, dst, val, tmp1, tmp2, tmp3);
} }
// Used for storing NULLs. // Used for storing NULLs.

4
src/hotspot/cpu/x86/macroAssembler_x86.hpp
View file

@ -352,14 +352,14 @@ class MacroAssembler: public Assembler {
void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src, void access_load_at(BasicType type, DecoratorSet decorators, Register dst, Address src,
Register tmp1, Register thread_tmp); Register tmp1, Register thread_tmp);
void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register src, void access_store_at(BasicType type, DecoratorSet decorators, Address dst, Register val,
Register tmp1, Register tmp2, Register tmp3); Register tmp1, Register tmp2, Register tmp3);
void load_heap_oop(Register dst, Address src, Register tmp1 = noreg, void load_heap_oop(Register dst, Address src, Register tmp1 = noreg,
Register thread_tmp = noreg, DecoratorSet decorators = 0); Register thread_tmp = noreg, DecoratorSet decorators = 0);
void load_heap_oop_not_null(Register dst, Address src, Register tmp1 = noreg, void load_heap_oop_not_null(Register dst, Address src, Register tmp1 = noreg,
Register thread_tmp = noreg, DecoratorSet decorators = 0); Register thread_tmp = noreg, DecoratorSet decorators = 0);
void store_heap_oop(Address dst, Register src, Register tmp1 = noreg, void store_heap_oop(Address dst, Register val, Register tmp1 = noreg,
Register tmp2 = noreg, Register tmp3 = noreg, DecoratorSet decorators = 0); Register tmp2 = noreg, Register tmp3 = noreg, DecoratorSet decorators = 0);
// Used for storing NULL. All other oop constants should be // Used for storing NULL. All other oop constants should be