Mercurial > hg > truffle

comparison src/share/vm/utilities/macros.hpp @ 14124:7ad529321294

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
make: remove GRAALVM and introduce COMPILERGRAAL. fix client hosted-mode
author Bernhard Urban <bernhard.urban@jku.at>
date Mon, 10 Mar 2014 16:26:10 +0100
parents 800057208a2c
children d8041d695d19
comparison
equal deleted inserted replaced
14123:dc41eab09fe8 14124:7ad529321294
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(GRAAL) 169 #if defined(COMPILER2) || defined(COMPILERGRAAL)
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
187 #define COMPILERGRAAL_PRESENT(code) code
188 #define NOT_COMPILERGRAAL(code)
189 #else // COMPILERGRAAL
190 #define COMPILERGRAAL_PRESENT(code)
191 #define NOT_COMPILERGRAAL(code) code
192 #endif // COMPILERGRAAL
193
194 #if defined(COMPILERGRAAL) && !defined(GRAAL)
195 #error "COMPILERGRAAL needs GRAAL to be defined"
196 #endif
197
186 #ifdef GRAAL 198 #ifdef GRAAL
187 #define GRAAL_ONLY(code) code 199 #define GRAAL_ONLY(code) code
188 #define NOT_GRAAL(code) 200 #define NOT_GRAAL(code)
189 #define IS_GRAAL_DEFINED true 201 #define IS_GRAAL_DEFINED true
190 #if !defined(COMPILER2) 202 #else // GRAAL
191 // Graal is the only compiler in the system and so will be used for compilation
192 // requests issued by the compile broker.
193 #define GRAALVM
194 #define GRAALVM_ONLY(code) code
195 #define NOT_GRAALVM(code)
196 #else
197 // Graal is not the only compiler in the system and so will only be used for
198 // compilation requests issued via the Graal API
199 #define GRAALVM_ONLY(code)
200 #define NOT_GRAALVM(code) code
201 #endif
202 #else // !GRAAL
203 #define GRAAL_ONLY(code) 203 #define GRAAL_ONLY(code)
204 #define NOT_GRAAL(code) code 204 #define NOT_GRAAL(code) code
205 #define IS_GRAAL_DEFINED false 205 #define IS_GRAAL_DEFINED false
206 #define GRAALVM_ONLY(code)
207 #define NOT_GRAALVM(code) code
208 #endif // GRAAL 206 #endif // GRAAL
209 207
210 #ifdef TIERED 208 #ifdef TIERED
211 #define TIERED_ONLY(code) code 209 #define TIERED_ONLY(code) code
212 #define NOT_TIERED(code) 210 #define NOT_TIERED(code)
213 #else 211 #else // TIERED
214 #define TIERED_ONLY(code) 212 #define TIERED_ONLY(code)
215 #define NOT_TIERED(code) code 213 #define NOT_TIERED(code) code
216 #endif // TIERED 214 #endif // TIERED
217 215
218 216