Mercurial > hg > graal-compiler

comparison src/share/vm/classfile/systemDictionary.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 48c1ebd24120
children ce2113326bc8
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
194 do_klass(Byte_klass, java_lang_Byte, Pre ) \ 194 do_klass(Byte_klass, java_lang_Byte, Pre ) \
195 do_klass(Short_klass, java_lang_Short, Pre ) \ 195 do_klass(Short_klass, java_lang_Short, Pre ) \
196 do_klass(Integer_klass, java_lang_Integer, Pre ) \ 196 do_klass(Integer_klass, java_lang_Integer, Pre ) \
197 do_klass(Long_klass, java_lang_Long, Pre ) \ 197 do_klass(Long_klass, java_lang_Long, Pre ) \
198 \ 198 \
199 /* Support for Graal */ \ 199 /* Support for JVMCI */ \
200 do_klass(BitSet_klass, java_util_BitSet, Opt ) \ 200 do_klass(BitSet_klass, java_util_BitSet, Opt ) \
201 /* Graal classes. These are loaded on-demand. */ \ 201 /* JVMCI classes. These are loaded on-demand. */ \
202 GRAAL_ONLY(do_klass(Debug_klass, com_oracle_jvmci_debug_Debug, Graal)) \ 202 JVMCI_ONLY(do_klass(Debug_klass, com_oracle_jvmci_debug_Debug, Jvmci)) \
203 GRAAL_ONLY(do_klass(HotSpotCompiledCode_klass, com_oracle_jvmci_hotspot_HotSpotCompiledCode, Graal)) \ 203 JVMCI_ONLY(do_klass(HotSpotCompiledCode_klass, com_oracle_jvmci_hotspot_HotSpotCompiledCode, Jvmci)) \
204 GRAAL_ONLY(do_klass(HotSpotCompiledCode_Comment_klass, com_oracle_jvmci_hotspot_HotSpotCompiledCode_Comment, Graal)) \ 204 JVMCI_ONLY(do_klass(HotSpotCompiledCode_Comment_klass, com_oracle_jvmci_hotspot_HotSpotCompiledCode_Comment, Jvmci)) \
205 GRAAL_ONLY(do_klass(HotSpotCompiledNmethod_klass, com_oracle_jvmci_hotspot_HotSpotCompiledNmethod, Graal)) \ 205 JVMCI_ONLY(do_klass(HotSpotCompiledNmethod_klass, com_oracle_jvmci_hotspot_HotSpotCompiledNmethod, Jvmci)) \
206 GRAAL_ONLY(do_klass(HotSpotForeignCallTarget_klass, com_oracle_jvmci_hotspot_HotSpotForeignCallTarget, Graal)) \ 206 JVMCI_ONLY(do_klass(HotSpotForeignCallTarget_klass, com_oracle_jvmci_hotspot_HotSpotForeignCallTarget, Jvmci)) \
207 GRAAL_ONLY(do_klass(HotSpotReferenceMap_klass, com_oracle_jvmci_hotspot_HotSpotReferenceMap, Graal)) \ 207 JVMCI_ONLY(do_klass(HotSpotReferenceMap_klass, com_oracle_jvmci_hotspot_HotSpotReferenceMap, Jvmci)) \
208 GRAAL_ONLY(do_klass(HotSpotOopMap_klass, com_oracle_jvmci_hotspot_HotSpotReferenceMap_HotSpotOopMap, Graal)) \ 208 JVMCI_ONLY(do_klass(HotSpotOopMap_klass, com_oracle_jvmci_hotspot_HotSpotReferenceMap_HotSpotOopMap, Jvmci)) \
209 GRAAL_ONLY(do_klass(HotSpotInstalledCode_klass, com_oracle_jvmci_hotspot_HotSpotInstalledCode, Graal)) \ 209 JVMCI_ONLY(do_klass(HotSpotInstalledCode_klass, com_oracle_jvmci_hotspot_HotSpotInstalledCode, Jvmci)) \
210 GRAAL_ONLY(do_klass(HotSpotNmethod_klass, com_oracle_jvmci_hotspot_HotSpotNmethod, Graal)) \ 210 JVMCI_ONLY(do_klass(HotSpotNmethod_klass, com_oracle_jvmci_hotspot_HotSpotNmethod, Jvmci)) \
211 GRAAL_ONLY(do_klass(HotSpotResolvedJavaMethodImpl_klass, com_oracle_jvmci_hotspot_HotSpotResolvedJavaMethodImpl, Graal)) \ 211 JVMCI_ONLY(do_klass(HotSpotResolvedJavaMethodImpl_klass, com_oracle_jvmci_hotspot_HotSpotResolvedJavaMethodImpl, Jvmci)) \
212 GRAAL_ONLY(do_klass(HotSpotResolvedObjectTypeImpl_klass, com_oracle_jvmci_hotspot_HotSpotResolvedObjectTypeImpl, Graal)) \ 212 JVMCI_ONLY(do_klass(HotSpotResolvedObjectTypeImpl_klass, com_oracle_jvmci_hotspot_HotSpotResolvedObjectTypeImpl, Jvmci)) \
213 GRAAL_ONLY(do_klass(HotSpotCompressedNullConstant_klass, com_oracle_jvmci_hotspot_HotSpotCompressedNullConstant, Graal)) \ 213 JVMCI_ONLY(do_klass(HotSpotCompressedNullConstant_klass, com_oracle_jvmci_hotspot_HotSpotCompressedNullConstant, Jvmci)) \
214 GRAAL_ONLY(do_klass(HotSpotObjectConstantImpl_klass, com_oracle_jvmci_hotspot_HotSpotObjectConstantImpl, Graal)) \ 214 JVMCI_ONLY(do_klass(HotSpotObjectConstantImpl_klass, com_oracle_jvmci_hotspot_HotSpotObjectConstantImpl, Jvmci)) \
215 GRAAL_ONLY(do_klass(HotSpotMetaspaceConstantImpl_klass, com_oracle_jvmci_hotspot_HotSpotMetaspaceConstantImpl, Graal)) \ 215 JVMCI_ONLY(do_klass(HotSpotMetaspaceConstantImpl_klass, com_oracle_jvmci_hotspot_HotSpotMetaspaceConstantImpl, Jvmci)) \
216 GRAAL_ONLY(do_klass(HotSpotStackFrameReference_klass, com_oracle_jvmci_hotspot_HotSpotStackFrameReference, Graal)) \ 216 JVMCI_ONLY(do_klass(HotSpotStackFrameReference_klass, com_oracle_jvmci_hotspot_HotSpotStackFrameReference, Jvmci)) \
217 GRAAL_ONLY(do_klass(CompilationTask_klass, com_oracle_graal_hotspot_CompilationTask, Graal)) \ 217 JVMCI_ONLY(do_klass(CompilationTask_klass, com_oracle_graal_hotspot_CompilationTask, Jvmci)) \
218 GRAAL_ONLY(do_klass(Assumptions_ConcreteMethod_klass, com_oracle_jvmci_meta_Assumptions_ConcreteMethod, Graal)) \ 218 JVMCI_ONLY(do_klass(Assumptions_ConcreteMethod_klass, com_oracle_jvmci_meta_Assumptions_ConcreteMethod, Jvmci)) \
219 GRAAL_ONLY(do_klass(Assumptions_NoFinalizableSubclass_klass, com_oracle_jvmci_meta_Assumptions_NoFinalizableSubclass, Graal))\ 219 JVMCI_ONLY(do_klass(Assumptions_NoFinalizableSubclass_klass, com_oracle_jvmci_meta_Assumptions_NoFinalizableSubclass, Jvmci))\
220 GRAAL_ONLY(do_klass(Assumptions_ConcreteSubtype_klass, com_oracle_jvmci_meta_Assumptions_ConcreteSubtype, Graal)) \ 220 JVMCI_ONLY(do_klass(Assumptions_ConcreteSubtype_klass, com_oracle_jvmci_meta_Assumptions_ConcreteSubtype, Jvmci)) \
221 GRAAL_ONLY(do_klass(Assumptions_LeafType_klass, com_oracle_jvmci_meta_Assumptions_LeafType, Graal)) \ 221 JVMCI_ONLY(do_klass(Assumptions_LeafType_klass, com_oracle_jvmci_meta_Assumptions_LeafType, Jvmci)) \
222 GRAAL_ONLY(do_klass(Assumptions_CallSiteTargetValue_klass, com_oracle_jvmci_meta_Assumptions_CallSiteTargetValue, Graal)) \ 222 JVMCI_ONLY(do_klass(Assumptions_CallSiteTargetValue_klass, com_oracle_jvmci_meta_Assumptions_CallSiteTargetValue, Jvmci)) \
223 GRAAL_ONLY(do_klass(BytecodePosition_klass, com_oracle_jvmci_code_BytecodePosition, Graal)) \ 223 JVMCI_ONLY(do_klass(BytecodePosition_klass, com_oracle_jvmci_code_BytecodePosition, Jvmci)) \
224 GRAAL_ONLY(do_klass(DebugInfo_klass, com_oracle_jvmci_code_DebugInfo, Graal)) \ 224 JVMCI_ONLY(do_klass(DebugInfo_klass, com_oracle_jvmci_code_DebugInfo, Jvmci)) \
225 GRAAL_ONLY(do_klass(RegisterSaveLayout_klass, com_oracle_jvmci_code_RegisterSaveLayout, Graal)) \ 225 JVMCI_ONLY(do_klass(RegisterSaveLayout_klass, com_oracle_jvmci_code_RegisterSaveLayout, Jvmci)) \
226 GRAAL_ONLY(do_klass(BytecodeFrame_klass, com_oracle_jvmci_code_BytecodeFrame, Graal)) \ 226 JVMCI_ONLY(do_klass(BytecodeFrame_klass, com_oracle_jvmci_code_BytecodeFrame, Jvmci)) \
227 GRAAL_ONLY(do_klass(CompilationResult_klass, com_oracle_jvmci_code_CompilationResult, Graal)) \ 227 JVMCI_ONLY(do_klass(CompilationResult_klass, com_oracle_jvmci_code_CompilationResult, Jvmci)) \
228 GRAAL_ONLY(do_klass(CompilationResult_Call_klass, com_oracle_jvmci_code_CompilationResult_Call, Graal)) \ 228 JVMCI_ONLY(do_klass(CompilationResult_Call_klass, com_oracle_jvmci_code_CompilationResult_Call, Jvmci)) \
229 GRAAL_ONLY(do_klass(CompilationResult_ConstantReference_klass, com_oracle_jvmci_code_CompilationResult_ConstantReference, Graal)) \ 229 JVMCI_ONLY(do_klass(CompilationResult_ConstantReference_klass, com_oracle_jvmci_code_CompilationResult_ConstantReference, Jvmci)) \
230 GRAAL_ONLY(do_klass(CompilationResult_DataPatch_klass, com_oracle_jvmci_code_CompilationResult_DataPatch, Graal)) \ 230 JVMCI_ONLY(do_klass(CompilationResult_DataPatch_klass, com_oracle_jvmci_code_CompilationResult_DataPatch, Jvmci)) \
231 GRAAL_ONLY(do_klass(CompilationResult_DataSectionReference_klass, com_oracle_jvmci_code_CompilationResult_DataSectionReference, Graal)) \ 231 JVMCI_ONLY(do_klass(CompilationResult_DataSectionReference_klass, com_oracle_jvmci_code_CompilationResult_DataSectionReference, Jvmci)) \
232 GRAAL_ONLY(do_klass(CompilationResult_ExceptionHandler_klass, com_oracle_jvmci_code_CompilationResult_ExceptionHandler, Graal))\ 232 JVMCI_ONLY(do_klass(CompilationResult_ExceptionHandler_klass, com_oracle_jvmci_code_CompilationResult_ExceptionHandler, Jvmci))\
233 GRAAL_ONLY(do_klass(CompilationResult_Mark_klass, com_oracle_jvmci_code_CompilationResult_Mark, Graal)) \ 233 JVMCI_ONLY(do_klass(CompilationResult_Mark_klass, com_oracle_jvmci_code_CompilationResult_Mark, Jvmci)) \
234 GRAAL_ONLY(do_klass(CompilationResult_Infopoint_klass, com_oracle_jvmci_code_CompilationResult_Infopoint, Graal)) \ 234 JVMCI_ONLY(do_klass(CompilationResult_Infopoint_klass, com_oracle_jvmci_code_CompilationResult_Infopoint, Jvmci)) \
235 GRAAL_ONLY(do_klass(CompilationResult_Site_klass, com_oracle_jvmci_code_CompilationResult_Site, Graal)) \ 235 JVMCI_ONLY(do_klass(CompilationResult_Site_klass, com_oracle_jvmci_code_CompilationResult_Site, Jvmci)) \
236 GRAAL_ONLY(do_klass(InfopointReason_klass, com_oracle_jvmci_code_InfopointReason, Graal)) \ 236 JVMCI_ONLY(do_klass(InfopointReason_klass, com_oracle_jvmci_code_InfopointReason, Jvmci)) \
237 GRAAL_ONLY(do_klass(InstalledCode_klass, com_oracle_jvmci_code_InstalledCode, Graal)) \ 237 JVMCI_ONLY(do_klass(InstalledCode_klass, com_oracle_jvmci_code_InstalledCode, Jvmci)) \
238 GRAAL_ONLY(do_klass(code_Register_klass, com_oracle_jvmci_code_Register, Graal)) \ 238 JVMCI_ONLY(do_klass(code_Register_klass, com_oracle_jvmci_code_Register, Jvmci)) \
239 GRAAL_ONLY(do_klass(RegisterValue_klass, com_oracle_jvmci_code_RegisterValue, Graal)) \ 239 JVMCI_ONLY(do_klass(RegisterValue_klass, com_oracle_jvmci_code_RegisterValue, Jvmci)) \
240 GRAAL_ONLY(do_klass(RegisterCategory_klass, com_oracle_jvmci_code_Register_RegisterCategory, Graal)) \ 240 JVMCI_ONLY(do_klass(RegisterCategory_klass, com_oracle_jvmci_code_Register_RegisterCategory, Jvmci)) \
241 GRAAL_ONLY(do_klass(StackSlot_klass, com_oracle_jvmci_code_StackSlot, Graal)) \ 241 JVMCI_ONLY(do_klass(StackSlot_klass, com_oracle_jvmci_code_StackSlot, Jvmci)) \
242 GRAAL_ONLY(do_klass(StackLockValue_klass, com_oracle_jvmci_code_StackLockValue, Graal)) \ 242 JVMCI_ONLY(do_klass(StackLockValue_klass, com_oracle_jvmci_code_StackLockValue, Jvmci)) \
243 GRAAL_ONLY(do_klass(VirtualObject_klass, com_oracle_jvmci_code_VirtualObject, Graal)) \ 243 JVMCI_ONLY(do_klass(VirtualObject_klass, com_oracle_jvmci_code_VirtualObject, Jvmci)) \
244 GRAAL_ONLY(do_klass(SpeculationLog_klass, com_oracle_jvmci_code_SpeculationLog, Graal)) \ 244 JVMCI_ONLY(do_klass(SpeculationLog_klass, com_oracle_jvmci_code_SpeculationLog, Jvmci)) \
245 GRAAL_ONLY(do_klass(JavaConstant_klass, com_oracle_jvmci_meta_JavaConstant, Graal)) \ 245 JVMCI_ONLY(do_klass(JavaConstant_klass, com_oracle_jvmci_meta_JavaConstant, Jvmci)) \
246 GRAAL_ONLY(do_klass(PrimitiveConstant_klass, com_oracle_jvmci_meta_PrimitiveConstant, Graal)) \ 246 JVMCI_ONLY(do_klass(PrimitiveConstant_klass, com_oracle_jvmci_meta_PrimitiveConstant, Jvmci)) \
247 GRAAL_ONLY(do_klass(RawConstant_klass, com_oracle_jvmci_meta_RawConstant, Graal)) \ 247 JVMCI_ONLY(do_klass(RawConstant_klass, com_oracle_jvmci_meta_RawConstant, Jvmci)) \
248 GRAAL_ONLY(do_klass(NullConstant_klass, com_oracle_jvmci_meta_NullConstant, Graal)) \ 248 JVMCI_ONLY(do_klass(NullConstant_klass, com_oracle_jvmci_meta_NullConstant, Jvmci)) \
249 GRAAL_ONLY(do_klass(ExceptionHandler_klass, com_oracle_jvmci_meta_ExceptionHandler, Graal)) \ 249 JVMCI_ONLY(do_klass(ExceptionHandler_klass, com_oracle_jvmci_meta_ExceptionHandler, Jvmci)) \
250 GRAAL_ONLY(do_klass(Kind_klass, com_oracle_jvmci_meta_Kind, Graal)) \ 250 JVMCI_ONLY(do_klass(Kind_klass, com_oracle_jvmci_meta_Kind, Jvmci)) \
251 GRAAL_ONLY(do_klass(LIRKind_klass, com_oracle_jvmci_meta_LIRKind, Graal)) \ 251 JVMCI_ONLY(do_klass(LIRKind_klass, com_oracle_jvmci_meta_LIRKind, Jvmci)) \
252 GRAAL_ONLY(do_klass(JavaMethod_klass, com_oracle_jvmci_meta_JavaMethod, Graal)) \ 252 JVMCI_ONLY(do_klass(JavaMethod_klass, com_oracle_jvmci_meta_JavaMethod, Jvmci)) \
253 GRAAL_ONLY(do_klass(JavaType_klass, com_oracle_jvmci_meta_JavaType, Graal)) \ 253 JVMCI_ONLY(do_klass(JavaType_klass, com_oracle_jvmci_meta_JavaType, Jvmci)) \
254 GRAAL_ONLY(do_klass(AbstractValue_klass, com_oracle_jvmci_meta_AbstractValue, Graal)) \ 254 JVMCI_ONLY(do_klass(AbstractValue_klass, com_oracle_jvmci_meta_AbstractValue, Jvmci)) \
255 255
256 /*end*/ 256 /*end*/
257 257
258 258
259 class SystemDictionary : AllStatic { 259 class SystemDictionary : AllStatic {
268 WK_KLASSES_DO(WK_KLASS_ENUM) 268 WK_KLASSES_DO(WK_KLASS_ENUM)
269 #undef WK_KLASS_ENUM 269 #undef WK_KLASS_ENUM
270 270
271 WKID_LIMIT, 271 WKID_LIMIT,
272 272
273 #ifdef GRAAL 273 #ifdef JVMCI
274 FIRST_GRAAL_WKID = WK_KLASS_ENUM_NAME(Debug_klass), 274 FIRST_JVMCI_WKID = WK_KLASS_ENUM_NAME(Debug_klass),
275 LAST_GRAAL_WKID = WK_KLASS_ENUM_NAME(AbstractValue_klass), 275 LAST_JVMCI_WKID = WK_KLASS_ENUM_NAME(AbstractValue_klass),
276 #endif 276 #endif
277 277
278 FIRST_WKID = NO_WKID + 1 278 FIRST_WKID = NO_WKID + 1
279 }; 279 };
280 280
286 // Options after this point will use resolve_or_null instead. 286 // Options after this point will use resolve_or_null instead.
287 287
288 Opt, // preload tried; NULL if not present 288 Opt, // preload tried; NULL if not present
289 Opt_Only_JDK14NewRef, // preload tried; use only with NewReflection 289 Opt_Only_JDK14NewRef, // preload tried; use only with NewReflection
290 Opt_Only_JDK15, // preload tried; use only with JDK1.5+ 290 Opt_Only_JDK15, // preload tried; use only with JDK1.5+
291 #ifdef GRAAL 291 #ifdef JVMCI
292 Graal, // preload tried; error if not present, use only with GRAAL 292 Jvmci, // preload tried; error if not present, use only with JVMCI
293 #endif 293 #endif
294 OPTION_LIMIT, 294 OPTION_LIMIT,
295 CEIL_LG_OPTION_LIMIT = 4 // OPTION_LIMIT <= (1<<CEIL_LG_OPTION_LIMIT) 295 CEIL_LG_OPTION_LIMIT = 4 // OPTION_LIMIT <= (1<<CEIL_LG_OPTION_LIMIT)
296 }; 296 };
297 297
478 static Klass* check_klass_Opt_Only_JDK14NewRef(Klass* k) { 478 static Klass* check_klass_Opt_Only_JDK14NewRef(Klass* k) {
479 assert(JDK_Version::is_gte_jdk14x_version() && UseNewReflection, "JDK 1.4 only"); 479 assert(JDK_Version::is_gte_jdk14x_version() && UseNewReflection, "JDK 1.4 only");
480 // despite the optional loading, if you use this it must be present: 480 // despite the optional loading, if you use this it must be present:
481 return check_klass(k); 481 return check_klass(k);
482 } 482 }
483 #ifdef GRAAL 483 #ifdef JVMCI
484 static Klass* check_klass_Graal(Klass* k) { return k; } 484 static Klass* check_klass_Jvmci(Klass* k) { return k; }
485 #endif 485 #endif
486 486
487 static bool initialize_wk_klass(WKID id, int init_opt, TRAPS); 487 static bool initialize_wk_klass(WKID id, int init_opt, TRAPS);
488 static void initialize_wk_klasses_until(WKID limit_id, WKID &start_id, TRAPS); 488 static void initialize_wk_klasses_until(WKID limit_id, WKID &start_id, TRAPS);
489 static void initialize_wk_klasses_through(WKID end_id, WKID &start_id, TRAPS) { 489 static void initialize_wk_klasses_through(WKID end_id, WKID &start_id, TRAPS) {
546 static bool ClassLoader_klass_loaded() { return WK_KLASS(ClassLoader_klass) != NULL; } 546 static bool ClassLoader_klass_loaded() { return WK_KLASS(ClassLoader_klass) != NULL; }
547 547
548 // Returns default system loader 548 // Returns default system loader
549 static oop java_system_loader(); 549 static oop java_system_loader();
550 550
551 #ifdef GRAAL 551 #ifdef JVMCI
552 // Returns the Graal loader. This will be NULL if !UseGraalClassLoader 552 // Returns the JVMCI loader. This will be NULL if !UseJVMCIClassLoader
553 // in which case it's equivalent to the boot loader 553 // in which case it's equivalent to the boot loader
554 static oop graal_loader(); 554 static oop jvmci_loader();
555 // Sets the Graal loader. This is called at most once. 555 // Sets the JVMCI loader. This is called at most once.
556 static void init_graal_loader(oop loader); 556 static void init_jvmci_loader(oop loader);
557 #endif 557 #endif
558 558
559 // Compute the default system loader 559 // Compute the default system loader
560 static void compute_java_system_loader(TRAPS); 560 static void compute_java_system_loader(TRAPS);
561 561
784 784
785 // table of box klasses (int_klass, etc.) 785 // table of box klasses (int_klass, etc.)
786 static Klass* _box_klasses[T_VOID+1]; 786 static Klass* _box_klasses[T_VOID+1];
787 787
788 static oop _java_system_loader; 788 static oop _java_system_loader;
789 #ifdef GRAAL 789 #ifdef JVMCI
790 static oop _graal_loader; 790 static oop _jvmci_loader;
791 #endif 791 #endif
792 792
793 static bool _has_loadClassInternal; 793 static bool _has_loadClassInternal;
794 static bool _has_checkPackageAccess; 794 static bool _has_checkPackageAccess;
795 }; 795 };