Mercurial > hg > truffle

comparison src/share/vm/utilities/macros.hpp @ 21559:be896a1983c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author Doug Simon <doug.simon@oracle.com>
date Thu, 28 May 2015 15:36:48 +0200
parents 52b4284cb496
children
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
164 #define INCLUDE_TRACE 1 164 #define INCLUDE_TRACE 1
165 #endif // INCLUDE_TRACE 165 #endif // INCLUDE_TRACE
166 166
167 // COMPILER1 variant 167 // COMPILER1 variant
168 #ifdef COMPILER1 168 #ifdef COMPILER1
169 #if defined(COMPILER2) || defined(COMPILERGRAAL) 169 #if defined(COMPILER2) || defined(COMPILERJVMCI)
170 #define TIERED 170 #define TIERED
171 #endif 171 #endif
172 #define COMPILER1_PRESENT(code) code 172 #define COMPILER1_PRESENT(code) code
173 #else // COMPILER1 173 #else // COMPILER1
174 #define COMPILER1_PRESENT(code) 174 #define COMPILER1_PRESENT(code)
181 #else // COMPILER2 181 #else // COMPILER2
182 #define COMPILER2_PRESENT(code) 182 #define COMPILER2_PRESENT(code)
183 #define NOT_COMPILER2(code) code 183 #define NOT_COMPILER2(code) code
184 #endif // COMPILER2 184 #endif // COMPILER2
185 185
186 #ifdef COMPILERGRAAL 186 #ifdef COMPILERJVMCI
187 #define COMPILERGRAAL_PRESENT(code) code 187 #define COMPILERJVMCI_PRESENT(code) code
188 #define NOT_COMPILERGRAAL(code) 188 #define NOT_COMPILERJVMCI(code)
189 #else // COMPILERGRAAL 189 #else // COMPILERJVMCI
190 #define COMPILERGRAAL_PRESENT(code) 190 #define COMPILERJVMCI_PRESENT(code)
191 #define NOT_COMPILERGRAAL(code) code 191 #define NOT_COMPILERJVMCI(code) code
192 #endif // COMPILERGRAAL 192 #endif // COMPILERJVMCI
193 193
194 #if defined(COMPILERGRAAL) && !defined(GRAAL) 194 #if defined(COMPILERJVMCI) && !defined(JVMCI)
195 #error "COMPILERGRAAL needs GRAAL to be defined" 195 #error "COMPILERJVMCI needs JVMCI to be defined"
196 #endif 196 #endif
197 197
198 #ifdef GRAAL 198 #ifdef JVMCI
199 #define GRAAL_ONLY(code) code 199 #define JVMCI_ONLY(code) code
200 #define NOT_GRAAL(code) 200 #define NOT_JVMCI(code)
201 #define IS_GRAAL_DEFINED true 201 #define IS_JVMCI_DEFINED true
202 #else // GRAAL 202 #else // JVMCI
203 #define GRAAL_ONLY(code) 203 #define JVMCI_ONLY(code)
204 #define NOT_GRAAL(code) code 204 #define NOT_JVMCI(code) code
205 #define IS_GRAAL_DEFINED false 205 #define IS_JVMCI_DEFINED false
206 #endif // GRAAL 206 #endif // JVMCI
207 207
208 #ifdef TIERED 208 #ifdef TIERED
209 #define TIERED_ONLY(code) code 209 #define TIERED_ONLY(code) code
210 #define NOT_TIERED(code) 210 #define NOT_TIERED(code)
211 #else // TIERED 211 #else // TIERED