Mercurial > hg > truffle
comparison src/share/vm/runtime/globals.hpp @ 21559:be896a1983c0
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 | 8d4496e10a51 |
children |
comparison
equal
deleted
inserted
replaced
21558:d563baeca9df | 21559:be896a1983c0 |
---|---|
127 #endif | 127 #endif |
128 #ifdef TARGET_OS_FAMILY_bsd | 128 #ifdef TARGET_OS_FAMILY_bsd |
129 # include "c1_globals_bsd.hpp" | 129 # include "c1_globals_bsd.hpp" |
130 #endif | 130 #endif |
131 #endif | 131 #endif |
132 #ifdef COMPILERGRAAL | 132 #ifdef COMPILERJVMCI |
133 #ifdef TARGET_ARCH_x86 | 133 #ifdef TARGET_ARCH_x86 |
134 # include "graalGlobals_x86.hpp" | 134 # include "jvmciGlobals_x86.hpp" |
135 #endif | 135 #endif |
136 #ifdef TARGET_ARCH_sparc | 136 #ifdef TARGET_ARCH_sparc |
137 # include "graalGlobals_sparc.hpp" | 137 # include "jvmciGlobals_sparc.hpp" |
138 #endif | 138 #endif |
139 #ifdef TARGET_ARCH_arm | 139 #ifdef TARGET_ARCH_arm |
140 # include "graalGlobals_arm.hpp" | 140 # include "jvmciGlobals_arm.hpp" |
141 #endif | 141 #endif |
142 #ifdef TARGET_ARCH_ppc | 142 #ifdef TARGET_ARCH_ppc |
143 # include "graalGlobals_ppc.hpp" | 143 # include "jvmciGlobals_ppc.hpp" |
144 #endif | 144 #endif |
145 #endif // COMPILERGRAAL | 145 #endif // COMPILERJVMCI |
146 #ifdef COMPILER2 | 146 #ifdef COMPILER2 |
147 #ifdef TARGET_ARCH_x86 | 147 #ifdef TARGET_ARCH_x86 |
148 # include "c2_globals_x86.hpp" | 148 # include "c2_globals_x86.hpp" |
149 #endif | 149 #endif |
150 #ifdef TARGET_ARCH_sparc | 150 #ifdef TARGET_ARCH_sparc |
176 #ifdef TARGET_ARCH_zero | 176 #ifdef TARGET_ARCH_zero |
177 # include "shark_globals_zero.hpp" | 177 # include "shark_globals_zero.hpp" |
178 #endif | 178 #endif |
179 #endif | 179 #endif |
180 | 180 |
181 #if !defined(COMPILER1) && !defined(COMPILER2) && !defined(SHARK) && !defined(COMPILERGRAAL) | 181 #if !defined(COMPILER1) && !defined(COMPILER2) && !defined(SHARK) && !defined(COMPILERJVMCI) |
182 define_pd_global(bool, BackgroundCompilation, false); | 182 define_pd_global(bool, BackgroundCompilation, false); |
183 define_pd_global(bool, UseTLAB, false); | 183 define_pd_global(bool, UseTLAB, false); |
184 define_pd_global(bool, CICompileOSR, false); | 184 define_pd_global(bool, CICompileOSR, false); |
185 define_pd_global(bool, UseTypeProfile, false); | 185 define_pd_global(bool, UseTypeProfile, false); |
186 define_pd_global(bool, UseOnStackReplacement, false); | 186 define_pd_global(bool, UseOnStackReplacement, false); |
208 define_pd_global(bool, NeverActAsServerClassMachine, true); | 208 define_pd_global(bool, NeverActAsServerClassMachine, true); |
209 define_pd_global(uint64_t,MaxRAM, 1ULL*G); | 209 define_pd_global(uint64_t,MaxRAM, 1ULL*G); |
210 #define CI_COMPILER_COUNT 0 | 210 #define CI_COMPILER_COUNT 0 |
211 #else | 211 #else |
212 | 212 |
213 #if defined(COMPILER2) || defined(COMPILERGRAAL) | 213 #if defined(COMPILER2) || defined(COMPILERJVMCI) |
214 #define CI_COMPILER_COUNT 2 | 214 #define CI_COMPILER_COUNT 2 |
215 #else | 215 #else |
216 #define CI_COMPILER_COUNT 1 | 216 #define CI_COMPILER_COUNT 1 |
217 #endif // COMPILER2 | 217 #endif // COMPILER2 |
218 | 218 |
251 KIND_C2 = 1 << 13, | 251 KIND_C2 = 1 << 13, |
252 KIND_ARCH = 1 << 14, | 252 KIND_ARCH = 1 << 14, |
253 KIND_SHARK = 1 << 15, | 253 KIND_SHARK = 1 << 15, |
254 KIND_LP64_PRODUCT = 1 << 16, | 254 KIND_LP64_PRODUCT = 1 << 16, |
255 KIND_COMMERCIAL = 1 << 17, | 255 KIND_COMMERCIAL = 1 << 17, |
256 KIND_GRAAL = 1 << 18, | 256 KIND_JVMCI = 1 << 18, |
257 | 257 |
258 KIND_MASK = ~VALUE_ORIGIN_MASK | 258 KIND_MASK = ~VALUE_ORIGIN_MASK |
259 }; | 259 }; |
260 | 260 |
261 const char* _type; | 261 const char* _type; |
996 "Print options string passed to disassembler.so") \ | 996 "Print options string passed to disassembler.so") \ |
997 \ | 997 \ |
998 product(bool, PrintNMethodStatistics, false, \ | 998 product(bool, PrintNMethodStatistics, false, \ |
999 "Print a summary statistic for the generated nmethods") \ | 999 "Print a summary statistic for the generated nmethods") \ |
1000 \ | 1000 \ |
1001 product(bool, ShareDebugInfo, IS_GRAAL_DEFINED, \ | 1001 product(bool, ShareDebugInfo, IS_JVMCI_DEFINED, \ |
1002 "Always tries to share similar debug info inside a nmethod") \ | 1002 "Always tries to share similar debug info inside a nmethod") \ |
1003 \ | 1003 \ |
1004 diagnostic(bool, PrintNMethods, false, \ | 1004 diagnostic(bool, PrintNMethods, false, \ |
1005 "Print assembly code for nmethods when generated") \ | 1005 "Print assembly code for nmethods when generated") \ |
1006 \ | 1006 \ |
2711 \ | 2711 \ |
2712 develop(bool, DelayCompilationDuringStartup, true, \ | 2712 develop(bool, DelayCompilationDuringStartup, true, \ |
2713 "Delay invoking the compiler until main application class is " \ | 2713 "Delay invoking the compiler until main application class is " \ |
2714 "loaded") \ | 2714 "loaded") \ |
2715 \ | 2715 \ |
2716 NOT_GRAAL(develop(bool, CompileTheWorld, false, \ | 2716 NOT_JVMCI(develop(bool, CompileTheWorld, false, \ |
2717 "Compile all methods in all classes in bootstrap class path " \ | 2717 "Compile all methods in all classes in bootstrap class path " \ |
2718 "(stress test)")) \ | 2718 "(stress test)")) \ |
2719 \ | 2719 \ |
2720 GRAAL_ONLY(product(bool, CompileTheWorld, false, \ | 2720 JVMCI_ONLY(product(bool, CompileTheWorld, false, \ |
2721 "Compile all methods in all classes in bootstrap class path " \ | 2721 "Compile all methods in all classes in bootstrap class path " \ |
2722 "(stress test)")) \ | 2722 "(stress test)")) \ |
2723 \ | 2723 \ |
2724 develop(bool, CompileTheWorldPreloadClasses, true, \ | 2724 develop(bool, CompileTheWorldPreloadClasses, true, \ |
2725 "Preload all classes used by a class before start loading") \ | 2725 "Preload all classes used by a class before start loading") \ |