< prev index next >

src/hotspot/cpu/s390/gc/g1/g1BarrierSetAssembler_s390.cpp

rename things

*** 26,46 **** #include "precompiled.hpp" #include "asm/macroAssembler.inline.hpp" #include "registerSaver_s390.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1BarrierSet.hpp" ! #include "gc/g1/g1BarrierSetCodeGen.hpp" #include "gc/g1/heapRegion.hpp" #include "gc/shared/collectedHeap.hpp" #include "runtime/thread.hpp" #include "interpreter/interp_masm.hpp" #define __ masm-> #define BLOCK_COMMENT(str) if (PrintAssembly) __ block_comment(str) ! void G1BarrierSetCodeGen::gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count) { bool dest_uninitialized = (decorators & AS_DEST_NOT_INITIALIZED) != 0; // With G1, don't generate the call if we statically know that the target is uninitialized. if (!dest_uninitialized) { // Is marking active? --- 26,47 ---- #include "precompiled.hpp" #include "asm/macroAssembler.inline.hpp" #include "registerSaver_s390.hpp" #include "gc/g1/g1CardTable.hpp" #include "gc/g1/g1BarrierSet.hpp" ! #include "gc/g1/g1BarrierSetAssembler.hpp" #include "gc/g1/heapRegion.hpp" #include "gc/shared/collectedHeap.hpp" #include "runtime/thread.hpp" #include "interpreter/interp_masm.hpp" #define __ masm-> #define BLOCK_COMMENT(str) if (PrintAssembly) __ block_comment(str) ! void G1BarrierSetAssembler::gen_write_ref_array_pre_barrier(MacroAssembler* masm, DecoratorSet decorators, ! Register addr, Register count) { bool dest_uninitialized = (decorators & AS_DEST_NOT_INITIALIZED) != 0; // With G1, don't generate the call if we statically know that the target is uninitialized. if (!dest_uninitialized) { // Is marking active? ***************
*** 70,81 **** __ bind(filtered); } } ! void G1BarrierSetCodeGen::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, Register addr, Register count, ! bool do_return) { address entry_point = CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_post_entry); if (!do_return) { assert_different_registers(addr, Z_R0_scratch); // would be destroyed by push_frame() assert_different_registers(count, Z_R0_scratch); // would be destroyed by push_frame() RegisterSaver::save_live_registers(masm, RegisterSaver::arg_registers); // Creates frame. --- 71,82 ---- __ bind(filtered); } } ! void G1BarrierSetAssembler::gen_write_ref_array_post_barrier(MacroAssembler* masm, DecoratorSet decorators, ! Register addr, Register count, bool do_return) { address entry_point = CAST_FROM_FN_PTR(address, G1BarrierSet::write_ref_array_post_entry); if (!do_return) { assert_different_registers(addr, Z_R0_scratch); // would be destroyed by push_frame() assert_different_registers(count, Z_R0_scratch); // would be destroyed by push_frame() RegisterSaver::save_live_registers(masm, RegisterSaver::arg_registers); // Creates frame.
< prev index next >