OpenJDK / jdk-updates / jdk12u
changeset 49830:ac761df837c7
8201785: Make ModRefBarrierSetAssembler abstract on all platforms
Reviewed-by: eosterlund, pliden, mdoerr
| author | shade |
|---|---|
| date | Thu, 19 Apr 2018 12:02:38 +0200 |
| parents | 19b137cb2d42 |
| children | 81e8cdf31b5a |
| files | src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.cpp src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.cpp src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp |
| diffstat | 6 files changed, 3 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp Thu Apr 19 07:54:50 2018 +0200 +++ b/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.cpp Thu Apr 19 12:02:38 2018 +0200 @@ -44,12 +44,6 @@ } } - -void ModRefBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, - Address dst, Register val, Register tmp1, Register tmp2) { - BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2); -} - void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Address dst, Register val, Register tmp1, Register tmp2) { if (type == T_OBJECT || type == T_ARRAY) {
--- a/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp Thu Apr 19 07:54:50 2018 +0200 +++ b/src/hotspot/cpu/aarch64/gc/shared/modRefBarrierSetAssembler_aarch64.hpp Thu Apr 19 12:02:38 2018 +0200 @@ -40,7 +40,7 @@ Register start, Register end, Register tmp, RegSet saved_regs) {} virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, - Address dst, Register val, Register tmp1, Register tmp2); + Address dst, Register val, Register tmp1, Register tmp2) = 0; public: virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, bool is_oop,
--- a/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.cpp Thu Apr 19 07:54:50 2018 +0200 +++ b/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.cpp Thu Apr 19 12:02:38 2018 +0200 @@ -56,12 +56,6 @@ } } -void ModRefBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, - Register base, RegisterOrConstant ind_or_offs, Register val, - Register tmp1, Register tmp2, Register tmp3, bool needs_frame) { - BarrierSetAssembler::store_at(masm, decorators, type, base, ind_or_offs, val, tmp1, tmp2, tmp3, needs_frame); -} - void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Register base, RegisterOrConstant ind_or_offs, Register val, Register tmp1, Register tmp2, Register tmp3, bool needs_frame) {
--- a/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp Thu Apr 19 07:54:50 2018 +0200 +++ b/src/hotspot/cpu/ppc/gc/shared/modRefBarrierSetAssembler_ppc.hpp Thu Apr 19 12:02:38 2018 +0200 @@ -41,7 +41,7 @@ virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Register base, RegisterOrConstant ind_or_offs, Register val, - Register tmp1, Register tmp2, Register tmp3, bool needs_frame); + Register tmp1, Register tmp2, Register tmp3, bool needs_frame) = 0; public: virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Register src, Register dst, Register count, Register preserve1, Register preserve2);
--- a/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.cpp Thu Apr 19 07:54:50 2018 +0200 +++ b/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.cpp Thu Apr 19 12:02:38 2018 +0200 @@ -50,11 +50,6 @@ } } -void ModRefBarrierSetAssembler::oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, - const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3) { - BarrierSetAssembler::store_at(masm, decorators, type, dst, val, tmp1, tmp2, tmp3); -} - void ModRefBarrierSetAssembler::store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3) { if (type == T_OBJECT || type == T_ARRAY) {
--- a/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp Thu Apr 19 07:54:50 2018 +0200 +++ b/src/hotspot/cpu/s390/gc/shared/modRefBarrierSetAssembler_s390.hpp Thu Apr 19 12:02:38 2018 +0200 @@ -39,7 +39,7 @@ virtual void gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count, bool do_return); virtual void oop_store_at(MacroAssembler* masm, DecoratorSet decorators, BasicType type, - const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3); + const Address& dst, Register val, Register tmp1, Register tmp2, Register tmp3) = 0; public: virtual void arraycopy_prologue(MacroAssembler* masm, DecoratorSet decorators, BasicType type, Register src, Register dst, Register count);