equal
deleted
inserted
replaced
41 #include "runtime/vframeArray.hpp" |
41 #include "runtime/vframeArray.hpp" |
42 #include "utilities/macros.hpp" |
42 #include "utilities/macros.hpp" |
43 #include "vmreg_s390.inline.hpp" |
43 #include "vmreg_s390.inline.hpp" |
44 #include "registerSaver_s390.hpp" |
44 #include "registerSaver_s390.hpp" |
45 #if INCLUDE_ALL_GCS |
45 #if INCLUDE_ALL_GCS |
|
46 #include "gc/g1/g1BarrierSet.hpp" |
46 #include "gc/g1/g1CardTable.hpp" |
47 #include "gc/g1/g1CardTable.hpp" |
47 #include "gc/g1/g1SATBCardTableModRefBS.hpp" |
|
48 #endif |
48 #endif |
49 |
49 |
50 // Implementation of StubAssembler |
50 // Implementation of StubAssembler |
51 |
51 |
52 int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry_point, int number_of_arguments) { |
52 int StubAssembler::call_RT(Register oop_result1, Register metadata_result, address entry_point, int number_of_arguments) { |
766 #if INCLUDE_ALL_GCS |
766 #if INCLUDE_ALL_GCS |
767 case g1_pre_barrier_slow_id: |
767 case g1_pre_barrier_slow_id: |
768 { // Z_R1_scratch: previous value of memory |
768 { // Z_R1_scratch: previous value of memory |
769 |
769 |
770 BarrierSet* bs = Universe::heap()->barrier_set(); |
770 BarrierSet* bs = Universe::heap()->barrier_set(); |
771 if (bs->kind() != BarrierSet::G1SATBCTLogging) { |
771 if (bs->kind() != BarrierSet::G1BarrierSet) { |
772 __ should_not_reach_here(FILE_AND_LINE); |
772 __ should_not_reach_here(FILE_AND_LINE); |
773 break; |
773 break; |
774 } |
774 } |
775 |
775 |
776 __ set_info("g1_pre_barrier_slow_id", dont_gc_arguments); |
776 __ set_info("g1_pre_barrier_slow_id", dont_gc_arguments); |
835 break; |
835 break; |
836 |
836 |
837 case g1_post_barrier_slow_id: |
837 case g1_post_barrier_slow_id: |
838 { // Z_R1_scratch: oop address, address of updated memory slot |
838 { // Z_R1_scratch: oop address, address of updated memory slot |
839 BarrierSet* bs = Universe::heap()->barrier_set(); |
839 BarrierSet* bs = Universe::heap()->barrier_set(); |
840 if (bs->kind() != BarrierSet::G1SATBCTLogging) { |
840 if (bs->kind() != BarrierSet::G1BarrierSet) { |
841 __ should_not_reach_here(FILE_AND_LINE); |
841 __ should_not_reach_here(FILE_AND_LINE); |
842 break; |
842 break; |
843 } |
843 } |
844 |
844 |
845 __ set_info("g1_post_barrier_slow_id", dont_gc_arguments); |
845 __ set_info("g1_post_barrier_slow_id", dont_gc_arguments); |