Mercurial > hg > truffle
comparison src/share/vm/runtime/vmStructs.cpp @ 6853:d804e148cff8
Merge
author | kvn |
---|---|
date | Fri, 12 Oct 2012 09:22:52 -0700 |
parents | 6e5a59a8e4a7 8e47bac5643a |
children | 5876f980ea19 |
comparison
equal
deleted
inserted
replaced
6842:b9a9ed0f8eeb | 6853:d804e148cff8 |
---|---|
452 static_field(Universe, _fully_initialized, bool) \ | 452 static_field(Universe, _fully_initialized, bool) \ |
453 static_field(Universe, _verify_count, int) \ | 453 static_field(Universe, _verify_count, int) \ |
454 static_field(Universe, _narrow_oop._base, address) \ | 454 static_field(Universe, _narrow_oop._base, address) \ |
455 static_field(Universe, _narrow_oop._shift, int) \ | 455 static_field(Universe, _narrow_oop._shift, int) \ |
456 static_field(Universe, _narrow_oop._use_implicit_null_checks, bool) \ | 456 static_field(Universe, _narrow_oop._use_implicit_null_checks, bool) \ |
457 static_field(Universe, _narrow_klass._base, address) \ | |
458 static_field(Universe, _narrow_klass._shift, int) \ | |
457 \ | 459 \ |
458 /**********************************************************************************/ \ | 460 /**********************************************************************************/ \ |
459 /* Generation and Space hierarchies */ \ | 461 /* Generation and Space hierarchies */ \ |
460 /**********************************************************************************/ \ | 462 /**********************************************************************************/ \ |
461 \ | 463 \ |
1725 declare_c2_type(CMoveLNode, CMoveNode) \ | 1727 declare_c2_type(CMoveLNode, CMoveNode) \ |
1726 declare_c2_type(CMovePNode, CMoveNode) \ | 1728 declare_c2_type(CMovePNode, CMoveNode) \ |
1727 declare_c2_type(CMoveNNode, CMoveNode) \ | 1729 declare_c2_type(CMoveNNode, CMoveNode) \ |
1728 declare_c2_type(EncodePNode, TypeNode) \ | 1730 declare_c2_type(EncodePNode, TypeNode) \ |
1729 declare_c2_type(DecodeNNode, TypeNode) \ | 1731 declare_c2_type(DecodeNNode, TypeNode) \ |
1732 declare_c2_type(EncodePKlassNode, TypeNode) \ | |
1733 declare_c2_type(DecodeNKlassNode, TypeNode) \ | |
1730 declare_c2_type(ConstraintCastNode, TypeNode) \ | 1734 declare_c2_type(ConstraintCastNode, TypeNode) \ |
1731 declare_c2_type(CastIINode, ConstraintCastNode) \ | 1735 declare_c2_type(CastIINode, ConstraintCastNode) \ |
1732 declare_c2_type(CastPPNode, ConstraintCastNode) \ | 1736 declare_c2_type(CastPPNode, ConstraintCastNode) \ |
1733 declare_c2_type(CheckCastPPNode, TypeNode) \ | 1737 declare_c2_type(CheckCastPPNode, TypeNode) \ |
1734 declare_c2_type(Conv2BNode, Node) \ | 1738 declare_c2_type(Conv2BNode, Node) \ |
1821 declare_c2_type(StoreLNode, StoreNode) \ | 1825 declare_c2_type(StoreLNode, StoreNode) \ |
1822 declare_c2_type(StoreFNode, StoreNode) \ | 1826 declare_c2_type(StoreFNode, StoreNode) \ |
1823 declare_c2_type(StoreDNode, StoreNode) \ | 1827 declare_c2_type(StoreDNode, StoreNode) \ |
1824 declare_c2_type(StorePNode, StoreNode) \ | 1828 declare_c2_type(StorePNode, StoreNode) \ |
1825 declare_c2_type(StoreNNode, StoreNode) \ | 1829 declare_c2_type(StoreNNode, StoreNode) \ |
1830 declare_c2_type(StoreNKlassNode, StoreNode) \ | |
1826 declare_c2_type(StoreCMNode, StoreNode) \ | 1831 declare_c2_type(StoreCMNode, StoreNode) \ |
1827 declare_c2_type(LoadPLockedNode, LoadPNode) \ | 1832 declare_c2_type(LoadPLockedNode, LoadPNode) \ |
1828 declare_c2_type(SCMemProjNode, ProjNode) \ | 1833 declare_c2_type(SCMemProjNode, ProjNode) \ |
1829 declare_c2_type(LoadStoreNode, Node) \ | 1834 declare_c2_type(LoadStoreNode, Node) \ |
1830 declare_c2_type(StorePConditionalNode, LoadStoreNode) \ | 1835 declare_c2_type(StorePConditionalNode, LoadStoreNode) \ |