comparison src/share/vm/classfile/systemDictionary.hpp @ 2044:06f017f7daa7

Merge.
author Thomas Wuerthinger <wuerthinger@ssw.jku.at>
date Fri, 07 Jan 2011 18:18:08 +0100
parents 2d26b0046e0d f2da85a9b08e
children 177398c6147d
comparison
equal deleted inserted replaced
1942:00bc9eaf0e24 2044:06f017f7daa7
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20 * or visit www.oracle.com if you need additional information or have any 20 * or visit www.oracle.com if you need additional information or have any
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24
25 #ifndef SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
26 #define SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP
27
28 #include "classfile/classFileStream.hpp"
29 #include "classfile/classLoader.hpp"
30 #include "oops/objArrayOop.hpp"
31 #include "oops/symbolOop.hpp"
32 #include "runtime/java.hpp"
33 #include "runtime/reflectionUtils.hpp"
34 #include "utilities/hashtable.hpp"
24 35
25 // The system dictionary stores all loaded classes and maps: 36 // The system dictionary stores all loaded classes and maps:
26 // 37 //
27 // [class name,class loader] -> class i.e. [symbolOop,oop] -> klassOop 38 // [class name,class loader] -> class i.e. [symbolOop,oop] -> klassOop
28 // 39 //
143 template(MethodType_klass, java_dyn_MethodType, Opt) \ 154 template(MethodType_klass, java_dyn_MethodType, Opt) \
144 template(MethodTypeForm_klass, java_dyn_MethodTypeForm, Opt) \ 155 template(MethodTypeForm_klass, java_dyn_MethodTypeForm, Opt) \
145 template(WrongMethodTypeException_klass, java_dyn_WrongMethodTypeException, Opt) \ 156 template(WrongMethodTypeException_klass, java_dyn_WrongMethodTypeException, Opt) \
146 template(Linkage_klass, java_dyn_Linkage, Opt) \ 157 template(Linkage_klass, java_dyn_Linkage, Opt) \
147 template(CallSite_klass, java_dyn_CallSite, Opt) \ 158 template(CallSite_klass, java_dyn_CallSite, Opt) \
148 template(InvokeDynamic_klass, java_dyn_InvokeDynamic, Opt) \ 159 /* Note: MethodHandle must be first, and CallSite last in group */ \
149 /* Note: MethodHandle must be first, and InvokeDynamic last in group */ \
150 \ 160 \
151 template(StringBuffer_klass, java_lang_StringBuffer, Pre) \ 161 template(StringBuffer_klass, java_lang_StringBuffer, Pre) \
152 template(StringBuilder_klass, java_lang_StringBuilder, Pre) \ 162 template(StringBuilder_klass, java_lang_StringBuilder, Pre) \
153 \ 163 \
154 /* It's NULL in non-1.4 JDKs. */ \ 164 /* It's NULL in non-1.4 JDKs. */ \
698 WK_KLASSES_DO(WK_KLASS_HANDLE_DECLARE); 708 WK_KLASSES_DO(WK_KLASS_HANDLE_DECLARE);
699 #undef WK_KLASS_HANDLE_DECLARE 709 #undef WK_KLASS_HANDLE_DECLARE
700 710
701 static KlassHandle box_klass(BasicType t); 711 static KlassHandle box_klass(BasicType t);
702 }; 712 };
713
714 #endif // SHARE_VM_CLASSFILE_SYSTEMDICTIONARY_HPP