Mercurial > hg > graal-compiler
comparison src/share/vm/opto/node.hpp @ 17810:62c54fcc0a35
Merge
author | kvn |
---|---|
date | Tue, 25 Mar 2014 17:07:36 -0700 |
parents | 4cdf4f71177d 085b304a1cc5 |
children | 17b2fbdb6637 |
comparison
equal
deleted
inserted
replaced
17809:a433eb716ce1 | 17810:62c54fcc0a35 |
---|---|
67 class EncodeNarrowPtrNode; | 67 class EncodeNarrowPtrNode; |
68 class EncodePNode; | 68 class EncodePNode; |
69 class EncodePKlassNode; | 69 class EncodePKlassNode; |
70 class FastLockNode; | 70 class FastLockNode; |
71 class FastUnlockNode; | 71 class FastUnlockNode; |
72 class FlagsProjNode; | |
73 class IfNode; | 72 class IfNode; |
74 class IfFalseNode; | 73 class IfFalseNode; |
75 class IfTrueNode; | 74 class IfTrueNode; |
76 class InitializeNode; | 75 class InitializeNode; |
77 class JVMState; | 76 class JVMState; |
98 class MachReturnNode; | 97 class MachReturnNode; |
99 class MachSafePointNode; | 98 class MachSafePointNode; |
100 class MachSpillCopyNode; | 99 class MachSpillCopyNode; |
101 class MachTempNode; | 100 class MachTempNode; |
102 class Matcher; | 101 class Matcher; |
103 class MathExactNode; | |
104 class MemBarNode; | 102 class MemBarNode; |
105 class MemBarStoreStoreNode; | 103 class MemBarStoreStoreNode; |
106 class MemNode; | 104 class MemNode; |
107 class MergeMemNode; | 105 class MergeMemNode; |
108 class MulNode; | 106 class MulNode; |
573 DEFINE_CLASS_ID(NeverBranch, MultiBranch, 2) | 571 DEFINE_CLASS_ID(NeverBranch, MultiBranch, 2) |
574 DEFINE_CLASS_ID(Start, Multi, 2) | 572 DEFINE_CLASS_ID(Start, Multi, 2) |
575 DEFINE_CLASS_ID(MemBar, Multi, 3) | 573 DEFINE_CLASS_ID(MemBar, Multi, 3) |
576 DEFINE_CLASS_ID(Initialize, MemBar, 0) | 574 DEFINE_CLASS_ID(Initialize, MemBar, 0) |
577 DEFINE_CLASS_ID(MemBarStoreStore, MemBar, 1) | 575 DEFINE_CLASS_ID(MemBarStoreStore, MemBar, 1) |
578 DEFINE_CLASS_ID(MathExact, Multi, 4) | |
579 | 576 |
580 DEFINE_CLASS_ID(Mach, Node, 1) | 577 DEFINE_CLASS_ID(Mach, Node, 1) |
581 DEFINE_CLASS_ID(MachReturn, Mach, 0) | 578 DEFINE_CLASS_ID(MachReturn, Mach, 0) |
582 DEFINE_CLASS_ID(MachSafePoint, MachReturn, 0) | 579 DEFINE_CLASS_ID(MachSafePoint, MachReturn, 0) |
583 DEFINE_CLASS_ID(MachCall, MachSafePoint, 0) | 580 DEFINE_CLASS_ID(MachCall, MachSafePoint, 0) |
630 | 627 |
631 DEFINE_CLASS_ID(Sub, Node, 6) | 628 DEFINE_CLASS_ID(Sub, Node, 6) |
632 DEFINE_CLASS_ID(Cmp, Sub, 0) | 629 DEFINE_CLASS_ID(Cmp, Sub, 0) |
633 DEFINE_CLASS_ID(FastLock, Cmp, 0) | 630 DEFINE_CLASS_ID(FastLock, Cmp, 0) |
634 DEFINE_CLASS_ID(FastUnlock, Cmp, 1) | 631 DEFINE_CLASS_ID(FastUnlock, Cmp, 1) |
635 DEFINE_CLASS_ID(FlagsProj, Cmp, 2) | |
636 | 632 |
637 DEFINE_CLASS_ID(MergeMem, Node, 7) | 633 DEFINE_CLASS_ID(MergeMem, Node, 7) |
638 DEFINE_CLASS_ID(Bool, Node, 8) | 634 DEFINE_CLASS_ID(Bool, Node, 8) |
639 DEFINE_CLASS_ID(AddP, Node, 9) | 635 DEFINE_CLASS_ID(AddP, Node, 9) |
640 DEFINE_CLASS_ID(BoxLock, Node, 10) | 636 DEFINE_CLASS_ID(BoxLock, Node, 10) |
734 DEFINE_CLASS_QUERY(EncodeNarrowPtr) | 730 DEFINE_CLASS_QUERY(EncodeNarrowPtr) |
735 DEFINE_CLASS_QUERY(EncodeP) | 731 DEFINE_CLASS_QUERY(EncodeP) |
736 DEFINE_CLASS_QUERY(EncodePKlass) | 732 DEFINE_CLASS_QUERY(EncodePKlass) |
737 DEFINE_CLASS_QUERY(FastLock) | 733 DEFINE_CLASS_QUERY(FastLock) |
738 DEFINE_CLASS_QUERY(FastUnlock) | 734 DEFINE_CLASS_QUERY(FastUnlock) |
739 DEFINE_CLASS_QUERY(FlagsProj) | |
740 DEFINE_CLASS_QUERY(If) | 735 DEFINE_CLASS_QUERY(If) |
741 DEFINE_CLASS_QUERY(IfFalse) | 736 DEFINE_CLASS_QUERY(IfFalse) |
742 DEFINE_CLASS_QUERY(IfTrue) | 737 DEFINE_CLASS_QUERY(IfTrue) |
743 DEFINE_CLASS_QUERY(Initialize) | 738 DEFINE_CLASS_QUERY(Initialize) |
744 DEFINE_CLASS_QUERY(Jump) | 739 DEFINE_CLASS_QUERY(Jump) |
763 DEFINE_CLASS_QUERY(MachProj) | 758 DEFINE_CLASS_QUERY(MachProj) |
764 DEFINE_CLASS_QUERY(MachReturn) | 759 DEFINE_CLASS_QUERY(MachReturn) |
765 DEFINE_CLASS_QUERY(MachSafePoint) | 760 DEFINE_CLASS_QUERY(MachSafePoint) |
766 DEFINE_CLASS_QUERY(MachSpillCopy) | 761 DEFINE_CLASS_QUERY(MachSpillCopy) |
767 DEFINE_CLASS_QUERY(MachTemp) | 762 DEFINE_CLASS_QUERY(MachTemp) |
768 DEFINE_CLASS_QUERY(MathExact) | |
769 DEFINE_CLASS_QUERY(Mem) | 763 DEFINE_CLASS_QUERY(Mem) |
770 DEFINE_CLASS_QUERY(MemBar) | 764 DEFINE_CLASS_QUERY(MemBar) |
771 DEFINE_CLASS_QUERY(MemBarStoreStore) | 765 DEFINE_CLASS_QUERY(MemBarStoreStore) |
772 DEFINE_CLASS_QUERY(MergeMem) | 766 DEFINE_CLASS_QUERY(MergeMem) |
773 DEFINE_CLASS_QUERY(Mul) | 767 DEFINE_CLASS_QUERY(Mul) |