comparison src/share/vm/runtime/vmStructs.cpp @ 6857:5876f980ea19

Merge
author collins
date Fri, 12 Oct 2012 11:31:27 -0700
parents 9855b7e559ae d804e148cff8
children 685df3c6f84b
comparison
equal deleted inserted replaced
6856:9855b7e559ae 6857:5876f980ea19
461 static_field(Universe, _fully_initialized, bool) \ 461 static_field(Universe, _fully_initialized, bool) \
462 static_field(Universe, _verify_count, int) \ 462 static_field(Universe, _verify_count, int) \
463 static_field(Universe, _narrow_oop._base, address) \ 463 static_field(Universe, _narrow_oop._base, address) \
464 static_field(Universe, _narrow_oop._shift, int) \ 464 static_field(Universe, _narrow_oop._shift, int) \
465 static_field(Universe, _narrow_oop._use_implicit_null_checks, bool) \ 465 static_field(Universe, _narrow_oop._use_implicit_null_checks, bool) \
466 static_field(Universe, _narrow_klass._base, address) \
467 static_field(Universe, _narrow_klass._shift, int) \
466 \ 468 \
467 /**********************************************************************************/ \ 469 /**********************************************************************************/ \
468 /* Generation and Space hierarchies */ \ 470 /* Generation and Space hierarchies */ \
469 /**********************************************************************************/ \ 471 /**********************************************************************************/ \
470 \ 472 \
1731 declare_c2_type(CMoveLNode, CMoveNode) \ 1733 declare_c2_type(CMoveLNode, CMoveNode) \
1732 declare_c2_type(CMovePNode, CMoveNode) \ 1734 declare_c2_type(CMovePNode, CMoveNode) \
1733 declare_c2_type(CMoveNNode, CMoveNode) \ 1735 declare_c2_type(CMoveNNode, CMoveNode) \
1734 declare_c2_type(EncodePNode, TypeNode) \ 1736 declare_c2_type(EncodePNode, TypeNode) \
1735 declare_c2_type(DecodeNNode, TypeNode) \ 1737 declare_c2_type(DecodeNNode, TypeNode) \
1738 declare_c2_type(EncodePKlassNode, TypeNode) \
1739 declare_c2_type(DecodeNKlassNode, TypeNode) \
1736 declare_c2_type(ConstraintCastNode, TypeNode) \ 1740 declare_c2_type(ConstraintCastNode, TypeNode) \
1737 declare_c2_type(CastIINode, ConstraintCastNode) \ 1741 declare_c2_type(CastIINode, ConstraintCastNode) \
1738 declare_c2_type(CastPPNode, ConstraintCastNode) \ 1742 declare_c2_type(CastPPNode, ConstraintCastNode) \
1739 declare_c2_type(CheckCastPPNode, TypeNode) \ 1743 declare_c2_type(CheckCastPPNode, TypeNode) \
1740 declare_c2_type(Conv2BNode, Node) \ 1744 declare_c2_type(Conv2BNode, Node) \
1827 declare_c2_type(StoreLNode, StoreNode) \ 1831 declare_c2_type(StoreLNode, StoreNode) \
1828 declare_c2_type(StoreFNode, StoreNode) \ 1832 declare_c2_type(StoreFNode, StoreNode) \
1829 declare_c2_type(StoreDNode, StoreNode) \ 1833 declare_c2_type(StoreDNode, StoreNode) \
1830 declare_c2_type(StorePNode, StoreNode) \ 1834 declare_c2_type(StorePNode, StoreNode) \
1831 declare_c2_type(StoreNNode, StoreNode) \ 1835 declare_c2_type(StoreNNode, StoreNode) \
1836 declare_c2_type(StoreNKlassNode, StoreNode) \
1832 declare_c2_type(StoreCMNode, StoreNode) \ 1837 declare_c2_type(StoreCMNode, StoreNode) \
1833 declare_c2_type(LoadPLockedNode, LoadPNode) \ 1838 declare_c2_type(LoadPLockedNode, LoadPNode) \
1834 declare_c2_type(SCMemProjNode, ProjNode) \ 1839 declare_c2_type(SCMemProjNode, ProjNode) \
1835 declare_c2_type(LoadStoreNode, Node) \ 1840 declare_c2_type(LoadStoreNode, Node) \
1836 declare_c2_type(StorePConditionalNode, LoadStoreNode) \ 1841 declare_c2_type(StorePConditionalNode, LoadStoreNode) \