Mercurial > hg > graal-jvmci-8
changeset 22494:88ab6f037ef2
Split vmSymbols and systemDictionary JVMCI definitions off into their own file
| author | Tom Rodriguez <tom.rodriguez@oracle.com> |
|---|---|
| date | Mon, 31 Aug 2015 11:03:06 -0700 |
| parents | 63b12d69147d |
| children | 740feb10d15a |
| files | src/share/vm/classfile/systemDictionary.hpp src/share/vm/classfile/vmSymbols.hpp src/share/vm/jvmci/systemDictionary_jvmci.hpp src/share/vm/jvmci/vmSymbols_jvmci.hpp |
| diffstat | 4 files changed, 181 insertions(+), 109 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/classfile/systemDictionary.hpp Mon Aug 31 17:26:06 2015 +0200 +++ b/src/share/vm/classfile/systemDictionary.hpp Mon Aug 31 11:03:06 2015 -0700 @@ -33,6 +33,7 @@ #include "runtime/reflectionUtils.hpp" #include "utilities/hashtable.hpp" #include "utilities/hashtable.inline.hpp" +#include "jvmci/systemDictionary_jvmci.hpp" // The system dictionary stores all loaded classes and maps: @@ -196,56 +197,8 @@ do_klass(Integer_klass, java_lang_Integer, Pre ) \ do_klass(Long_klass, java_lang_Long, Pre ) \ \ - /* JVMCI classes. These are loaded on-demand. */ \ - JVMCI_ONLY(do_klass(HotSpotCompiledCode_klass, jdk_internal_jvmci_hotspot_HotSpotCompiledCode, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotCompiledCode_Comment_klass, jdk_internal_jvmci_hotspot_HotSpotCompiledCode_Comment, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotCompiledNmethod_klass, jdk_internal_jvmci_hotspot_HotSpotCompiledNmethod, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotForeignCallTarget_klass, jdk_internal_jvmci_hotspot_HotSpotForeignCallTarget, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotReferenceMap_klass, jdk_internal_jvmci_hotspot_HotSpotReferenceMap, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotInstalledCode_klass, jdk_internal_jvmci_hotspot_HotSpotInstalledCode, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotNmethod_klass, jdk_internal_jvmci_hotspot_HotSpotNmethod, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotResolvedJavaMethodImpl_klass, jdk_internal_jvmci_hotspot_HotSpotResolvedJavaMethodImpl, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotResolvedObjectTypeImpl_klass, jdk_internal_jvmci_hotspot_HotSpotResolvedObjectTypeImpl, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotCompressedNullConstant_klass, jdk_internal_jvmci_hotspot_HotSpotCompressedNullConstant, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotObjectConstantImpl_klass, jdk_internal_jvmci_hotspot_HotSpotObjectConstantImpl, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotMetaspaceConstantImpl_klass, jdk_internal_jvmci_hotspot_HotSpotMetaspaceConstantImpl, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotStackFrameReference_klass, jdk_internal_jvmci_hotspot_HotSpotStackFrameReference, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotConstantPool_klass, jdk_internal_jvmci_hotspot_HotSpotConstantPool, Jvmci)) \ - JVMCI_ONLY(do_klass(HotSpotJVMCIMetaAccessContext_klass, jdk_internal_jvmci_hotspot_HotSpotJVMCIMetaAccessContext, Jvmci)) \ - JVMCI_ONLY(do_klass(Assumptions_ConcreteMethod_klass, jdk_internal_jvmci_meta_Assumptions_ConcreteMethod, Jvmci)) \ - JVMCI_ONLY(do_klass(Assumptions_NoFinalizableSubclass_klass, jdk_internal_jvmci_meta_Assumptions_NoFinalizableSubclass, Jvmci)) \ - JVMCI_ONLY(do_klass(Assumptions_ConcreteSubtype_klass, jdk_internal_jvmci_meta_Assumptions_ConcreteSubtype, Jvmci)) \ - JVMCI_ONLY(do_klass(Assumptions_LeafType_klass, jdk_internal_jvmci_meta_Assumptions_LeafType, Jvmci)) \ - JVMCI_ONLY(do_klass(Assumptions_CallSiteTargetValue_klass, jdk_internal_jvmci_meta_Assumptions_CallSiteTargetValue, Jvmci)) \ - JVMCI_ONLY(do_klass(BytecodePosition_klass, jdk_internal_jvmci_code_BytecodePosition, Jvmci)) \ - JVMCI_ONLY(do_klass(DebugInfo_klass, jdk_internal_jvmci_code_DebugInfo, Jvmci)) \ - JVMCI_ONLY(do_klass(RegisterSaveLayout_klass, jdk_internal_jvmci_code_RegisterSaveLayout, Jvmci)) \ - JVMCI_ONLY(do_klass(BytecodeFrame_klass, jdk_internal_jvmci_code_BytecodeFrame, Jvmci)) \ - JVMCI_ONLY(do_klass(CompilationResult_Call_klass, jdk_internal_jvmci_code_CompilationResult_Call, Jvmci)) \ - JVMCI_ONLY(do_klass(CompilationResult_ConstantReference_klass, jdk_internal_jvmci_code_CompilationResult_ConstantReference, Jvmci)) \ - JVMCI_ONLY(do_klass(CompilationResult_DataPatch_klass, jdk_internal_jvmci_code_CompilationResult_DataPatch, Jvmci)) \ - JVMCI_ONLY(do_klass(CompilationResult_DataSectionReference_klass, jdk_internal_jvmci_code_CompilationResult_DataSectionReference, Jvmci)) \ - JVMCI_ONLY(do_klass(CompilationResult_ExceptionHandler_klass, jdk_internal_jvmci_code_CompilationResult_ExceptionHandler, Jvmci))\ - JVMCI_ONLY(do_klass(CompilationResult_Mark_klass, jdk_internal_jvmci_code_CompilationResult_Mark, Jvmci)) \ - JVMCI_ONLY(do_klass(CompilationResult_Infopoint_klass, jdk_internal_jvmci_code_CompilationResult_Infopoint, Jvmci)) \ - JVMCI_ONLY(do_klass(CompilationResult_Site_klass, jdk_internal_jvmci_code_CompilationResult_Site, Jvmci)) \ - JVMCI_ONLY(do_klass(InfopointReason_klass, jdk_internal_jvmci_code_InfopointReason, Jvmci)) \ - JVMCI_ONLY(do_klass(InstalledCode_klass, jdk_internal_jvmci_code_InstalledCode, Jvmci)) \ - JVMCI_ONLY(do_klass(code_Location_klass, jdk_internal_jvmci_code_Location, Jvmci)) \ - JVMCI_ONLY(do_klass(code_Register_klass, jdk_internal_jvmci_code_Register, Jvmci)) \ - JVMCI_ONLY(do_klass(RegisterValue_klass, jdk_internal_jvmci_code_RegisterValue, Jvmci)) \ - JVMCI_ONLY(do_klass(StackSlot_klass, jdk_internal_jvmci_code_StackSlot, Jvmci)) \ - JVMCI_ONLY(do_klass(StackLockValue_klass, jdk_internal_jvmci_code_StackLockValue, Jvmci)) \ - JVMCI_ONLY(do_klass(VirtualObject_klass, jdk_internal_jvmci_code_VirtualObject, Jvmci)) \ - JVMCI_ONLY(do_klass(SpeculationLog_klass, jdk_internal_jvmci_meta_SpeculationLog, Jvmci)) \ - JVMCI_ONLY(do_klass(JavaConstant_klass, jdk_internal_jvmci_meta_JavaConstant, Jvmci)) \ - JVMCI_ONLY(do_klass(PrimitiveConstant_klass, jdk_internal_jvmci_meta_PrimitiveConstant, Jvmci)) \ - JVMCI_ONLY(do_klass(RawConstant_klass, jdk_internal_jvmci_meta_RawConstant, Jvmci)) \ - JVMCI_ONLY(do_klass(NullConstant_klass, jdk_internal_jvmci_meta_NullConstant, Jvmci)) \ - JVMCI_ONLY(do_klass(ExceptionHandler_klass, jdk_internal_jvmci_meta_ExceptionHandler, Jvmci)) \ - JVMCI_ONLY(do_klass(Kind_klass, jdk_internal_jvmci_meta_Kind, Jvmci)) \ - JVMCI_ONLY(do_klass(LIRKind_klass, jdk_internal_jvmci_meta_LIRKind, Jvmci)) \ - JVMCI_ONLY(do_klass(AbstractValue_klass, jdk_internal_jvmci_meta_AbstractValue, Jvmci)) \ + /* JVMCI classes. These are loaded on-demand. */ \ + JVMCI_WK_KLASSES_DO(do_klass) \ /*end*/
--- a/src/share/vm/classfile/vmSymbols.hpp Mon Aug 31 17:26:06 2015 +0200 +++ b/src/share/vm/classfile/vmSymbols.hpp Mon Aug 31 11:03:06 2015 -0700 @@ -28,6 +28,7 @@ #include "oops/symbol.hpp" #include "memory/iterator.hpp" #include "trace/traceMacros.hpp" +#include "jvmci/vmSymbols_jvmci.hpp" // The class vmSymbols is a name space for fast lookup of // symbols commonly used in the VM. @@ -44,7 +45,6 @@ #define VM_SYMBOL_IGNORE(id, name) /*ignored*/ #define VM_ALIAS_IGNORE(id, id2) /*ignored*/ - // Mapping function names to values. New entries should be added below. #define VM_SYMBOLS_DO(template, do_alias) \ @@ -299,64 +299,7 @@ template(selectAlternative_signature, "(ZLjava/lang/invoke/MethodHandle;Ljava/lang/invoke/MethodHandle;)Ljava/lang/invoke/MethodHandle;") \ \ /* Support for JVMCI */ \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotCompiledCode, "jdk/internal/jvmci/hotspot/HotSpotCompiledCode")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotCompiledCode_Comment, "jdk/internal/jvmci/hotspot/HotSpotCompiledCode$Comment")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotCompiledNmethod, "jdk/internal/jvmci/hotspot/HotSpotCompiledNmethod")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotForeignCallTarget, "jdk/internal/jvmci/hotspot/HotSpotForeignCallTarget")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotReferenceMap, "jdk/internal/jvmci/hotspot/HotSpotReferenceMap")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_CompilerToVMImpl, "jdk/internal/jvmci/hotspot/CompilerToVMImpl")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotInstalledCode, "jdk/internal/jvmci/hotspot/HotSpotInstalledCode")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotNmethod, "jdk/internal/jvmci/hotspot/HotSpotNmethod")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotResolvedJavaMethodImpl, "jdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethodImpl")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotResolvedObjectTypeImpl, "jdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotCompressedNullConstant, "jdk/internal/jvmci/hotspot/HotSpotCompressedNullConstant")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotObjectConstantImpl, "jdk/internal/jvmci/hotspot/HotSpotObjectConstantImpl")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotMetaspaceConstantImpl, "jdk/internal/jvmci/hotspot/HotSpotMetaspaceConstantImpl")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotStackFrameReference, "jdk/internal/jvmci/hotspot/HotSpotStackFrameReference")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotConstantPool, "jdk/internal/jvmci/hotspot/HotSpotConstantPool")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_HotSpotJVMCIMetaAccessContext, "jdk/internal/jvmci/hotspot/HotSpotJVMCIMetaAccessContext")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_JavaConstant, "jdk/internal/jvmci/meta/JavaConstant")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_PrimitiveConstant, "jdk/internal/jvmci/meta/PrimitiveConstant")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_RawConstant, "jdk/internal/jvmci/meta/RawConstant")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_NullConstant, "jdk/internal/jvmci/meta/NullConstant")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_ExceptionHandler, "jdk/internal/jvmci/meta/ExceptionHandler")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_Kind, "jdk/internal/jvmci/meta/Kind")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_LIRKind, "jdk/internal/jvmci/meta/LIRKind")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_AbstractValue, "jdk/internal/jvmci/meta/AbstractValue")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_Assumptions_ConcreteSubtype, "jdk/internal/jvmci/meta/Assumptions$ConcreteSubtype")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_Assumptions_LeafType, "jdk/internal/jvmci/meta/Assumptions$LeafType")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_Assumptions_NoFinalizableSubclass, "jdk/internal/jvmci/meta/Assumptions$NoFinalizableSubclass")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_Assumptions_ConcreteMethod, "jdk/internal/jvmci/meta/Assumptions$ConcreteMethod")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_Assumptions_CallSiteTargetValue, "jdk/internal/jvmci/meta/Assumptions$CallSiteTargetValue")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_meta_SpeculationLog, "jdk/internal/jvmci/meta/SpeculationLog")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_CompilationResult_Call, "jdk/internal/jvmci/code/CompilationResult$Call")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_CompilationResult_ConstantReference, "jdk/internal/jvmci/code/CompilationResult$ConstantReference")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_CompilationResult_DataPatch, "jdk/internal/jvmci/code/CompilationResult$DataPatch")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_CompilationResult_DataSectionReference, "jdk/internal/jvmci/code/CompilationResult$DataSectionReference")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_CompilationResult_ExceptionHandler, "jdk/internal/jvmci/code/CompilationResult$ExceptionHandler")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_CompilationResult_Mark, "jdk/internal/jvmci/code/CompilationResult$Mark")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_CompilationResult_Infopoint, "jdk/internal/jvmci/code/CompilationResult$Infopoint")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_CompilationResult_Site, "jdk/internal/jvmci/code/CompilationResult$Site")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_InfopointReason, "jdk/internal/jvmci/code/InfopointReason")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_InstalledCode, "jdk/internal/jvmci/code/InstalledCode")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_BytecodeFrame, "jdk/internal/jvmci/code/BytecodeFrame")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_BytecodePosition, "jdk/internal/jvmci/code/BytecodePosition")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_DebugInfo, "jdk/internal/jvmci/code/DebugInfo")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_Location, "jdk/internal/jvmci/code/Location")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_Register, "jdk/internal/jvmci/code/Register")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_RegisterValue, "jdk/internal/jvmci/code/RegisterValue")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_StackSlot, "jdk/internal/jvmci/code/StackSlot")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_StackLockValue, "jdk/internal/jvmci/code/StackLockValue")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_VirtualObject, "jdk/internal/jvmci/code/VirtualObject")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_RegisterSaveLayout, "jdk/internal/jvmci/code/RegisterSaveLayout")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_code_InvalidInstalledCodeException, "jdk/internal/jvmci/code/InvalidInstalledCodeException")) \ - JVMCI_ONLY(template(compileMethod_name, "compileMethod")) \ - JVMCI_ONLY(template(compileMethod_signature, "(Ljdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethod;IJI)V")) \ - JVMCI_ONLY(template(fromMetaspace_name, "fromMetaspace")) \ - JVMCI_ONLY(template(method_fromMetaspace_signature, "(J)Ljdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethod;")) \ - JVMCI_ONLY(template(constantPool_fromMetaspace_signature, "(J)Ljdk/internal/jvmci/hotspot/HotSpotConstantPool;")) \ - JVMCI_ONLY(template(klass_fromMetaspace_signature, "(Ljava/lang/Class;)Ljdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl;")) \ - JVMCI_ONLY(template(jdk_internal_jvmci_hotspot_Stable_signature, "Ljdk/internal/jvmci/hotspot/Stable;")) \ + JVMCI_VM_SYMBOLS_DO(template, do_alias) \ \ /* common method and field names */ \ template(object_initializer_name, "<init>") \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/vm/jvmci/systemDictionary_jvmci.hpp Mon Aug 31 11:03:06 2015 -0700 @@ -0,0 +1,84 @@ +/* + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#ifndef SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP +#define SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP + +#if !INCLUDE_JVMCI +#define JVMCI_WK_KLASSES_DO(do_klass) +#else +#define JVMCI_WK_KLASSES_DO(do_klass) \ + /* JVMCI classes. These are loaded on-demand. */ \ + do_klass(HotSpotCompiledCode_klass, jdk_internal_jvmci_hotspot_HotSpotCompiledCode, Jvmci) \ + do_klass(HotSpotCompiledCode_Comment_klass, jdk_internal_jvmci_hotspot_HotSpotCompiledCode_Comment, Jvmci) \ + do_klass(HotSpotCompiledNmethod_klass, jdk_internal_jvmci_hotspot_HotSpotCompiledNmethod, Jvmci) \ + do_klass(HotSpotForeignCallTarget_klass, jdk_internal_jvmci_hotspot_HotSpotForeignCallTarget, Jvmci) \ + do_klass(HotSpotReferenceMap_klass, jdk_internal_jvmci_hotspot_HotSpotReferenceMap, Jvmci) \ + do_klass(HotSpotInstalledCode_klass, jdk_internal_jvmci_hotspot_HotSpotInstalledCode, Jvmci) \ + do_klass(HotSpotNmethod_klass, jdk_internal_jvmci_hotspot_HotSpotNmethod, Jvmci) \ + do_klass(HotSpotResolvedJavaMethodImpl_klass, jdk_internal_jvmci_hotspot_HotSpotResolvedJavaMethodImpl, Jvmci) \ + do_klass(HotSpotResolvedObjectTypeImpl_klass, jdk_internal_jvmci_hotspot_HotSpotResolvedObjectTypeImpl, Jvmci) \ + do_klass(HotSpotCompressedNullConstant_klass, jdk_internal_jvmci_hotspot_HotSpotCompressedNullConstant, Jvmci) \ + do_klass(HotSpotObjectConstantImpl_klass, jdk_internal_jvmci_hotspot_HotSpotObjectConstantImpl, Jvmci) \ + do_klass(HotSpotMetaspaceConstantImpl_klass, jdk_internal_jvmci_hotspot_HotSpotMetaspaceConstantImpl, Jvmci) \ + do_klass(HotSpotStackFrameReference_klass, jdk_internal_jvmci_hotspot_HotSpotStackFrameReference, Jvmci) \ + do_klass(HotSpotConstantPool_klass, jdk_internal_jvmci_hotspot_HotSpotConstantPool, Jvmci) \ + do_klass(HotSpotJVMCIMetaAccessContext_klass, jdk_internal_jvmci_hotspot_HotSpotJVMCIMetaAccessContext, Jvmci) \ + do_klass(Assumptions_ConcreteMethod_klass, jdk_internal_jvmci_meta_Assumptions_ConcreteMethod, Jvmci) \ + do_klass(Assumptions_NoFinalizableSubclass_klass, jdk_internal_jvmci_meta_Assumptions_NoFinalizableSubclass, Jvmci) \ + do_klass(Assumptions_ConcreteSubtype_klass, jdk_internal_jvmci_meta_Assumptions_ConcreteSubtype, Jvmci) \ + do_klass(Assumptions_LeafType_klass, jdk_internal_jvmci_meta_Assumptions_LeafType, Jvmci) \ + do_klass(Assumptions_CallSiteTargetValue_klass, jdk_internal_jvmci_meta_Assumptions_CallSiteTargetValue, Jvmci) \ + do_klass(BytecodePosition_klass, jdk_internal_jvmci_code_BytecodePosition, Jvmci) \ + do_klass(DebugInfo_klass, jdk_internal_jvmci_code_DebugInfo, Jvmci) \ + do_klass(RegisterSaveLayout_klass, jdk_internal_jvmci_code_RegisterSaveLayout, Jvmci) \ + do_klass(BytecodeFrame_klass, jdk_internal_jvmci_code_BytecodeFrame, Jvmci) \ + do_klass(CompilationResult_Call_klass, jdk_internal_jvmci_code_CompilationResult_Call, Jvmci) \ + do_klass(CompilationResult_ConstantReference_klass, jdk_internal_jvmci_code_CompilationResult_ConstantReference, Jvmci) \ + do_klass(CompilationResult_DataPatch_klass, jdk_internal_jvmci_code_CompilationResult_DataPatch, Jvmci) \ + do_klass(CompilationResult_DataSectionReference_klass, jdk_internal_jvmci_code_CompilationResult_DataSectionReference, Jvmci) \ + do_klass(CompilationResult_ExceptionHandler_klass, jdk_internal_jvmci_code_CompilationResult_ExceptionHandler, Jvmci) \ + do_klass(CompilationResult_Mark_klass, jdk_internal_jvmci_code_CompilationResult_Mark, Jvmci) \ + do_klass(CompilationResult_Infopoint_klass, jdk_internal_jvmci_code_CompilationResult_Infopoint, Jvmci) \ + do_klass(CompilationResult_Site_klass, jdk_internal_jvmci_code_CompilationResult_Site, Jvmci) \ + do_klass(InfopointReason_klass, jdk_internal_jvmci_code_InfopointReason, Jvmci) \ + do_klass(InstalledCode_klass, jdk_internal_jvmci_code_InstalledCode, Jvmci) \ + do_klass(code_Location_klass, jdk_internal_jvmci_code_Location, Jvmci) \ + do_klass(code_Register_klass, jdk_internal_jvmci_code_Register, Jvmci) \ + do_klass(RegisterValue_klass, jdk_internal_jvmci_code_RegisterValue, Jvmci) \ + do_klass(StackSlot_klass, jdk_internal_jvmci_code_StackSlot, Jvmci) \ + do_klass(StackLockValue_klass, jdk_internal_jvmci_code_StackLockValue, Jvmci) \ + do_klass(VirtualObject_klass, jdk_internal_jvmci_code_VirtualObject, Jvmci) \ + do_klass(SpeculationLog_klass, jdk_internal_jvmci_meta_SpeculationLog, Jvmci) \ + do_klass(JavaConstant_klass, jdk_internal_jvmci_meta_JavaConstant, Jvmci) \ + do_klass(PrimitiveConstant_klass, jdk_internal_jvmci_meta_PrimitiveConstant, Jvmci) \ + do_klass(RawConstant_klass, jdk_internal_jvmci_meta_RawConstant, Jvmci) \ + do_klass(NullConstant_klass, jdk_internal_jvmci_meta_NullConstant, Jvmci) \ + do_klass(ExceptionHandler_klass, jdk_internal_jvmci_meta_ExceptionHandler, Jvmci) \ + do_klass(Kind_klass, jdk_internal_jvmci_meta_Kind, Jvmci) \ + do_klass(LIRKind_klass, jdk_internal_jvmci_meta_LIRKind, Jvmci) \ + do_klass(AbstractValue_klass, jdk_internal_jvmci_meta_AbstractValue, Jvmci) +#endif + +#endif // SHARE_VM_JVMCI_SYSTEMDICTIONARY_JVMCI_HPP +
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/share/vm/jvmci/vmSymbols_jvmci.hpp Mon Aug 31 11:03:06 2015 -0700 @@ -0,0 +1,92 @@ +/* + * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +#ifndef SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP +#define SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP + + +#if !INCLUDE_JVMCI +#define JVMCI_VM_SYMBOLS_DO(template, do_alias) +#else +#define JVMCI_VM_SYMBOLS_DO(template, do_alias) \ + template(jdk_internal_jvmci_hotspot_HotSpotCompiledCode, "jdk/internal/jvmci/hotspot/HotSpotCompiledCode") \ + template(jdk_internal_jvmci_hotspot_HotSpotCompiledCode_Comment, "jdk/internal/jvmci/hotspot/HotSpotCompiledCode$Comment") \ + template(jdk_internal_jvmci_hotspot_HotSpotCompiledNmethod, "jdk/internal/jvmci/hotspot/HotSpotCompiledNmethod") \ + template(jdk_internal_jvmci_hotspot_HotSpotForeignCallTarget, "jdk/internal/jvmci/hotspot/HotSpotForeignCallTarget") \ + template(jdk_internal_jvmci_hotspot_HotSpotReferenceMap, "jdk/internal/jvmci/hotspot/HotSpotReferenceMap") \ + template(jdk_internal_jvmci_hotspot_CompilerToVMImpl, "jdk/internal/jvmci/hotspot/CompilerToVMImpl") \ + template(jdk_internal_jvmci_hotspot_HotSpotInstalledCode, "jdk/internal/jvmci/hotspot/HotSpotInstalledCode") \ + template(jdk_internal_jvmci_hotspot_HotSpotNmethod, "jdk/internal/jvmci/hotspot/HotSpotNmethod") \ + template(jdk_internal_jvmci_hotspot_HotSpotResolvedJavaMethodImpl, "jdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethodImpl") \ + template(jdk_internal_jvmci_hotspot_HotSpotResolvedObjectTypeImpl, "jdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl") \ + template(jdk_internal_jvmci_hotspot_HotSpotCompressedNullConstant, "jdk/internal/jvmci/hotspot/HotSpotCompressedNullConstant") \ + template(jdk_internal_jvmci_hotspot_HotSpotObjectConstantImpl, "jdk/internal/jvmci/hotspot/HotSpotObjectConstantImpl") \ + template(jdk_internal_jvmci_hotspot_HotSpotMetaspaceConstantImpl, "jdk/internal/jvmci/hotspot/HotSpotMetaspaceConstantImpl") \ + template(jdk_internal_jvmci_hotspot_HotSpotStackFrameReference, "jdk/internal/jvmci/hotspot/HotSpotStackFrameReference") \ + template(jdk_internal_jvmci_hotspot_HotSpotConstantPool, "jdk/internal/jvmci/hotspot/HotSpotConstantPool") \ + template(jdk_internal_jvmci_hotspot_HotSpotJVMCIMetaAccessContext, "jdk/internal/jvmci/hotspot/HotSpotJVMCIMetaAccessContext") \ + template(jdk_internal_jvmci_meta_JavaConstant, "jdk/internal/jvmci/meta/JavaConstant") \ + template(jdk_internal_jvmci_meta_PrimitiveConstant, "jdk/internal/jvmci/meta/PrimitiveConstant") \ + template(jdk_internal_jvmci_meta_RawConstant, "jdk/internal/jvmci/meta/RawConstant") \ + template(jdk_internal_jvmci_meta_NullConstant, "jdk/internal/jvmci/meta/NullConstant") \ + template(jdk_internal_jvmci_meta_ExceptionHandler, "jdk/internal/jvmci/meta/ExceptionHandler") \ + template(jdk_internal_jvmci_meta_Kind, "jdk/internal/jvmci/meta/Kind") \ + template(jdk_internal_jvmci_meta_LIRKind, "jdk/internal/jvmci/meta/LIRKind") \ + template(jdk_internal_jvmci_meta_AbstractValue, "jdk/internal/jvmci/meta/AbstractValue") \ + template(jdk_internal_jvmci_meta_Assumptions_ConcreteSubtype, "jdk/internal/jvmci/meta/Assumptions$ConcreteSubtype") \ + template(jdk_internal_jvmci_meta_Assumptions_LeafType, "jdk/internal/jvmci/meta/Assumptions$LeafType") \ + template(jdk_internal_jvmci_meta_Assumptions_NoFinalizableSubclass, "jdk/internal/jvmci/meta/Assumptions$NoFinalizableSubclass") \ + template(jdk_internal_jvmci_meta_Assumptions_ConcreteMethod, "jdk/internal/jvmci/meta/Assumptions$ConcreteMethod") \ + template(jdk_internal_jvmci_meta_Assumptions_CallSiteTargetValue, "jdk/internal/jvmci/meta/Assumptions$CallSiteTargetValue") \ + template(jdk_internal_jvmci_meta_SpeculationLog, "jdk/internal/jvmci/meta/SpeculationLog") \ + template(jdk_internal_jvmci_code_CompilationResult_Call, "jdk/internal/jvmci/code/CompilationResult$Call") \ + template(jdk_internal_jvmci_code_CompilationResult_ConstantReference, "jdk/internal/jvmci/code/CompilationResult$ConstantReference") \ + template(jdk_internal_jvmci_code_CompilationResult_DataPatch, "jdk/internal/jvmci/code/CompilationResult$DataPatch") \ + template(jdk_internal_jvmci_code_CompilationResult_DataSectionReference, "jdk/internal/jvmci/code/CompilationResult$DataSectionReference") \ + template(jdk_internal_jvmci_code_CompilationResult_ExceptionHandler, "jdk/internal/jvmci/code/CompilationResult$ExceptionHandler") \ + template(jdk_internal_jvmci_code_CompilationResult_Mark, "jdk/internal/jvmci/code/CompilationResult$Mark") \ + template(jdk_internal_jvmci_code_CompilationResult_Infopoint, "jdk/internal/jvmci/code/CompilationResult$Infopoint") \ + template(jdk_internal_jvmci_code_CompilationResult_Site, "jdk/internal/jvmci/code/CompilationResult$Site") \ + template(jdk_internal_jvmci_code_InfopointReason, "jdk/internal/jvmci/code/InfopointReason") \ + template(jdk_internal_jvmci_code_InstalledCode, "jdk/internal/jvmci/code/InstalledCode") \ + template(jdk_internal_jvmci_code_BytecodeFrame, "jdk/internal/jvmci/code/BytecodeFrame") \ + template(jdk_internal_jvmci_code_BytecodePosition, "jdk/internal/jvmci/code/BytecodePosition") \ + template(jdk_internal_jvmci_code_DebugInfo, "jdk/internal/jvmci/code/DebugInfo") \ + template(jdk_internal_jvmci_code_Location, "jdk/internal/jvmci/code/Location") \ + template(jdk_internal_jvmci_code_Register, "jdk/internal/jvmci/code/Register") \ + template(jdk_internal_jvmci_code_RegisterValue, "jdk/internal/jvmci/code/RegisterValue") \ + template(jdk_internal_jvmci_code_StackSlot, "jdk/internal/jvmci/code/StackSlot") \ + template(jdk_internal_jvmci_code_StackLockValue, "jdk/internal/jvmci/code/StackLockValue") \ + template(jdk_internal_jvmci_code_VirtualObject, "jdk/internal/jvmci/code/VirtualObject") \ + template(jdk_internal_jvmci_code_RegisterSaveLayout, "jdk/internal/jvmci/code/RegisterSaveLayout") \ + template(jdk_internal_jvmci_code_InvalidInstalledCodeException, "jdk/internal/jvmci/code/InvalidInstalledCodeException") \ + template(compileMethod_name, "compileMethod") \ + template(compileMethod_signature, "(Ljdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethod;IJI)V") \ + template(fromMetaspace_name, "fromMetaspace") \ + template(method_fromMetaspace_signature, "(J)Ljdk/internal/jvmci/hotspot/HotSpotResolvedJavaMethod;") \ + template(constantPool_fromMetaspace_signature, "(J)Ljdk/internal/jvmci/hotspot/HotSpotConstantPool;") \ + template(klass_fromMetaspace_signature, "(Ljava/lang/Class;)Ljdk/internal/jvmci/hotspot/HotSpotResolvedObjectTypeImpl;") \ + template(jdk_internal_jvmci_hotspot_Stable_signature, "Ljdk/internal/jvmci/hotspot/Stable;") +#endif + +#endif // SHARE_VM_JVMCI_VMSYMBOLS_JVMCI_HPP