Mercurial > hg > truffle
comparison src/share/vm/opto/graphKit.hpp @ 3284:286c498ae0d4
Merge
author | kvn |
---|---|
date | Fri, 29 Apr 2011 11:15:30 -0700 |
parents | 66b0e2371912 5d046bf49ce7 |
children | 8f972594effc |
comparison
equal
deleted
inserted
replaced
3283:01fd6090fdd8 | 3284:286c498ae0d4 |
---|---|
542 const TypePtr* adr_type, | 542 const TypePtr* adr_type, |
543 Node* val, | 543 Node* val, |
544 BasicType bt); | 544 BasicType bt); |
545 | 545 |
546 // For the few case where the barriers need special help | 546 // For the few case where the barriers need special help |
547 void pre_barrier(Node* ctl, Node* obj, Node* adr, uint adr_idx, | 547 void pre_barrier(bool do_load, Node* ctl, |
548 Node* val, const TypeOopPtr* val_type, BasicType bt); | 548 Node* obj, Node* adr, uint adr_idx, Node* val, const TypeOopPtr* val_type, |
549 Node* pre_val, | |
550 BasicType bt); | |
549 | 551 |
550 void post_barrier(Node* ctl, Node* store, Node* obj, Node* adr, uint adr_idx, | 552 void post_barrier(Node* ctl, Node* store, Node* obj, Node* adr, uint adr_idx, |
551 Node* val, BasicType bt, bool use_precise); | 553 Node* val, BasicType bt, bool use_precise); |
552 | 554 |
553 // Return addressing for an array element. | 555 // Return addressing for an array element. |
669 // vanilla/CMS post barrier | 671 // vanilla/CMS post barrier |
670 void write_barrier_post(Node *store, Node* obj, | 672 void write_barrier_post(Node *store, Node* obj, |
671 Node* adr, uint adr_idx, Node* val, bool use_precise); | 673 Node* adr, uint adr_idx, Node* val, bool use_precise); |
672 | 674 |
673 // G1 pre/post barriers | 675 // G1 pre/post barriers |
674 void g1_write_barrier_pre(Node* obj, | 676 void g1_write_barrier_pre(bool do_load, |
677 Node* obj, | |
675 Node* adr, | 678 Node* adr, |
676 uint alias_idx, | 679 uint alias_idx, |
677 Node* val, | 680 Node* val, |
678 const TypeOopPtr* val_type, | 681 const TypeOopPtr* val_type, |
682 Node* pre_val, | |
679 BasicType bt); | 683 BasicType bt); |
680 | 684 |
681 void g1_write_barrier_post(Node* store, | 685 void g1_write_barrier_post(Node* store, |
682 Node* obj, | 686 Node* obj, |
683 Node* adr, | 687 Node* adr, |