Mercurial > hg > truffle

comparison src/share/vm/runtime/vmStructs.cpp @ 17812:a7d4d4655766

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author kvn
date Wed, 26 Mar 2014 18:21:05 -0700
parents 62c54fcc0a35
children 52b4284cb496 6e0cb14ce59b 01dcaba9b3f3
comparison
equal deleted inserted replaced
17789:6b207d038106 17812:a7d4d4655766
140 # include "vmStructs_linux_arm.hpp" 140 # include "vmStructs_linux_arm.hpp"
141 #endif 141 #endif
142 #ifdef TARGET_OS_ARCH_linux_ppc 142 #ifdef TARGET_OS_ARCH_linux_ppc
143 # include "vmStructs_linux_ppc.hpp" 143 # include "vmStructs_linux_ppc.hpp"
144 #endif 144 #endif
145 #ifdef TARGET_OS_ARCH_aix_ppc
146 # include "vmStructs_aix_ppc.hpp"
147 #endif
145 #ifdef TARGET_OS_ARCH_bsd_x86 148 #ifdef TARGET_OS_ARCH_bsd_x86
146 # include "vmStructs_bsd_x86.hpp" 149 # include "vmStructs_bsd_x86.hpp"
147 #endif 150 #endif
148 #ifdef TARGET_OS_ARCH_bsd_zero 151 #ifdef TARGET_OS_ARCH_bsd_zero
149 # include "vmStructs_bsd_zero.hpp" 152 # include "vmStructs_bsd_zero.hpp"
196 # include "adfiles/adGlobals_zero.hpp" 199 # include "adfiles/adGlobals_zero.hpp"
197 #endif 200 #endif
198 #ifdef TARGET_ARCH_MODEL_arm 201 #ifdef TARGET_ARCH_MODEL_arm
199 # include "adfiles/adGlobals_arm.hpp" 202 # include "adfiles/adGlobals_arm.hpp"
200 #endif 203 #endif
201 #ifdef TARGET_ARCH_MODEL_ppc 204 #ifdef TARGET_ARCH_MODEL_ppc_32
202 # include "adfiles/adGlobals_ppc.hpp" 205 # include "adfiles/adGlobals_ppc_32.hpp"
203 #endif 206 #endif
207 #ifdef TARGET_ARCH_MODEL_ppc_64
208 # include "adfiles/adGlobals_ppc_64.hpp"
204 #endif 209 #endif
210 #endif // COMPILER2
205 211
206 // Note: the cross-product of (c1, c2, product, nonproduct, ...), 212 // Note: the cross-product of (c1, c2, product, nonproduct, ...),
207 // (nonstatic, static), and (unchecked, checked) has not been taken. 213 // (nonstatic, static), and (unchecked, checked) has not been taken.
208 // Only the macros currently needed have been defined. 214 // Only the macros currently needed have been defined.
209 215
1812 declare_c2_type(CastX2PNode, Node) \ 1818 declare_c2_type(CastX2PNode, Node) \
1813 declare_c2_type(CastP2XNode, Node) \ 1819 declare_c2_type(CastP2XNode, Node) \
1814 declare_c2_type(MemBarNode, MultiNode) \ 1820 declare_c2_type(MemBarNode, MultiNode) \
1815 declare_c2_type(MemBarAcquireNode, MemBarNode) \ 1821 declare_c2_type(MemBarAcquireNode, MemBarNode) \
1816 declare_c2_type(MemBarReleaseNode, MemBarNode) \ 1822 declare_c2_type(MemBarReleaseNode, MemBarNode) \
1823 declare_c2_type(LoadFenceNode, MemBarNode) \
1824 declare_c2_type(StoreFenceNode, MemBarNode) \
1817 declare_c2_type(MemBarVolatileNode, MemBarNode) \ 1825 declare_c2_type(MemBarVolatileNode, MemBarNode) \
1818 declare_c2_type(MemBarCPUOrderNode, MemBarNode) \ 1826 declare_c2_type(MemBarCPUOrderNode, MemBarNode) \
1819 declare_c2_type(InitializeNode, MemBarNode) \ 1827 declare_c2_type(InitializeNode, MemBarNode) \
1820 declare_c2_type(ThreadLocalNode, Node) \ 1828 declare_c2_type(ThreadLocalNode, Node) \
1821 declare_c2_type(Opaque1Node, Node) \ 1829 declare_c2_type(Opaque1Node, Node) \