Mercurial > hg > graal-compiler
comparison src/share/vm/runtime/vmStructs.cpp @ 18041:52b4284cb496
Merge with jdk8u20-b26
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Wed, 15 Oct 2014 16:02:50 +0200 |
parents | dffc37fa7157 62c54fcc0a35 |
children | 3498d73280c8 |
comparison
equal
deleted
inserted
replaced
17606:45d7b2c7029d | 18041:52b4284cb496 |
---|---|
149 # include "vmStructs_linux_arm.hpp" | 149 # include "vmStructs_linux_arm.hpp" |
150 #endif | 150 #endif |
151 #ifdef TARGET_OS_ARCH_linux_ppc | 151 #ifdef TARGET_OS_ARCH_linux_ppc |
152 # include "vmStructs_linux_ppc.hpp" | 152 # include "vmStructs_linux_ppc.hpp" |
153 #endif | 153 #endif |
154 #ifdef TARGET_OS_ARCH_aix_ppc | |
155 # include "vmStructs_aix_ppc.hpp" | |
156 #endif | |
154 #ifdef TARGET_OS_ARCH_bsd_x86 | 157 #ifdef TARGET_OS_ARCH_bsd_x86 |
155 # include "vmStructs_bsd_x86.hpp" | 158 # include "vmStructs_bsd_x86.hpp" |
156 #endif | 159 #endif |
157 #ifdef TARGET_OS_ARCH_bsd_zero | 160 #ifdef TARGET_OS_ARCH_bsd_zero |
158 # include "vmStructs_bsd_zero.hpp" | 161 # include "vmStructs_bsd_zero.hpp" |
206 # include "adfiles/adGlobals_zero.hpp" | 209 # include "adfiles/adGlobals_zero.hpp" |
207 #endif | 210 #endif |
208 #ifdef TARGET_ARCH_MODEL_arm | 211 #ifdef TARGET_ARCH_MODEL_arm |
209 # include "adfiles/adGlobals_arm.hpp" | 212 # include "adfiles/adGlobals_arm.hpp" |
210 #endif | 213 #endif |
211 #ifdef TARGET_ARCH_MODEL_ppc | 214 #ifdef TARGET_ARCH_MODEL_ppc_32 |
212 # include "adfiles/adGlobals_ppc.hpp" | 215 # include "adfiles/adGlobals_ppc_32.hpp" |
213 #endif | 216 #endif |
214 #endif | 217 #ifdef TARGET_ARCH_MODEL_ppc_64 |
218 # include "adfiles/adGlobals_ppc_64.hpp" | |
219 #endif | |
220 #endif // COMPILER2 | |
215 | 221 |
216 // Note: the cross-product of (c1, c2, product, nonproduct, ...), | 222 // Note: the cross-product of (c1, c2, product, nonproduct, ...), |
217 // (nonstatic, static), and (unchecked, checked) has not been taken. | 223 // (nonstatic, static), and (unchecked, checked) has not been taken. |
218 // Only the macros currently needed have been defined. | 224 // Only the macros currently needed have been defined. |
219 | 225 |
250 typedef Hashtable<oop, mtSymbol> StringHashtable; | 256 typedef Hashtable<oop, mtSymbol> StringHashtable; |
251 typedef TwoOopHashtable<Klass*, mtClass> KlassTwoOopHashtable; | 257 typedef TwoOopHashtable<Klass*, mtClass> KlassTwoOopHashtable; |
252 typedef Hashtable<Klass*, mtClass> KlassHashtable; | 258 typedef Hashtable<Klass*, mtClass> KlassHashtable; |
253 typedef HashtableEntry<Klass*, mtClass> KlassHashtableEntry; | 259 typedef HashtableEntry<Klass*, mtClass> KlassHashtableEntry; |
254 typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable; | 260 typedef TwoOopHashtable<Symbol*, mtClass> SymbolTwoOopHashtable; |
255 typedef BinaryTreeDictionary<Metablock, FreeList> MetablockTreeDictionary; | 261 typedef BinaryTreeDictionary<Metablock, FreeList<Metablock> > MetablockTreeDictionary; |
256 | 262 |
257 //-------------------------------------------------------------------------------- | 263 //-------------------------------------------------------------------------------- |
258 // VM_STRUCTS | 264 // VM_STRUCTS |
259 // | 265 // |
260 // This list enumerates all of the fields the serviceability agent | 266 // This list enumerates all of the fields the serviceability agent |
1865 declare_c2_type(CastX2PNode, Node) \ | 1871 declare_c2_type(CastX2PNode, Node) \ |
1866 declare_c2_type(CastP2XNode, Node) \ | 1872 declare_c2_type(CastP2XNode, Node) \ |
1867 declare_c2_type(MemBarNode, MultiNode) \ | 1873 declare_c2_type(MemBarNode, MultiNode) \ |
1868 declare_c2_type(MemBarAcquireNode, MemBarNode) \ | 1874 declare_c2_type(MemBarAcquireNode, MemBarNode) \ |
1869 declare_c2_type(MemBarReleaseNode, MemBarNode) \ | 1875 declare_c2_type(MemBarReleaseNode, MemBarNode) \ |
1876 declare_c2_type(LoadFenceNode, MemBarNode) \ | |
1877 declare_c2_type(StoreFenceNode, MemBarNode) \ | |
1870 declare_c2_type(MemBarVolatileNode, MemBarNode) \ | 1878 declare_c2_type(MemBarVolatileNode, MemBarNode) \ |
1871 declare_c2_type(MemBarCPUOrderNode, MemBarNode) \ | 1879 declare_c2_type(MemBarCPUOrderNode, MemBarNode) \ |
1872 declare_c2_type(InitializeNode, MemBarNode) \ | 1880 declare_c2_type(InitializeNode, MemBarNode) \ |
1873 declare_c2_type(ThreadLocalNode, Node) \ | 1881 declare_c2_type(ThreadLocalNode, Node) \ |
1874 declare_c2_type(Opaque1Node, Node) \ | 1882 declare_c2_type(Opaque1Node, Node) \ |
1989 declare_c2_type(CmpL3Node, CmpLNode) \ | 1997 declare_c2_type(CmpL3Node, CmpLNode) \ |
1990 declare_c2_type(CmpFNode, CmpNode) \ | 1998 declare_c2_type(CmpFNode, CmpNode) \ |
1991 declare_c2_type(CmpF3Node, CmpFNode) \ | 1999 declare_c2_type(CmpF3Node, CmpFNode) \ |
1992 declare_c2_type(CmpDNode, CmpNode) \ | 2000 declare_c2_type(CmpDNode, CmpNode) \ |
1993 declare_c2_type(CmpD3Node, CmpDNode) \ | 2001 declare_c2_type(CmpD3Node, CmpDNode) \ |
1994 declare_c2_type(MathExactNode, MultiNode) \ | |
1995 declare_c2_type(MathExactINode, MathExactNode) \ | |
1996 declare_c2_type(AddExactINode, MathExactINode) \ | |
1997 declare_c2_type(AddExactLNode, MathExactLNode) \ | |
1998 declare_c2_type(SubExactINode, MathExactINode) \ | |
1999 declare_c2_type(SubExactLNode, MathExactLNode) \ | |
2000 declare_c2_type(NegExactINode, MathExactINode) \ | |
2001 declare_c2_type(MulExactINode, MathExactINode) \ | |
2002 declare_c2_type(FlagsProjNode, ProjNode) \ | |
2003 declare_c2_type(BoolNode, Node) \ | 2002 declare_c2_type(BoolNode, Node) \ |
2004 declare_c2_type(AbsNode, Node) \ | 2003 declare_c2_type(AbsNode, Node) \ |
2005 declare_c2_type(AbsINode, AbsNode) \ | 2004 declare_c2_type(AbsINode, AbsNode) \ |
2006 declare_c2_type(AbsFNode, AbsNode) \ | 2005 declare_c2_type(AbsFNode, AbsNode) \ |
2007 declare_c2_type(AbsDNode, AbsNode) \ | 2006 declare_c2_type(AbsDNode, AbsNode) \ |
2078 declare_c2_type(ExtractSNode, ExtractNode) \ | 2077 declare_c2_type(ExtractSNode, ExtractNode) \ |
2079 declare_c2_type(ExtractINode, ExtractNode) \ | 2078 declare_c2_type(ExtractINode, ExtractNode) \ |
2080 declare_c2_type(ExtractLNode, ExtractNode) \ | 2079 declare_c2_type(ExtractLNode, ExtractNode) \ |
2081 declare_c2_type(ExtractFNode, ExtractNode) \ | 2080 declare_c2_type(ExtractFNode, ExtractNode) \ |
2082 declare_c2_type(ExtractDNode, ExtractNode) \ | 2081 declare_c2_type(ExtractDNode, ExtractNode) \ |
2082 declare_c2_type(OverflowNode, CmpNode) \ | |
2083 declare_c2_type(OverflowINode, OverflowNode) \ | |
2084 declare_c2_type(OverflowAddINode, OverflowINode) \ | |
2085 declare_c2_type(OverflowSubINode, OverflowINode) \ | |
2086 declare_c2_type(OverflowMulINode, OverflowINode) \ | |
2087 declare_c2_type(OverflowLNode, OverflowNode) \ | |
2088 declare_c2_type(OverflowAddLNode, OverflowLNode) \ | |
2089 declare_c2_type(OverflowSubLNode, OverflowLNode) \ | |
2090 declare_c2_type(OverflowMulLNode, OverflowLNode) \ | |
2083 \ | 2091 \ |
2084 /*********************/ \ | 2092 /*********************/ \ |
2085 /* Adapter Blob Entries */ \ | 2093 /* Adapter Blob Entries */ \ |
2086 /*********************/ \ | 2094 /*********************/ \ |
2087 declare_toplevel_type(AdapterHandlerEntry) \ | 2095 declare_toplevel_type(AdapterHandlerEntry) \ |