equal
deleted
inserted
replaced
1561 case g1_pre_barrier_slow_id: |
1561 case g1_pre_barrier_slow_id: |
1562 { |
1562 { |
1563 StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments); |
1563 StubFrame f(sasm, "g1_pre_barrier", dont_gc_arguments); |
1564 // arg0 : previous value of memory |
1564 // arg0 : previous value of memory |
1565 |
1565 |
1566 BarrierSet* bs = Universe::heap()->barrier_set(); |
1566 BarrierSet* bs = BarrierSet::barrier_set(); |
1567 if (bs->kind() != BarrierSet::G1BarrierSet) { |
1567 if (bs->kind() != BarrierSet::G1BarrierSet) { |
1568 __ movptr(rax, (int)id); |
1568 __ movptr(rax, (int)id); |
1569 __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax); |
1569 __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax); |
1570 __ should_not_reach_here(); |
1570 __ should_not_reach_here(); |
1571 break; |
1571 break; |
1628 |
1628 |
1629 case g1_post_barrier_slow_id: |
1629 case g1_post_barrier_slow_id: |
1630 { |
1630 { |
1631 StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments); |
1631 StubFrame f(sasm, "g1_post_barrier", dont_gc_arguments); |
1632 |
1632 |
1633 BarrierSet* bs = Universe::heap()->barrier_set(); |
1633 BarrierSet* bs = BarrierSet::barrier_set(); |
1634 if (bs->kind() != BarrierSet::G1BarrierSet) { |
1634 if (bs->kind() != BarrierSet::G1BarrierSet) { |
1635 __ movptr(rax, (int)id); |
1635 __ movptr(rax, (int)id); |
1636 __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax); |
1636 __ call_RT(noreg, noreg, CAST_FROM_FN_PTR(address, unimplemented_entry), rax); |
1637 __ should_not_reach_here(); |
1637 __ should_not_reach_here(); |
1638 break; |
1638 break; |