Mercurial > hg > truffle
annotate src/share/vm/classfile/javaClasses.cpp @ 7511:b5316e551965
reapply fix from 8f7be0c45a82
author | Lukas Stadler <lukas.stadler@jku.at> |
---|---|
date | Tue, 22 Jan 2013 15:08:08 +0100 |
parents | 989155e2d07a |
children | 3ac7d10a6572 |
rev | line source |
---|---|
0 | 1 /* |
6057 | 2 * Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. |
0 | 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
4 * | |
5 * This code is free software; you can redistribute it and/or modify it | |
6 * under the terms of the GNU General Public License version 2 only, as | |
7 * published by the Free Software Foundation. | |
8 * | |
9 * This code is distributed in the hope that it will be useful, but WITHOUT | |
10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | |
11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | |
12 * version 2 for more details (a copy is included in the LICENSE file that | |
13 * accompanied this code). | |
14 * | |
15 * You should have received a copy of the GNU General Public License version | |
16 * 2 along with this work; if not, write to the Free Software Foundation, | |
17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. | |
18 * | |
1552
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1507
diff
changeset
|
19 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1507
diff
changeset
|
20 * or visit www.oracle.com if you need additional information or have any |
c18cbe5936b8
6941466: Oracle rebranding changes for Hotspot repositories
trims
parents:
1507
diff
changeset
|
21 * questions. |
0 | 22 * |
23 */ | |
24 | |
1972 | 25 #include "precompiled.hpp" |
6162 | 26 #include "classfile/altHashing.hpp" |
1972 | 27 #include "classfile/javaClasses.hpp" |
28 #include "classfile/symbolTable.hpp" | |
29 #include "classfile/vmSymbols.hpp" | |
30 #include "code/debugInfo.hpp" | |
31 #include "code/pcDesc.hpp" | |
3900
a32de5085326
7079673: JSR 292: C1 should inline bytecoded method handle adapters
twisti
parents:
3820
diff
changeset
|
32 #include "compiler/compilerOracle.hpp" |
1972 | 33 #include "interpreter/interpreter.hpp" |
34 #include "memory/oopFactory.hpp" | |
35 #include "memory/resourceArea.hpp" | |
36 #include "memory/universe.inline.hpp" | |
3938 | 37 #include "oops/fieldStreams.hpp" |
1972 | 38 #include "oops/instanceKlass.hpp" |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
39 #include "oops/instanceMirrorKlass.hpp" |
1972 | 40 #include "oops/klass.hpp" |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
41 #include "oops/method.hpp" |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
42 #include "oops/symbol.hpp" |
1972 | 43 #include "oops/typeArrayOop.hpp" |
44 #include "runtime/fieldDescriptor.hpp" | |
45 #include "runtime/handles.inline.hpp" | |
46 #include "runtime/interfaceSupport.hpp" | |
47 #include "runtime/java.hpp" | |
48 #include "runtime/javaCalls.hpp" | |
49 #include "runtime/safepoint.hpp" | |
7180
f34d701e952e
8003935: Simplify the needed includes for using Thread::current()
stefank
parents:
6985
diff
changeset
|
50 #include "runtime/thread.inline.hpp" |
1972 | 51 #include "runtime/vframe.hpp" |
52 #include "utilities/preserveException.hpp" | |
0 | 53 |
3938 | 54 #define INJECTED_FIELD_COMPUTE_OFFSET(klass, name, signature, may_be_java) \ |
55 klass::_##name##_offset = JavaClasses::compute_injected_offset(JavaClasses::klass##_##name##_enum); | |
56 | |
57 #define DECLARE_INJECTED_FIELD(klass, name, signature, may_be_java) \ | |
58 { SystemDictionary::WK_KLASS_ENUM_NAME(klass), vmSymbols::VM_SYMBOL_ENUM_NAME(name##_name), vmSymbols::VM_SYMBOL_ENUM_NAME(signature), may_be_java }, | |
59 | |
60 InjectedField JavaClasses::_injected_fields[] = { | |
61 ALL_INJECTED_FIELDS(DECLARE_INJECTED_FIELD) | |
62 }; | |
63 | |
64 int JavaClasses::compute_injected_offset(InjectedFieldID id) { | |
65 return _injected_fields[id].compute_offset(); | |
66 } | |
67 | |
68 | |
69 InjectedField* JavaClasses::get_injected(Symbol* class_name, int* field_count) { | |
70 *field_count = 0; | |
71 | |
72 vmSymbols::SID sid = vmSymbols::find_sid(class_name); | |
73 if (sid == vmSymbols::NO_SID) { | |
74 // Only well known classes can inject fields | |
75 return NULL; | |
76 } | |
77 | |
78 int count = 0; | |
79 int start = -1; | |
80 | |
81 #define LOOKUP_INJECTED_FIELD(klass, name, signature, may_be_java) \ | |
82 if (sid == vmSymbols::VM_SYMBOL_ENUM_NAME(klass)) { \ | |
83 count++; \ | |
84 if (start == -1) start = klass##_##name##_enum; \ | |
85 } | |
86 ALL_INJECTED_FIELDS(LOOKUP_INJECTED_FIELD); | |
87 #undef LOOKUP_INJECTED_FIELD | |
88 | |
89 if (start != -1) { | |
90 *field_count = count; | |
91 return _injected_fields + start; | |
92 } | |
93 return NULL; | |
94 } | |
95 | |
96 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
97 static bool find_field(InstanceKlass* ik, |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
98 Symbol* name_symbol, Symbol* signature_symbol, |
710 | 99 fieldDescriptor* fd, |
100 bool allow_super = false) { | |
101 if (allow_super) | |
102 return ik->find_field(name_symbol, signature_symbol, fd) != NULL; | |
103 else | |
104 return ik->find_local_field(name_symbol, signature_symbol, fd); | |
105 } | |
106 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
107 // Helpful routine for computing field offsets at run time rather than hardcoding them |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
108 static void |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
109 compute_offset(int &dest_offset, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
110 Klass* klass_oop, Symbol* name_symbol, Symbol* signature_symbol, |
710 | 111 bool allow_super = false) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
112 fieldDescriptor fd; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
113 InstanceKlass* ik = InstanceKlass::cast(klass_oop); |
710 | 114 if (!find_field(ik, name_symbol, signature_symbol, &fd, allow_super)) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
115 ResourceMark rm; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
116 tty->print_cr("Invalid layout of %s at %s", ik->external_name(), name_symbol->as_C_string()); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
117 #ifndef PRODUCT |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
118 klass_oop->print(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
119 tty->print_cr("all fields:"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
120 for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
121 tty->print_cr(" name: %s, sig: %s, flags: %08x", fs.name()->as_C_string(), fs.signature()->as_C_string(), fs.access_flags().as_int()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
122 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
123 #endif //PRODUCT |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
124 fatal("Invalid layout of preloaded class"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
125 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
126 dest_offset = fd.offset(); |
0 | 127 } |
128 | |
129 // Same as above but for "optional" offsets that might not be present in certain JDK versions | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
130 static void |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
131 compute_optional_offset(int& dest_offset, |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
132 Klass* klass_oop, Symbol* name_symbol, Symbol* signature_symbol, |
710 | 133 bool allow_super = false) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
134 fieldDescriptor fd; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
135 InstanceKlass* ik = InstanceKlass::cast(klass_oop); |
710 | 136 if (find_field(ik, name_symbol, signature_symbol, &fd, allow_super)) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
137 dest_offset = fd.offset(); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
138 } |
0 | 139 } |
140 | |
710 | 141 |
6057 | 142 int java_lang_String::value_offset = 0; |
143 int java_lang_String::offset_offset = 0; | |
144 int java_lang_String::count_offset = 0; | |
145 int java_lang_String::hash_offset = 0; | |
146 | |
147 bool java_lang_String::initialized = false; | |
148 | |
149 void java_lang_String::compute_offsets() { | |
150 assert(!initialized, "offsets should be initialized only once"); | |
151 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
152 Klass* k = SystemDictionary::String_klass(); |
6057 | 153 compute_offset(value_offset, k, vmSymbols::value_name(), vmSymbols::char_array_signature()); |
154 compute_optional_offset(offset_offset, k, vmSymbols::offset_name(), vmSymbols::int_signature()); | |
155 compute_optional_offset(count_offset, k, vmSymbols::count_name(), vmSymbols::int_signature()); | |
156 compute_optional_offset(hash_offset, k, vmSymbols::hash_name(), vmSymbols::int_signature()); | |
157 | |
158 initialized = true; | |
159 } | |
160 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
161 Handle java_lang_String::basic_create(int length, TRAPS) { |
6057 | 162 assert(initialized, "Must be initialized"); |
0 | 163 // Create the String object first, so there's a chance that the String |
164 // and the char array it points to end up in the same cache line. | |
165 oop obj; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
166 obj = InstanceKlass::cast(SystemDictionary::String_klass())->allocate_instance(CHECK_NH); |
0 | 167 |
168 // Create the char array. The String object must be handlized here | |
169 // because GC can happen as a result of the allocation attempt. | |
170 Handle h_obj(THREAD, obj); | |
171 typeArrayOop buffer; | |
172 buffer = oopFactory::new_charArray(length, CHECK_NH); | |
173 | |
174 // Point the String at the char array | |
175 obj = h_obj(); | |
176 set_value(obj, buffer); | |
177 // No need to zero the offset, allocation zero'ed the entire String object | |
178 assert(offset(obj) == 0, "initial String offset should be zero"); | |
179 //set_offset(obj, 0); | |
180 set_count(obj, length); | |
181 | |
182 return h_obj; | |
183 } | |
184 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
185 Handle java_lang_String::create_from_unicode(jchar* unicode, int length, TRAPS) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
186 Handle h_obj = basic_create(length, CHECK_NH); |
0 | 187 typeArrayOop buffer = value(h_obj()); |
188 for (int index = 0; index < length; index++) { | |
189 buffer->char_at_put(index, unicode[index]); | |
190 } | |
191 return h_obj; | |
192 } | |
193 | |
194 oop java_lang_String::create_oop_from_unicode(jchar* unicode, int length, TRAPS) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
195 Handle h_obj = create_from_unicode(unicode, length, CHECK_0); |
0 | 196 return h_obj(); |
197 } | |
198 | |
199 Handle java_lang_String::create_from_str(const char* utf8_str, TRAPS) { | |
200 if (utf8_str == NULL) { | |
201 return Handle(); | |
202 } | |
203 int length = UTF8::unicode_length(utf8_str); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
204 Handle h_obj = basic_create(length, CHECK_NH); |
0 | 205 if (length > 0) { |
206 UTF8::convert_to_unicode(utf8_str, value(h_obj())->char_at_addr(0), length); | |
207 } | |
208 return h_obj; | |
209 } | |
210 | |
211 oop java_lang_String::create_oop_from_str(const char* utf8_str, TRAPS) { | |
212 Handle h_obj = create_from_str(utf8_str, CHECK_0); | |
213 return h_obj(); | |
214 } | |
215 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
216 Handle java_lang_String::create_from_symbol(Symbol* symbol, TRAPS) { |
0 | 217 int length = UTF8::unicode_length((char*)symbol->bytes(), symbol->utf8_length()); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
218 Handle h_obj = basic_create(length, CHECK_NH); |
0 | 219 if (length > 0) { |
220 UTF8::convert_to_unicode((char*)symbol->bytes(), value(h_obj())->char_at_addr(0), length); | |
221 } | |
222 return h_obj; | |
223 } | |
224 | |
225 // Converts a C string to a Java String based on current encoding | |
226 Handle java_lang_String::create_from_platform_dependent_str(const char* str, TRAPS) { | |
227 assert(str != NULL, "bad arguments"); | |
228 | |
229 typedef jstring (*to_java_string_fn_t)(JNIEnv*, const char *); | |
230 static to_java_string_fn_t _to_java_string_fn = NULL; | |
231 | |
232 if (_to_java_string_fn == NULL) { | |
233 void *lib_handle = os::native_java_library(); | |
1980
828eafbd85cc
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
1972
diff
changeset
|
234 _to_java_string_fn = CAST_TO_FN_PTR(to_java_string_fn_t, os::dll_lookup(lib_handle, "NewStringPlatform")); |
0 | 235 if (_to_java_string_fn == NULL) { |
236 fatal("NewStringPlatform missing"); | |
237 } | |
238 } | |
239 | |
240 jstring js = NULL; | |
241 { JavaThread* thread = (JavaThread*)THREAD; | |
242 assert(thread->is_Java_thread(), "must be java thread"); | |
22
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
243 HandleMark hm(thread); |
0 | 244 ThreadToNativeFromVM ttn(thread); |
245 js = (_to_java_string_fn)(thread->jni_environment(), str); | |
246 } | |
247 return Handle(THREAD, JNIHandles::resolve(js)); | |
248 } | |
249 | |
22
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
250 // Converts a Java String to a native C string that can be used for |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
251 // native OS calls. |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
252 char* java_lang_String::as_platform_dependent_str(Handle java_string, TRAPS) { |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
253 |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
254 typedef char* (*to_platform_string_fn_t)(JNIEnv*, jstring, bool*); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
255 static to_platform_string_fn_t _to_platform_string_fn = NULL; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
256 |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
257 if (_to_platform_string_fn == NULL) { |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
258 void *lib_handle = os::native_java_library(); |
1980
828eafbd85cc
6348631: remove the use of the HPI library from Hotspot
ikrylov
parents:
1972
diff
changeset
|
259 _to_platform_string_fn = CAST_TO_FN_PTR(to_platform_string_fn_t, os::dll_lookup(lib_handle, "GetStringPlatformChars")); |
22
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
260 if (_to_platform_string_fn == NULL) { |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
261 fatal("GetStringPlatformChars missing"); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
262 } |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
263 } |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
264 |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
265 char *native_platform_string; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
266 { JavaThread* thread = (JavaThread*)THREAD; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
267 assert(thread->is_Java_thread(), "must be java thread"); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
268 JNIEnv *env = thread->jni_environment(); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
269 jstring js = (jstring) JNIHandles::make_local(env, java_string()); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
270 bool is_copy; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
271 HandleMark hm(thread); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
272 ThreadToNativeFromVM ttn(thread); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
273 native_platform_string = (_to_platform_string_fn)(env, js, &is_copy); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
274 assert(is_copy == JNI_TRUE, "is_copy value changed"); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
275 JNIHandles::destroy_local(js); |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
276 } |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
277 return native_platform_string; |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
278 } |
90f5ddc7297b
6646946: Kernel installation failed on Japanese and Chinese XP SP2 (VM part)
coleenp
parents:
0
diff
changeset
|
279 |
0 | 280 Handle java_lang_String::char_converter(Handle java_string, jchar from_char, jchar to_char, TRAPS) { |
281 oop obj = java_string(); | |
282 // Typical usage is to convert all '/' to '.' in string. | |
283 typeArrayOop value = java_lang_String::value(obj); | |
284 int offset = java_lang_String::offset(obj); | |
285 int length = java_lang_String::length(obj); | |
286 | |
287 // First check if any from_char exist | |
288 int index; // Declared outside, used later | |
289 for (index = 0; index < length; index++) { | |
290 if (value->char_at(index + offset) == from_char) { | |
291 break; | |
292 } | |
293 } | |
294 if (index == length) { | |
295 // No from_char, so do not copy. | |
296 return java_string; | |
297 } | |
298 | |
299 // Create new UNICODE buffer. Must handlize value because GC | |
300 // may happen during String and char array creation. | |
301 typeArrayHandle h_value(THREAD, value); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
302 Handle string = basic_create(length, CHECK_NH); |
0 | 303 |
304 typeArrayOop from_buffer = h_value(); | |
305 typeArrayOop to_buffer = java_lang_String::value(string()); | |
306 | |
307 // Copy contents | |
308 for (index = 0; index < length; index++) { | |
309 jchar c = from_buffer->char_at(index + offset); | |
310 if (c == from_char) { | |
311 c = to_char; | |
312 } | |
313 to_buffer->char_at_put(index, c); | |
314 } | |
315 return string; | |
316 } | |
317 | |
318 jchar* java_lang_String::as_unicode_string(oop java_string, int& length) { | |
319 typeArrayOop value = java_lang_String::value(java_string); | |
320 int offset = java_lang_String::offset(java_string); | |
321 length = java_lang_String::length(java_string); | |
322 | |
323 jchar* result = NEW_RESOURCE_ARRAY(jchar, length); | |
324 for (int index = 0; index < length; index++) { | |
325 result[index] = value->char_at(index + offset); | |
326 } | |
327 return result; | |
328 } | |
329 | |
7399
2aa953165ade
8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents:
7185
diff
changeset
|
330 unsigned int java_lang_String::hash_code(oop java_string) { |
6162 | 331 int length = java_lang_String::length(java_string); |
7399
2aa953165ade
8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents:
7185
diff
changeset
|
332 // Zero length string will hash to zero with String.hashCode() function. |
6162 | 333 if (length == 0) return 0; |
334 | |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
335 typeArrayOop value = java_lang_String::value(java_string); |
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
336 int offset = java_lang_String::offset(java_string); |
7399
2aa953165ade
8004661: Comment and function name java_lang_String::toHash is wrong
brutisso
parents:
7185
diff
changeset
|
337 return java_lang_String::hash_code(value->char_at_addr(offset), length); |
6162 | 338 } |
339 | |
6972
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
340 char* java_lang_String::as_quoted_ascii(oop java_string) { |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
341 typeArrayOop value = java_lang_String::value(java_string); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
342 int offset = java_lang_String::offset(java_string); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
343 int length = java_lang_String::length(java_string); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
344 |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
345 jchar* base = (length == 0) ? NULL : value->char_at_addr(offset); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
346 if (base == NULL) return NULL; |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
347 |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
348 int result_length = UNICODE::quoted_ascii_length(base, length) + 1; |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
349 char* result = NEW_RESOURCE_ARRAY(char, result_length); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
350 UNICODE::as_quoted_ascii(base, length, result, result_length); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
351 assert(result_length >= length + 1, "must not be shorter"); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
352 assert(result_length == (int)strlen(result) + 1, "must match"); |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
353 return result; |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
354 } |
bd7a7ce2e264
6830717: replay of compilations would help with debugging
minqi
parents:
6940
diff
changeset
|
355 |
6162 | 356 unsigned int java_lang_String::hash_string(oop java_string) { |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
357 int length = java_lang_String::length(java_string); |
6162 | 358 // Zero length string doesn't hash necessarily hash to zero. |
359 if (length == 0) { | |
360 return StringTable::hash_string(NULL, 0); | |
361 } | |
362 | |
363 typeArrayOop value = java_lang_String::value(java_string); | |
364 int offset = java_lang_String::offset(java_string); | |
365 return StringTable::hash_string(value->char_at_addr(offset), length); | |
2418
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
366 } |
352622fd140a
7032129: Native memory usage grow unexpectedly for vm/oom/*InternedString tests
never
parents:
2416
diff
changeset
|
367 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
368 Symbol* java_lang_String::as_symbol(Handle java_string, TRAPS) { |
0 | 369 oop obj = java_string(); |
370 typeArrayOop value = java_lang_String::value(obj); | |
371 int offset = java_lang_String::offset(obj); | |
372 int length = java_lang_String::length(obj); | |
949
489a4f8dcd0f
6865583: Verbose CIPrintMethodCodes asserts when ldc an empty String
twisti
parents:
931
diff
changeset
|
373 jchar* base = (length == 0) ? NULL : value->char_at_addr(offset); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
374 Symbol* sym = SymbolTable::lookup_unicode(base, length, THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
375 return sym; |
0 | 376 } |
377 | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
378 Symbol* java_lang_String::as_symbol_or_null(oop java_string) { |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
379 typeArrayOop value = java_lang_String::value(java_string); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
380 int offset = java_lang_String::offset(java_string); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
381 int length = java_lang_String::length(java_string); |
949
489a4f8dcd0f
6865583: Verbose CIPrintMethodCodes asserts when ldc an empty String
twisti
parents:
931
diff
changeset
|
382 jchar* base = (length == 0) ? NULL : value->char_at_addr(offset); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
383 return SymbolTable::probe_unicode(base, length); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
384 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
385 |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
386 |
0 | 387 int java_lang_String::utf8_length(oop java_string) { |
388 typeArrayOop value = java_lang_String::value(java_string); | |
389 int offset = java_lang_String::offset(java_string); | |
390 int length = java_lang_String::length(java_string); | |
391 jchar* position = (length == 0) ? NULL : value->char_at_addr(offset); | |
392 return UNICODE::utf8_length(position, length); | |
393 } | |
394 | |
395 char* java_lang_String::as_utf8_string(oop java_string) { | |
396 typeArrayOop value = java_lang_String::value(java_string); | |
397 int offset = java_lang_String::offset(java_string); | |
398 int length = java_lang_String::length(java_string); | |
399 jchar* position = (length == 0) ? NULL : value->char_at_addr(offset); | |
400 return UNICODE::as_utf8(position, length); | |
401 } | |
402 | |
1989
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
403 char* java_lang_String::as_utf8_string(oop java_string, char* buf, int buflen) { |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
404 typeArrayOop value = java_lang_String::value(java_string); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
405 int offset = java_lang_String::offset(java_string); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
406 int length = java_lang_String::length(java_string); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
407 jchar* position = (length == 0) ? NULL : value->char_at_addr(offset); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
408 return UNICODE::as_utf8(position, length, buf, buflen); |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
409 } |
017cd8bce8a8
6539281: -Xcheck:jni should validate char* argument to ReleaseStringUTFChars
sla
parents:
1980
diff
changeset
|
410 |
0 | 411 char* java_lang_String::as_utf8_string(oop java_string, int start, int len) { |
412 typeArrayOop value = java_lang_String::value(java_string); | |
413 int offset = java_lang_String::offset(java_string); | |
414 int length = java_lang_String::length(java_string); | |
415 assert(start + len <= length, "just checking"); | |
416 jchar* position = value->char_at_addr(offset + start); | |
417 return UNICODE::as_utf8(position, len); | |
418 } | |
419 | |
420 bool java_lang_String::equals(oop java_string, jchar* chars, int len) { | |
6867 | 421 assert(java_string->klass() == SystemDictionary::String_klass(), |
0 | 422 "must be java_string"); |
423 typeArrayOop value = java_lang_String::value(java_string); | |
424 int offset = java_lang_String::offset(java_string); | |
425 int length = java_lang_String::length(java_string); | |
426 if (length != len) { | |
427 return false; | |
428 } | |
429 for (int i = 0; i < len; i++) { | |
430 if (value->char_at(i + offset) != chars[i]) { | |
431 return false; | |
432 } | |
433 } | |
434 return true; | |
435 } | |
436 | |
437 void java_lang_String::print(Handle java_string, outputStream* st) { | |
438 oop obj = java_string(); | |
1142 | 439 assert(obj->klass() == SystemDictionary::String_klass(), "must be java_string"); |
0 | 440 typeArrayOop value = java_lang_String::value(obj); |
441 int offset = java_lang_String::offset(obj); | |
442 int length = java_lang_String::length(obj); | |
443 | |
444 int end = MIN2(length, 100); | |
445 if (value == NULL) { | |
446 // This can happen if, e.g., printing a String | |
447 // object before its initializer has been called | |
448 st->print_cr("NULL"); | |
449 } else { | |
450 st->print("\""); | |
451 for (int index = 0; index < length; index++) { | |
452 st->print("%c", value->char_at(index + offset)); | |
453 } | |
454 st->print("\""); | |
455 } | |
456 } | |
457 | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
458 static void initialize_static_field(fieldDescriptor* fd, TRAPS) { |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
459 Handle mirror (THREAD, fd->field_holder()->java_mirror()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
460 assert(mirror.not_null() && fd->is_static(), "just checking"); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
461 if (fd->has_initial_value()) { |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
462 BasicType t = fd->field_type(); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
463 switch (t) { |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
464 case T_BYTE: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
465 mirror()->byte_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
466 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
467 case T_BOOLEAN: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
468 mirror()->bool_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
469 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
470 case T_CHAR: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
471 mirror()->char_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
472 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
473 case T_SHORT: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
474 mirror()->short_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
475 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
476 case T_INT: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
477 mirror()->int_field_put(fd->offset(), fd->int_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
478 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
479 case T_FLOAT: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
480 mirror()->float_field_put(fd->offset(), fd->float_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
481 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
482 case T_DOUBLE: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
483 mirror()->double_field_put(fd->offset(), fd->double_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
484 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
485 case T_LONG: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
486 mirror()->long_field_put(fd->offset(), fd->long_initial_value()); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
487 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
488 case T_OBJECT: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
489 { |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
490 #ifdef ASSERT |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
491 TempNewSymbol sym = SymbolTable::new_symbol("Ljava/lang/String;", CHECK); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
492 assert(fd->signature() == sym, "just checking"); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
493 #endif |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
494 oop string = fd->string_initial_value(CHECK); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
495 mirror()->obj_field_put(fd->offset(), string); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
496 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
497 break; |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
498 default: |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
499 THROW_MSG(vmSymbols::java_lang_ClassFormatError(), |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
500 "Illegal ConstantValue attribute in class file"); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
501 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
502 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
503 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
504 |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
505 |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
506 void java_lang_Class::fixup_mirror(KlassHandle k, TRAPS) { |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
507 assert(InstanceMirrorKlass::offset_of_static_fields() != 0, "must have been computed already"); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
508 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
509 // If the offset was read from the shared archive, it was fixed up already |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
510 if (!k->is_shared()) { |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
511 if (k->oop_is_instance()) { |
3938 | 512 // During bootstrap, java.lang.Class wasn't loaded so static field |
513 // offsets were computed without the size added it. Go back and | |
514 // update all the static field offsets to included the size. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
515 for (JavaFieldStream fs(InstanceKlass::cast(k())); !fs.done(); fs.next()) { |
3938 | 516 if (fs.access_flags().is_static()) { |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
517 int real_offset = fs.offset() + InstanceMirrorKlass::offset_of_static_fields(); |
3938 | 518 fs.set_offset(real_offset); |
519 } | |
520 } | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
521 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
522 } |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
523 create_mirror(k, CHECK); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
524 } |
0 | 525 |
526 oop java_lang_Class::create_mirror(KlassHandle k, TRAPS) { | |
527 assert(k->java_mirror() == NULL, "should only assign mirror once"); | |
528 // Use this moment of initialization to cache modifier_flags also, | |
529 // to support Class.getModifiers(). Instance classes recalculate | |
530 // the cached flags after the class file is parsed, but before the | |
531 // class is put into the system dictionary. | |
532 int computed_modifiers = k->compute_modifier_flags(CHECK_0); | |
533 k->set_modifier_flags(computed_modifiers); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
534 // Class_klass has to be loaded because it is used to allocate |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
535 // the mirror. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
536 if (SystemDictionary::Class_klass_loaded()) { |
0 | 537 // Allocate mirror (java.lang.Class instance) |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
538 Handle mirror = InstanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(k, CHECK_0); |
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
539 |
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
540 InstanceMirrorKlass* mk = InstanceMirrorKlass::cast(mirror->klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
541 java_lang_Class::set_static_oop_field_count(mirror(), mk->compute_static_oop_field_count(mirror())); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
542 |
0 | 543 // It might also have a component mirror. This mirror must already exist. |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
544 if (k->oop_is_array()) { |
0 | 545 Handle comp_mirror; |
546 if (k->oop_is_typeArray()) { | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
547 BasicType type = TypeArrayKlass::cast(k())->element_type(); |
0 | 548 comp_mirror = Universe::java_mirror(type); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
549 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
550 assert(k->oop_is_objArray(), "Must be"); |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
551 Klass* element_klass = ObjArrayKlass::cast(k())->element_klass(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
552 assert(element_klass != NULL, "Must have an element klass"); |
6983 | 553 comp_mirror = element_klass->java_mirror(); |
0 | 554 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
555 assert(comp_mirror.not_null(), "must have a mirror"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
556 |
0 | 557 // Two-way link between the array klass and its component mirror: |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
558 ArrayKlass::cast(k())->set_component_mirror(comp_mirror()); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
559 set_array_klass(comp_mirror(), k()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
560 } else { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
561 assert(k->oop_is_instance(), "Must be"); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
562 // Initialize static fields |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
563 InstanceKlass::cast(k())->do_local_static_fields(&initialize_static_field, CHECK_NULL); |
0 | 564 } |
565 return mirror(); | |
566 } else { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
567 if (fixup_mirror_list() == NULL) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
568 GrowableArray<Klass*>* list = |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
569 new (ResourceObj::C_HEAP, mtClass) GrowableArray<Klass*>(40, true); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
570 set_fixup_mirror_list(list); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
571 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
572 fixup_mirror_list()->push(k()); |
0 | 573 return NULL; |
574 } | |
575 } | |
576 | |
577 | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
578 |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
579 int java_lang_Class::oop_size(oop java_class) { |
3938 | 580 assert(_oop_size_offset != 0, "must be set"); |
581 return java_class->int_field(_oop_size_offset); | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
582 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
583 void java_lang_Class::set_oop_size(oop java_class, int size) { |
3938 | 584 assert(_oop_size_offset != 0, "must be set"); |
585 java_class->int_field_put(_oop_size_offset, size); | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
586 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
587 int java_lang_Class::static_oop_field_count(oop java_class) { |
3938 | 588 assert(_static_oop_field_count_offset != 0, "must be set"); |
589 return java_class->int_field(_static_oop_field_count_offset); | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
590 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
591 void java_lang_Class::set_static_oop_field_count(oop java_class, int size) { |
3938 | 592 assert(_static_oop_field_count_offset != 0, "must be set"); |
593 java_class->int_field_put(_static_oop_field_count_offset, size); | |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
594 } |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
595 |
0 | 596 oop java_lang_Class::create_basic_type_mirror(const char* basic_type_name, BasicType type, TRAPS) { |
597 // This should be improved by adding a field at the Java level or by | |
598 // introducing a new VM klass (see comment in ClassFileParser) | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
599 oop java_class = InstanceMirrorKlass::cast(SystemDictionary::Class_klass())->allocate_instance(NULL, CHECK_0); |
0 | 600 if (type != T_VOID) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
601 Klass* aklass = Universe::typeArrayKlassObj(type); |
0 | 602 assert(aklass != NULL, "correct bootstrap"); |
603 set_array_klass(java_class, aklass); | |
604 } | |
4009 | 605 #ifdef ASSERT |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
606 InstanceMirrorKlass* mk = InstanceMirrorKlass::cast(SystemDictionary::Class_klass()); |
4009 | 607 assert(java_lang_Class::static_oop_field_count(java_class) == 0, "should have been zeroed by allocation"); |
608 #endif | |
0 | 609 return java_class; |
610 } | |
611 | |
6948
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
612 #ifdef GRAAL |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
613 oop java_lang_Class::graal_mirror(oop java_class) { |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
614 assert(_graal_mirror_offset != 0, "must be set"); |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
615 return java_class->obj_field(_graal_mirror_offset); |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
616 } |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
617 #endif |
0 | 618 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
619 Klass* java_lang_Class::as_Klass(oop java_class) { |
0 | 620 //%note memory_2 |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
621 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
622 Klass* k = ((Klass*)java_class->metadata_field(_klass_offset)); |
0 | 623 assert(k == NULL || k->is_klass(), "type check"); |
624 return k; | |
625 } | |
626 | |
627 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
628 void java_lang_Class::set_klass(oop java_class, Klass* klass) { |
4009 | 629 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
630 java_class->metadata_field_put(_klass_offset, klass); |
4009 | 631 } |
632 | |
633 | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
634 void java_lang_Class::print_signature(oop java_class, outputStream* st) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
635 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
636 Symbol* name = NULL; |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
637 bool is_instance = false; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
638 if (is_primitive(java_class)) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
639 name = vmSymbols::type_signature(primitive_type(java_class)); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
640 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
641 Klass* k = as_Klass(java_class); |
6983 | 642 is_instance = k->oop_is_instance(); |
643 name = k->name(); | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
644 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
645 if (name == NULL) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
646 st->print("<null>"); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
647 return; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
648 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
649 if (is_instance) st->print("L"); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
650 st->write((char*) name->base(), (int) name->utf8_length()); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
651 if (is_instance) st->print(";"); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
652 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
653 |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
654 Symbol* java_lang_Class::as_signature(oop java_class, bool intern_if_not_found, TRAPS) { |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
655 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
656 Symbol* name; |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
657 if (is_primitive(java_class)) { |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
658 name = vmSymbols::type_signature(primitive_type(java_class)); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
659 // Because this can create a new symbol, the caller has to decrement |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
660 // the refcount, so make adjustment here and below for symbols returned |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
661 // that are not created or incremented due to a successful lookup. |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
662 name->increment_refcount(); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
663 } else { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
664 Klass* k = as_Klass(java_class); |
6983 | 665 if (!k->oop_is_instance()) { |
666 name = k->name(); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
667 name->increment_refcount(); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
668 } else { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
669 ResourceMark rm; |
6983 | 670 const char* sigstr = k->signature_name(); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
671 int siglen = (int) strlen(sigstr); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
672 if (!intern_if_not_found) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
673 name = SymbolTable::probe(sigstr, siglen); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
674 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
675 name = SymbolTable::new_symbol(sigstr, siglen, THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
676 } |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
677 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
678 } |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
679 return name; |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
680 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
681 |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
682 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
683 Klass* java_lang_Class::array_klass(oop java_class) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
684 Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset)); |
6983 | 685 assert(k == NULL || k->is_klass() && k->oop_is_array(), "should be array klass"); |
0 | 686 return k; |
687 } | |
688 | |
689 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
690 void java_lang_Class::set_array_klass(oop java_class, Klass* klass) { |
6983 | 691 assert(klass->is_klass() && klass->oop_is_array(), "should be array klass"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
692 java_class->metadata_field_put(_array_klass_offset, klass); |
0 | 693 } |
694 | |
695 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
696 Method* java_lang_Class::resolved_constructor(oop java_class) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
697 Metadata* constructor = java_class->metadata_field(_resolved_constructor_offset); |
0 | 698 assert(constructor == NULL || constructor->is_method(), "should be method"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
699 return ((Method*)constructor); |
0 | 700 } |
701 | |
702 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
703 void java_lang_Class::set_resolved_constructor(oop java_class, Method* constructor) { |
0 | 704 assert(constructor->is_method(), "should be method"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
705 java_class->metadata_field_put(_resolved_constructor_offset, constructor); |
0 | 706 } |
707 | |
708 | |
709 bool java_lang_Class::is_primitive(oop java_class) { | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
710 // should assert: |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
711 //assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
712 bool is_primitive = (java_class->metadata_field(_klass_offset) == NULL); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
713 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
714 #ifdef ASSERT |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
715 if (is_primitive) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
716 Klass* k = ((Klass*)java_class->metadata_field(_array_klass_offset)); |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
717 assert(k == NULL || is_java_primitive(ArrayKlass::cast(k)->element_type()), |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
718 "Should be either the T_VOID primitive or a java primitive"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
719 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
720 #endif |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
721 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
722 return is_primitive; |
0 | 723 } |
724 | |
725 | |
726 BasicType java_lang_Class::primitive_type(oop java_class) { | |
727 assert(java_lang_Class::is_primitive(java_class), "just checking"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
728 Klass* ak = ((Klass*)java_class->metadata_field(_array_klass_offset)); |
0 | 729 BasicType type = T_VOID; |
730 if (ak != NULL) { | |
731 // Note: create_basic_type_mirror above initializes ak to a non-null value. | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
732 type = ArrayKlass::cast(ak)->element_type(); |
0 | 733 } else { |
734 assert(java_class == Universe::void_mirror(), "only valid non-array primitive"); | |
735 } | |
736 assert(Universe::java_mirror(type) == java_class, "must be consistent"); | |
737 return type; | |
738 } | |
739 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
740 BasicType java_lang_Class::as_BasicType(oop java_class, Klass** reference_klass) { |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
741 assert(java_lang_Class::is_instance(java_class), "must be a Class object"); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
742 if (is_primitive(java_class)) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
743 if (reference_klass != NULL) |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
744 (*reference_klass) = NULL; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
745 return primitive_type(java_class); |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
746 } else { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
747 if (reference_klass != NULL) |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
748 (*reference_klass) = as_Klass(java_class); |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
749 return T_OBJECT; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
750 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
751 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
752 |
0 | 753 |
754 oop java_lang_Class::primitive_mirror(BasicType t) { | |
755 oop mirror = Universe::java_mirror(t); | |
1142 | 756 assert(mirror != NULL && mirror->is_a(SystemDictionary::Class_klass()), "must be a Class"); |
0 | 757 assert(java_lang_Class::is_primitive(mirror), "must be primitive"); |
758 return mirror; | |
759 } | |
760 | |
761 bool java_lang_Class::offsets_computed = false; | |
762 int java_lang_Class::classRedefinedCount_offset = -1; | |
763 | |
764 void java_lang_Class::compute_offsets() { | |
765 assert(!offsets_computed, "offsets should be initialized only once"); | |
766 offsets_computed = true; | |
767 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
768 Klass* klass_oop = SystemDictionary::Class_klass(); |
0 | 769 // The classRedefinedCount field is only present starting in 1.5, |
770 // so don't go fatal. | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
771 compute_optional_offset(classRedefinedCount_offset, |
3938 | 772 klass_oop, vmSymbols::classRedefinedCount_name(), vmSymbols::int_signature()); |
773 | |
774 CLASS_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); | |
0 | 775 } |
776 | |
777 int java_lang_Class::classRedefinedCount(oop the_class_mirror) { | |
778 if (!JDK_Version::is_gte_jdk15x_version() | |
779 || classRedefinedCount_offset == -1) { | |
780 // The classRedefinedCount field is only present starting in 1.5. | |
781 // If we don't have an offset for it then just return -1 as a marker. | |
782 return -1; | |
783 } | |
784 | |
785 return the_class_mirror->int_field(classRedefinedCount_offset); | |
786 } | |
787 | |
788 void java_lang_Class::set_classRedefinedCount(oop the_class_mirror, int value) { | |
789 if (!JDK_Version::is_gte_jdk15x_version() | |
790 || classRedefinedCount_offset == -1) { | |
791 // The classRedefinedCount field is only present starting in 1.5. | |
792 // If we don't have an offset for it then nothing to set. | |
793 return; | |
794 } | |
795 | |
796 the_class_mirror->int_field_put(classRedefinedCount_offset, value); | |
797 } | |
798 | |
799 | |
800 // Note: JDK1.1 and before had a privateInfo_offset field which was used for the | |
801 // platform thread structure, and a eetop offset which was used for thread | |
802 // local storage (and unused by the HotSpot VM). In JDK1.2 the two structures | |
803 // merged, so in the HotSpot VM we just use the eetop field for the thread | |
804 // instead of the privateInfo_offset. | |
805 // | |
806 // Note: The stackSize field is only present starting in 1.4. | |
807 | |
808 int java_lang_Thread::_name_offset = 0; | |
809 int java_lang_Thread::_group_offset = 0; | |
810 int java_lang_Thread::_contextClassLoader_offset = 0; | |
811 int java_lang_Thread::_inheritedAccessControlContext_offset = 0; | |
812 int java_lang_Thread::_priority_offset = 0; | |
813 int java_lang_Thread::_eetop_offset = 0; | |
814 int java_lang_Thread::_daemon_offset = 0; | |
815 int java_lang_Thread::_stillborn_offset = 0; | |
816 int java_lang_Thread::_stackSize_offset = 0; | |
817 int java_lang_Thread::_tid_offset = 0; | |
818 int java_lang_Thread::_thread_status_offset = 0; | |
819 int java_lang_Thread::_park_blocker_offset = 0; | |
820 int java_lang_Thread::_park_event_offset = 0 ; | |
821 | |
822 | |
823 void java_lang_Thread::compute_offsets() { | |
824 assert(_group_offset == 0, "offsets should be initialized only once"); | |
825 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
826 Klass* k = SystemDictionary::Thread_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
827 compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::char_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
828 compute_offset(_group_offset, k, vmSymbols::group_name(), vmSymbols::threadgroup_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
829 compute_offset(_contextClassLoader_offset, k, vmSymbols::contextClassLoader_name(), vmSymbols::classloader_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
830 compute_offset(_inheritedAccessControlContext_offset, k, vmSymbols::inheritedAccessControlContext_name(), vmSymbols::accesscontrolcontext_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
831 compute_offset(_priority_offset, k, vmSymbols::priority_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
832 compute_offset(_daemon_offset, k, vmSymbols::daemon_name(), vmSymbols::bool_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
833 compute_offset(_eetop_offset, k, vmSymbols::eetop_name(), vmSymbols::long_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
834 compute_offset(_stillborn_offset, k, vmSymbols::stillborn_name(), vmSymbols::bool_signature()); |
0 | 835 // The stackSize field is only present starting in 1.4, so don't go fatal. |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
836 compute_optional_offset(_stackSize_offset, k, vmSymbols::stackSize_name(), vmSymbols::long_signature()); |
0 | 837 // The tid and thread_status fields are only present starting in 1.5, so don't go fatal. |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
838 compute_optional_offset(_tid_offset, k, vmSymbols::thread_id_name(), vmSymbols::long_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
839 compute_optional_offset(_thread_status_offset, k, vmSymbols::thread_status_name(), vmSymbols::int_signature()); |
0 | 840 // The parkBlocker field is only present starting in 1.6, so don't go fatal. |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
841 compute_optional_offset(_park_blocker_offset, k, vmSymbols::park_blocker_name(), vmSymbols::object_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
842 compute_optional_offset(_park_event_offset, k, vmSymbols::park_event_name(), |
0 | 843 vmSymbols::long_signature()); |
844 } | |
845 | |
846 | |
847 JavaThread* java_lang_Thread::thread(oop java_thread) { | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
848 return (JavaThread*)java_thread->address_field(_eetop_offset); |
0 | 849 } |
850 | |
851 | |
852 void java_lang_Thread::set_thread(oop java_thread, JavaThread* thread) { | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
853 java_thread->address_field_put(_eetop_offset, (address)thread); |
0 | 854 } |
855 | |
856 | |
857 typeArrayOop java_lang_Thread::name(oop java_thread) { | |
858 oop name = java_thread->obj_field(_name_offset); | |
6831
d8ce2825b193
8000213: NPG: Should have renamed arrayKlass and typeArrayKlass
coleenp
parents:
6735
diff
changeset
|
859 assert(name == NULL || (name->is_typeArray() && TypeArrayKlass::cast(name->klass())->element_type() == T_CHAR), "just checking"); |
0 | 860 return typeArrayOop(name); |
861 } | |
862 | |
863 | |
864 void java_lang_Thread::set_name(oop java_thread, typeArrayOop name) { | |
865 assert(java_thread->obj_field(_name_offset) == NULL, "name should be NULL"); | |
866 java_thread->obj_field_put(_name_offset, name); | |
867 } | |
868 | |
869 | |
870 ThreadPriority java_lang_Thread::priority(oop java_thread) { | |
871 return (ThreadPriority)java_thread->int_field(_priority_offset); | |
872 } | |
873 | |
874 | |
875 void java_lang_Thread::set_priority(oop java_thread, ThreadPriority priority) { | |
876 java_thread->int_field_put(_priority_offset, priority); | |
877 } | |
878 | |
879 | |
880 oop java_lang_Thread::threadGroup(oop java_thread) { | |
881 return java_thread->obj_field(_group_offset); | |
882 } | |
883 | |
884 | |
885 bool java_lang_Thread::is_stillborn(oop java_thread) { | |
886 return java_thread->bool_field(_stillborn_offset) != 0; | |
887 } | |
888 | |
889 | |
890 // We never have reason to turn the stillborn bit off | |
891 void java_lang_Thread::set_stillborn(oop java_thread) { | |
892 java_thread->bool_field_put(_stillborn_offset, true); | |
893 } | |
894 | |
895 | |
896 bool java_lang_Thread::is_alive(oop java_thread) { | |
897 JavaThread* thr = java_lang_Thread::thread(java_thread); | |
898 return (thr != NULL); | |
899 } | |
900 | |
901 | |
902 bool java_lang_Thread::is_daemon(oop java_thread) { | |
903 return java_thread->bool_field(_daemon_offset) != 0; | |
904 } | |
905 | |
906 | |
907 void java_lang_Thread::set_daemon(oop java_thread) { | |
908 java_thread->bool_field_put(_daemon_offset, true); | |
909 } | |
910 | |
911 oop java_lang_Thread::context_class_loader(oop java_thread) { | |
912 return java_thread->obj_field(_contextClassLoader_offset); | |
913 } | |
914 | |
915 oop java_lang_Thread::inherited_access_control_context(oop java_thread) { | |
916 return java_thread->obj_field(_inheritedAccessControlContext_offset); | |
917 } | |
918 | |
919 | |
920 jlong java_lang_Thread::stackSize(oop java_thread) { | |
921 // The stackSize field is only present starting in 1.4 | |
922 if (_stackSize_offset > 0) { | |
923 assert(JDK_Version::is_gte_jdk14x_version(), "sanity check"); | |
924 return java_thread->long_field(_stackSize_offset); | |
925 } else { | |
926 return 0; | |
927 } | |
928 } | |
929 | |
930 // Write the thread status value to threadStatus field in java.lang.Thread java class. | |
931 void java_lang_Thread::set_thread_status(oop java_thread, | |
932 java_lang_Thread::ThreadStatus status) { | |
933 assert(JavaThread::current()->thread_state() == _thread_in_vm, "Java Thread is not running in vm"); | |
934 // The threadStatus is only present starting in 1.5 | |
935 if (_thread_status_offset > 0) { | |
936 java_thread->int_field_put(_thread_status_offset, status); | |
937 } | |
938 } | |
939 | |
940 // Read thread status value from threadStatus field in java.lang.Thread java class. | |
941 java_lang_Thread::ThreadStatus java_lang_Thread::get_thread_status(oop java_thread) { | |
942 assert(Thread::current()->is_VM_thread() || | |
943 JavaThread::current()->thread_state() == _thread_in_vm, | |
944 "Java Thread is not running in vm"); | |
945 // The threadStatus is only present starting in 1.5 | |
946 if (_thread_status_offset > 0) { | |
947 return (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); | |
948 } else { | |
949 // All we can easily figure out is if it is alive, but that is | |
950 // enough info for a valid unknown status. | |
951 // These aren't restricted to valid set ThreadStatus values, so | |
952 // use JVMTI values and cast. | |
953 JavaThread* thr = java_lang_Thread::thread(java_thread); | |
954 if (thr == NULL) { | |
955 // the thread hasn't run yet or is in the process of exiting | |
956 return NEW; | |
957 } | |
958 return (java_lang_Thread::ThreadStatus)JVMTI_THREAD_STATE_ALIVE; | |
959 } | |
960 } | |
961 | |
962 | |
963 jlong java_lang_Thread::thread_id(oop java_thread) { | |
964 // The thread ID field is only present starting in 1.5 | |
965 if (_tid_offset > 0) { | |
966 return java_thread->long_field(_tid_offset); | |
967 } else { | |
968 return 0; | |
969 } | |
970 } | |
971 | |
972 oop java_lang_Thread::park_blocker(oop java_thread) { | |
242 | 973 assert(JDK_Version::current().supports_thread_park_blocker() && |
974 _park_blocker_offset != 0, "Must support parkBlocker field"); | |
0 | 975 |
976 if (_park_blocker_offset > 0) { | |
977 return java_thread->obj_field(_park_blocker_offset); | |
978 } | |
979 | |
980 return NULL; | |
981 } | |
982 | |
983 jlong java_lang_Thread::park_event(oop java_thread) { | |
984 if (_park_event_offset > 0) { | |
985 return java_thread->long_field(_park_event_offset); | |
986 } | |
987 return 0; | |
988 } | |
989 | |
990 bool java_lang_Thread::set_park_event(oop java_thread, jlong ptr) { | |
991 if (_park_event_offset > 0) { | |
992 java_thread->long_field_put(_park_event_offset, ptr); | |
993 return true; | |
994 } | |
995 return false; | |
996 } | |
997 | |
998 | |
999 const char* java_lang_Thread::thread_status_name(oop java_thread) { | |
1000 assert(JDK_Version::is_gte_jdk15x_version() && _thread_status_offset != 0, "Must have thread status"); | |
1001 ThreadStatus status = (java_lang_Thread::ThreadStatus)java_thread->int_field(_thread_status_offset); | |
1002 switch (status) { | |
1003 case NEW : return "NEW"; | |
1004 case RUNNABLE : return "RUNNABLE"; | |
1005 case SLEEPING : return "TIMED_WAITING (sleeping)"; | |
1006 case IN_OBJECT_WAIT : return "WAITING (on object monitor)"; | |
1007 case IN_OBJECT_WAIT_TIMED : return "TIMED_WAITING (on object monitor)"; | |
1008 case PARKED : return "WAITING (parking)"; | |
1009 case PARKED_TIMED : return "TIMED_WAITING (parking)"; | |
1010 case BLOCKED_ON_MONITOR_ENTER : return "BLOCKED (on object monitor)"; | |
1011 case TERMINATED : return "TERMINATED"; | |
1012 default : return "UNKNOWN"; | |
1013 }; | |
1014 } | |
1015 int java_lang_ThreadGroup::_parent_offset = 0; | |
1016 int java_lang_ThreadGroup::_name_offset = 0; | |
1017 int java_lang_ThreadGroup::_threads_offset = 0; | |
1018 int java_lang_ThreadGroup::_groups_offset = 0; | |
1019 int java_lang_ThreadGroup::_maxPriority_offset = 0; | |
1020 int java_lang_ThreadGroup::_destroyed_offset = 0; | |
1021 int java_lang_ThreadGroup::_daemon_offset = 0; | |
1022 int java_lang_ThreadGroup::_vmAllowSuspension_offset = 0; | |
1023 int java_lang_ThreadGroup::_nthreads_offset = 0; | |
1024 int java_lang_ThreadGroup::_ngroups_offset = 0; | |
1025 | |
1026 oop java_lang_ThreadGroup::parent(oop java_thread_group) { | |
1027 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1028 return java_thread_group->obj_field(_parent_offset); | |
1029 } | |
1030 | |
1031 // ("name as oop" accessor is not necessary) | |
1032 | |
1033 typeArrayOop java_lang_ThreadGroup::name(oop java_thread_group) { | |
1034 oop name = java_thread_group->obj_field(_name_offset); | |
1035 // ThreadGroup.name can be null | |
1036 return name == NULL ? (typeArrayOop)NULL : java_lang_String::value(name); | |
1037 } | |
1038 | |
1039 int java_lang_ThreadGroup::nthreads(oop java_thread_group) { | |
1040 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1041 return java_thread_group->int_field(_nthreads_offset); | |
1042 } | |
1043 | |
1044 objArrayOop java_lang_ThreadGroup::threads(oop java_thread_group) { | |
1045 oop threads = java_thread_group->obj_field(_threads_offset); | |
1046 assert(threads != NULL, "threadgroups should have threads"); | |
1047 assert(threads->is_objArray(), "just checking"); // Todo: Add better type checking code | |
1048 return objArrayOop(threads); | |
1049 } | |
1050 | |
1051 int java_lang_ThreadGroup::ngroups(oop java_thread_group) { | |
1052 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1053 return java_thread_group->int_field(_ngroups_offset); | |
1054 } | |
1055 | |
1056 objArrayOop java_lang_ThreadGroup::groups(oop java_thread_group) { | |
1057 oop groups = java_thread_group->obj_field(_groups_offset); | |
1058 assert(groups == NULL || groups->is_objArray(), "just checking"); // Todo: Add better type checking code | |
1059 return objArrayOop(groups); | |
1060 } | |
1061 | |
1062 ThreadPriority java_lang_ThreadGroup::maxPriority(oop java_thread_group) { | |
1063 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1064 return (ThreadPriority) java_thread_group->int_field(_maxPriority_offset); | |
1065 } | |
1066 | |
1067 bool java_lang_ThreadGroup::is_destroyed(oop java_thread_group) { | |
1068 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1069 return java_thread_group->bool_field(_destroyed_offset) != 0; | |
1070 } | |
1071 | |
1072 bool java_lang_ThreadGroup::is_daemon(oop java_thread_group) { | |
1073 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1074 return java_thread_group->bool_field(_daemon_offset) != 0; | |
1075 } | |
1076 | |
1077 bool java_lang_ThreadGroup::is_vmAllowSuspension(oop java_thread_group) { | |
1078 assert(java_thread_group->is_oop(), "thread group must be oop"); | |
1079 return java_thread_group->bool_field(_vmAllowSuspension_offset) != 0; | |
1080 } | |
1081 | |
1082 void java_lang_ThreadGroup::compute_offsets() { | |
1083 assert(_parent_offset == 0, "offsets should be initialized only once"); | |
1084 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1085 Klass* k = SystemDictionary::ThreadGroup_klass(); |
0 | 1086 |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1087 compute_offset(_parent_offset, k, vmSymbols::parent_name(), vmSymbols::threadgroup_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1088 compute_offset(_name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1089 compute_offset(_threads_offset, k, vmSymbols::threads_name(), vmSymbols::thread_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1090 compute_offset(_groups_offset, k, vmSymbols::groups_name(), vmSymbols::threadgroup_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1091 compute_offset(_maxPriority_offset, k, vmSymbols::maxPriority_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1092 compute_offset(_destroyed_offset, k, vmSymbols::destroyed_name(), vmSymbols::bool_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1093 compute_offset(_daemon_offset, k, vmSymbols::daemon_name(), vmSymbols::bool_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1094 compute_offset(_vmAllowSuspension_offset, k, vmSymbols::vmAllowSuspension_name(), vmSymbols::bool_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1095 compute_offset(_nthreads_offset, k, vmSymbols::nthreads_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1096 compute_offset(_ngroups_offset, k, vmSymbols::ngroups_name(), vmSymbols::int_signature()); |
0 | 1097 } |
1098 | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1099 oop java_lang_Throwable::unassigned_stacktrace() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1100 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Throwable_klass()); |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1101 address addr = ik->static_field_addr(static_unassigned_stacktrace_offset); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1102 if (UseCompressedOops) { |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1103 return oopDesc::load_decode_heap_oop((narrowOop *)addr); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1104 } else { |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1105 return oopDesc::load_decode_heap_oop((oop*)addr); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1106 } |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1107 } |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1108 |
0 | 1109 oop java_lang_Throwable::backtrace(oop throwable) { |
1110 return throwable->obj_field_acquire(backtrace_offset); | |
1111 } | |
1112 | |
1113 | |
1114 void java_lang_Throwable::set_backtrace(oop throwable, oop value) { | |
1115 throwable->release_obj_field_put(backtrace_offset, value); | |
1116 } | |
1117 | |
1118 | |
1119 oop java_lang_Throwable::message(oop throwable) { | |
1120 return throwable->obj_field(detailMessage_offset); | |
1121 } | |
1122 | |
1123 | |
1124 oop java_lang_Throwable::message(Handle throwable) { | |
1125 return throwable->obj_field(detailMessage_offset); | |
1126 } | |
1127 | |
1128 | |
1129 void java_lang_Throwable::set_message(oop throwable, oop value) { | |
1130 throwable->obj_field_put(detailMessage_offset, value); | |
1131 } | |
1132 | |
1133 | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1134 void java_lang_Throwable::set_stacktrace(oop throwable, oop st_element_array) { |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1135 throwable->obj_field_put(stackTrace_offset, st_element_array); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1136 } |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1137 |
0 | 1138 void java_lang_Throwable::clear_stacktrace(oop throwable) { |
1139 assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4"); | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1140 set_stacktrace(throwable, NULL); |
0 | 1141 } |
1142 | |
1143 | |
1144 void java_lang_Throwable::print(oop throwable, outputStream* st) { | |
1145 ResourceMark rm; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1146 Klass* k = throwable->klass(); |
0 | 1147 assert(k != NULL, "just checking"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1148 st->print("%s", InstanceKlass::cast(k)->external_name()); |
0 | 1149 oop msg = message(throwable); |
1150 if (msg != NULL) { | |
1151 st->print(": %s", java_lang_String::as_utf8_string(msg)); | |
1152 } | |
1153 } | |
1154 | |
1155 | |
1156 void java_lang_Throwable::print(Handle throwable, outputStream* st) { | |
1157 ResourceMark rm; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1158 Klass* k = throwable->klass(); |
0 | 1159 assert(k != NULL, "just checking"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1160 st->print("%s", InstanceKlass::cast(k)->external_name()); |
0 | 1161 oop msg = message(throwable); |
1162 if (msg != NULL) { | |
1163 st->print(": %s", java_lang_String::as_utf8_string(msg)); | |
1164 } | |
1165 } | |
1166 | |
1167 // Print stack trace element to resource allocated buffer | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1168 char* java_lang_Throwable::print_stack_element_to_buffer(Method* method, int bci) { |
0 | 1169 // Get strings and string lengths |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6867
diff
changeset
|
1170 InstanceKlass* klass = method->method_holder(); |
0 | 1171 const char* klass_name = klass->external_name(); |
1172 int buf_len = (int)strlen(klass_name); | |
1173 char* source_file_name; | |
1174 if (klass->source_file_name() == NULL) { | |
1175 source_file_name = NULL; | |
1176 } else { | |
1177 source_file_name = klass->source_file_name()->as_C_string(); | |
1178 buf_len += (int)strlen(source_file_name); | |
1179 } | |
1180 char* method_name = method->name()->as_C_string(); | |
1181 buf_len += (int)strlen(method_name); | |
1182 | |
1183 // Allocate temporary buffer with extra space for formatting and line number | |
1184 char* buf = NEW_RESOURCE_ARRAY(char, buf_len + 64); | |
1185 | |
1186 // Print stack trace line in buffer | |
1187 sprintf(buf, "\tat %s.%s", klass_name, method_name); | |
1188 if (method->is_native()) { | |
1189 strcat(buf, "(Native Method)"); | |
1190 } else { | |
1191 int line_number = method->line_number_from_bci(bci); | |
1192 if (source_file_name != NULL && (line_number != -1)) { | |
1193 // Sourcename and linenumber | |
1194 sprintf(buf + (int)strlen(buf), "(%s:%d)", source_file_name, line_number); | |
1195 } else if (source_file_name != NULL) { | |
1196 // Just sourcename | |
1197 sprintf(buf + (int)strlen(buf), "(%s)", source_file_name); | |
1198 } else { | |
1199 // Neither soucename and linenumber | |
1200 sprintf(buf + (int)strlen(buf), "(Unknown Source)"); | |
1201 } | |
1202 nmethod* nm = method->code(); | |
1203 if (WizardMode && nm != NULL) { | |
3960 | 1204 sprintf(buf + (int)strlen(buf), "(nmethod " INTPTR_FORMAT ")", (intptr_t)nm); |
0 | 1205 } |
1206 } | |
1207 | |
1208 return buf; | |
1209 } | |
1210 | |
1211 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1212 void java_lang_Throwable::print_stack_element(Handle stream, Method* method, int bci) { |
0 | 1213 ResourceMark rm; |
1214 char* buf = print_stack_element_to_buffer(method, bci); | |
1215 print_to_stream(stream, buf); | |
1216 } | |
1217 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1218 void java_lang_Throwable::print_stack_element(outputStream *st, Method* method, int bci) { |
0 | 1219 ResourceMark rm; |
1220 char* buf = print_stack_element_to_buffer(method, bci); | |
1221 st->print_cr("%s", buf); | |
1222 } | |
1223 | |
1224 void java_lang_Throwable::print_to_stream(Handle stream, const char* str) { | |
1225 if (stream.is_null()) { | |
1226 tty->print_cr("%s", str); | |
1227 } else { | |
1228 EXCEPTION_MARK; | |
1229 JavaValue result(T_VOID); | |
1230 Handle arg (THREAD, oopFactory::new_charArray(str, THREAD)); | |
1231 if (!HAS_PENDING_EXCEPTION) { | |
1232 JavaCalls::call_virtual(&result, | |
1233 stream, | |
1234 KlassHandle(THREAD, stream->klass()), | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
1235 vmSymbols::println_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
1236 vmSymbols::char_array_void_signature(), |
0 | 1237 arg, |
1238 THREAD); | |
1239 } | |
1240 // Ignore any exceptions. we are in the middle of exception handling. Same as classic VM. | |
1241 if (HAS_PENDING_EXCEPTION) CLEAR_PENDING_EXCEPTION; | |
1242 } | |
1243 | |
1244 } | |
1245 | |
1246 | |
1247 const char* java_lang_Throwable::no_stack_trace_message() { | |
1248 return "\t<<no stack trace available>>"; | |
1249 } | |
1250 | |
1251 | |
1252 // Currently used only for exceptions occurring during startup | |
1253 void java_lang_Throwable::print_stack_trace(oop throwable, outputStream* st) { | |
1254 Thread *THREAD = Thread::current(); | |
1255 Handle h_throwable(THREAD, throwable); | |
1256 while (h_throwable.not_null()) { | |
1257 objArrayHandle result (THREAD, objArrayOop(backtrace(h_throwable()))); | |
1258 if (result.is_null()) { | |
1259 st->print_cr(no_stack_trace_message()); | |
1260 return; | |
1261 } | |
1262 | |
1263 while (result.not_null()) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1264 typeArrayHandle methods (THREAD, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1265 typeArrayOop(result->obj_at(trace_methods_offset))); |
0 | 1266 typeArrayHandle bcis (THREAD, |
1267 typeArrayOop(result->obj_at(trace_bcis_offset))); | |
1268 | |
1269 if (methods.is_null() || bcis.is_null()) { | |
1270 st->print_cr(no_stack_trace_message()); | |
1271 return; | |
1272 } | |
1273 | |
1274 int length = methods()->length(); | |
1275 for (int index = 0; index < length; index++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1276 Method* method = ((Method*)methods()->metadata_at(index)); |
0 | 1277 if (method == NULL) goto handle_cause; |
1278 int bci = bcis->ushort_at(index); | |
1279 print_stack_element(st, method, bci); | |
1280 } | |
1281 result = objArrayHandle(THREAD, objArrayOop(result->obj_at(trace_next_offset))); | |
1282 } | |
1283 handle_cause: | |
1284 { | |
1285 EXCEPTION_MARK; | |
1286 JavaValue result(T_OBJECT); | |
1287 JavaCalls::call_virtual(&result, | |
1288 h_throwable, | |
1289 KlassHandle(THREAD, h_throwable->klass()), | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
1290 vmSymbols::getCause_name(), |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
1291 vmSymbols::void_throwable_signature(), |
0 | 1292 THREAD); |
1293 // Ignore any exceptions. we are in the middle of exception handling. Same as classic VM. | |
1294 if (HAS_PENDING_EXCEPTION) { | |
1295 CLEAR_PENDING_EXCEPTION; | |
1296 h_throwable = Handle(); | |
1297 } else { | |
1298 h_throwable = Handle(THREAD, (oop) result.get_jobject()); | |
1299 if (h_throwable.not_null()) { | |
1300 st->print("Caused by: "); | |
1301 print(h_throwable, st); | |
1302 st->cr(); | |
1303 } | |
1304 } | |
1305 } | |
1306 } | |
1307 } | |
1308 | |
1309 | |
1310 void java_lang_Throwable::print_stack_trace(oop throwable, oop print_stream) { | |
1311 // Note: this is no longer used in Merlin, but we support it for compatibility. | |
1312 Thread *thread = Thread::current(); | |
1313 Handle stream(thread, print_stream); | |
1314 objArrayHandle result (thread, objArrayOop(backtrace(throwable))); | |
1315 if (result.is_null()) { | |
1316 print_to_stream(stream, no_stack_trace_message()); | |
1317 return; | |
1318 } | |
1319 | |
1320 while (result.not_null()) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1321 typeArrayHandle methods(thread, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1322 typeArrayOop(result->obj_at(trace_methods_offset))); |
0 | 1323 typeArrayHandle bcis (thread, |
1324 typeArrayOop(result->obj_at(trace_bcis_offset))); | |
1325 | |
1326 if (methods.is_null() || bcis.is_null()) { | |
1327 print_to_stream(stream, no_stack_trace_message()); | |
1328 return; | |
1329 } | |
1330 | |
1331 int length = methods()->length(); | |
1332 for (int index = 0; index < length; index++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1333 Method* method = ((Method*)methods()->metadata_at(index)); |
0 | 1334 if (method == NULL) return; |
1335 int bci = bcis->ushort_at(index); | |
1336 print_stack_element(stream, method, bci); | |
1337 } | |
1338 result = objArrayHandle(thread, objArrayOop(result->obj_at(trace_next_offset))); | |
1339 } | |
1340 } | |
1341 | |
1342 // This class provides a simple wrapper over the internal structure of | |
1343 // exception backtrace to insulate users of the backtrace from needing | |
1344 // to know what it looks like. | |
1345 class BacktraceBuilder: public StackObj { | |
1346 private: | |
1347 Handle _backtrace; | |
1348 objArrayOop _head; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1349 typeArrayOop _methods; |
0 | 1350 typeArrayOop _bcis; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1351 objArrayOop _mirrors; |
0 | 1352 int _index; |
1353 No_Safepoint_Verifier _nsv; | |
1354 | |
1355 public: | |
1356 | |
1357 enum { | |
1358 trace_methods_offset = java_lang_Throwable::trace_methods_offset, | |
1359 trace_bcis_offset = java_lang_Throwable::trace_bcis_offset, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1360 trace_mirrors_offset = java_lang_Throwable::trace_mirrors_offset, |
0 | 1361 trace_next_offset = java_lang_Throwable::trace_next_offset, |
1362 trace_size = java_lang_Throwable::trace_size, | |
1363 trace_chunk_size = java_lang_Throwable::trace_chunk_size | |
1364 }; | |
1365 | |
1366 // constructor for new backtrace | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1367 BacktraceBuilder(TRAPS): _methods(NULL), _bcis(NULL), _head(NULL), _mirrors(NULL) { |
0 | 1368 expand(CHECK); |
1369 _backtrace = _head; | |
1370 _index = 0; | |
1371 } | |
1372 | |
1373 void expand(TRAPS) { | |
1374 objArrayHandle old_head(THREAD, _head); | |
1375 Pause_No_Safepoint_Verifier pnsv(&_nsv); | |
1376 | |
1377 objArrayOop head = oopFactory::new_objectArray(trace_size, CHECK); | |
1378 objArrayHandle new_head(THREAD, head); | |
1379 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1380 typeArrayOop methods = oopFactory::new_metaDataArray(trace_chunk_size, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1381 typeArrayHandle new_methods(THREAD, methods); |
0 | 1382 |
1383 typeArrayOop bcis = oopFactory::new_shortArray(trace_chunk_size, CHECK); | |
1384 typeArrayHandle new_bcis(THREAD, bcis); | |
1385 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1386 objArrayOop mirrors = oopFactory::new_objectArray(trace_chunk_size, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1387 objArrayHandle new_mirrors(THREAD, mirrors); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1388 |
0 | 1389 if (!old_head.is_null()) { |
1390 old_head->obj_at_put(trace_next_offset, new_head()); | |
1391 } | |
1392 new_head->obj_at_put(trace_methods_offset, new_methods()); | |
1393 new_head->obj_at_put(trace_bcis_offset, new_bcis()); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1394 new_head->obj_at_put(trace_mirrors_offset, new_mirrors()); |
0 | 1395 |
1396 _head = new_head(); | |
1397 _methods = new_methods(); | |
1398 _bcis = new_bcis(); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1399 _mirrors = new_mirrors(); |
0 | 1400 _index = 0; |
1401 } | |
1402 | |
1403 oop backtrace() { | |
1404 return _backtrace(); | |
1405 } | |
1406 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1407 inline void push(Method* method, int bci, TRAPS) { |
4817
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1408 // Smear the -1 bci to 0 since the array only holds unsigned |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1409 // shorts. The later line number lookup would just smear the -1 |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1410 // to a 0 even if it could be recorded. |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1411 if (bci == SynchronizationEntryBCI) bci = 0; |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1412 assert(bci == (jushort)bci, "doesn't fit"); |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1413 |
0 | 1414 if (_index >= trace_chunk_size) { |
1415 methodHandle mhandle(THREAD, method); | |
1416 expand(CHECK); | |
1417 method = mhandle(); | |
1418 } | |
1419 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1420 _methods->metadata_at_put(_index, method); |
0 | 1421 _bcis->ushort_at_put(_index, bci); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1422 // we need to save the mirrors in the backtrace to keep the methods from |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1423 // being unloaded if their class loader is unloaded while we still have |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1424 // this stack trace. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1425 _mirrors->obj_at_put(_index, method->method_holder()->java_mirror()); |
0 | 1426 _index++; |
1427 } | |
1428 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1429 Method* current_method() { |
0 | 1430 assert(_index >= 0 && _index < trace_chunk_size, "out of range"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1431 return ((Method*)_methods->metadata_at(_index)); |
0 | 1432 } |
1433 | |
1434 jushort current_bci() { | |
1435 assert(_index >= 0 && _index < trace_chunk_size, "out of range"); | |
1436 return _bcis->ushort_at(_index); | |
1437 } | |
1438 }; | |
1439 | |
1440 | |
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1441 void java_lang_Throwable::fill_in_stack_trace(Handle throwable, methodHandle method, TRAPS) { |
0 | 1442 if (!StackTraceInThrowable) return; |
1443 ResourceMark rm(THREAD); | |
1444 | |
1445 // Start out by clearing the backtrace for this object, in case the VM | |
1446 // runs out of memory while allocating the stack trace | |
1447 set_backtrace(throwable(), NULL); | |
1448 if (JDK_Version::is_gte_jdk14x_version()) { | |
1449 // New since 1.4, clear lazily constructed Java level stacktrace if | |
1450 // refilling occurs | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1451 // This is unnecessary in 1.7+ but harmless |
0 | 1452 clear_stacktrace(throwable()); |
1453 } | |
1454 | |
1455 int max_depth = MaxJavaStackTraceDepth; | |
1456 JavaThread* thread = (JavaThread*)THREAD; | |
1457 BacktraceBuilder bt(CHECK); | |
1458 | |
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1459 // If there is no Java frame just return the method that was being called |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1460 // with bci 0 |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1461 if (!thread->has_last_Java_frame()) { |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1462 if (max_depth >= 1 && method() != NULL) { |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1463 bt.push(method(), 0, CHECK); |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1464 set_backtrace(throwable(), bt.backtrace()); |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1465 } |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1466 return; |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1467 } |
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1468 |
0 | 1469 // Instead of using vframe directly, this version of fill_in_stack_trace |
1470 // basically handles everything by hand. This significantly improved the | |
1471 // speed of this method call up to 28.5% on Solaris sparc. 27.1% on Windows. | |
1472 // See bug 6333838 for more details. | |
1473 // The "ASSERT" here is to verify this method generates the exactly same stack | |
1474 // trace as utilizing vframe. | |
1475 #ifdef ASSERT | |
1476 vframeStream st(thread); | |
1477 methodHandle st_method(THREAD, st.method()); | |
1478 #endif | |
1479 int total_count = 0; | |
1480 RegisterMap map(thread, false); | |
1481 int decode_offset = 0; | |
1482 nmethod* nm = NULL; | |
1483 bool skip_fillInStackTrace_check = false; | |
1484 bool skip_throwableInit_check = false; | |
6267
977007096840
7187290: nightly failures after JSR 292 lazy method handle update
twisti
parents:
6266
diff
changeset
|
1485 bool skip_hidden = !ShowHiddenFrames; |
0 | 1486 |
1487 for (frame fr = thread->last_frame(); max_depth != total_count;) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1488 Method* method = NULL; |
0 | 1489 int bci = 0; |
1490 | |
1491 // Compiled java method case. | |
1492 if (decode_offset != 0) { | |
1493 DebugInfoReadStream stream(nm, decode_offset); | |
1494 decode_offset = stream.read_int(); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1495 method = (Method*)nm->metadata_at(stream.read_int()); |
931
72088be4b386
6873116: Modify reexecute implementation to use pcDesc to record the reexecute bit
cfang
parents:
900
diff
changeset
|
1496 bci = stream.read_bci(); |
0 | 1497 } else { |
1498 if (fr.is_first_frame()) break; | |
1499 address pc = fr.pc(); | |
1500 if (fr.is_interpreted_frame()) { | |
1501 intptr_t bcx = fr.interpreter_frame_bcx(); | |
1502 method = fr.interpreter_frame_method(); | |
1503 bci = fr.is_bci(bcx) ? bcx : method->bci_from((address)bcx); | |
1504 fr = fr.sender(&map); | |
1505 } else { | |
1506 CodeBlob* cb = fr.cb(); | |
1507 // HMMM QQQ might be nice to have frame return nm as NULL if cb is non-NULL | |
1508 // but non nmethod | |
1509 fr = fr.sender(&map); | |
1510 if (cb == NULL || !cb->is_nmethod()) { | |
1511 continue; | |
1512 } | |
1513 nm = (nmethod*)cb; | |
1514 if (nm->method()->is_native()) { | |
1515 method = nm->method(); | |
1516 bci = 0; | |
1517 } else { | |
1518 PcDesc* pd = nm->pc_desc_at(pc); | |
1519 decode_offset = pd->scope_decode_offset(); | |
1520 // if decode_offset is not equal to 0, it will execute the | |
1521 // "compiled java method case" at the beginning of the loop. | |
1522 continue; | |
1523 } | |
1524 } | |
1525 } | |
1526 #ifdef ASSERT | |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1527 assert(st_method() == method && st.bci() == bci, |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1528 "Wrong stack trace"); |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1529 st.next(); |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1530 // vframeStream::method isn't GC-safe so store off a copy |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1531 // of the Method* in case we GC. |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1532 if (!st.at_end()) { |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1533 st_method = st.method(); |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1534 } |
0 | 1535 #endif |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1536 |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1537 // the format of the stacktrace will be: |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1538 // - 1 or more fillInStackTrace frames for the exception class (skipped) |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1539 // - 0 or more <init> methods for the exception class (skipped) |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1540 // - rest of the stack |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1541 |
0 | 1542 if (!skip_fillInStackTrace_check) { |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1543 if ((method->name() == vmSymbols::fillInStackTrace_name() || |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1544 method->name() == vmSymbols::fillInStackTrace0_name()) && |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1545 throwable->is_a(method->method_holder())) { |
0 | 1546 continue; |
1547 } | |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1548 else { |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1549 skip_fillInStackTrace_check = true; // gone past them all |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1550 } |
0 | 1551 } |
1552 if (!skip_throwableInit_check) { | |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1553 assert(skip_fillInStackTrace_check, "logic error in backtrace filtering"); |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1554 |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1555 // skip <init> methods of the exception class and superclasses |
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1556 // This is simlar to classic VM. |
0 | 1557 if (method->name() == vmSymbols::object_initializer_name() && |
1558 throwable->is_a(method->method_holder())) { | |
1559 continue; | |
1560 } else { | |
2476
6a615eae2f34
7034585: Adjust fillInStackTrace filtering to assist 6998871
dholmes
parents:
2379
diff
changeset
|
1561 // there are none or we've seen them all - either way stop checking |
0 | 1562 skip_throwableInit_check = true; |
1563 } | |
1564 } | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1565 if (method->is_hidden()) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1566 if (skip_hidden) continue; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1567 } |
0 | 1568 bt.push(method, bci, CHECK); |
1569 total_count++; | |
1570 } | |
1571 | |
1572 // Put completed stack trace into throwable object | |
1573 set_backtrace(throwable(), bt.backtrace()); | |
1574 } | |
1575 | |
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1576 void java_lang_Throwable::fill_in_stack_trace(Handle throwable, methodHandle method) { |
0 | 1577 // No-op if stack trace is disabled |
1578 if (!StackTraceInThrowable) { | |
1579 return; | |
1580 } | |
1581 | |
1582 // Disable stack traces for some preallocated out of memory errors | |
1583 if (!Universe::should_fill_in_stack_trace(throwable)) { | |
1584 return; | |
1585 } | |
1586 | |
1587 PRESERVE_EXCEPTION_MARK; | |
1588 | |
1589 JavaThread* thread = JavaThread::active(); | |
3272
01147d8aac1d
7009923: JSR 292: VM crash in JavaThread::last_frame
coleenp
parents:
2477
diff
changeset
|
1590 fill_in_stack_trace(throwable, method, thread); |
0 | 1591 // ignore exceptions thrown during stack trace filling |
1592 CLEAR_PENDING_EXCEPTION; | |
1593 } | |
1594 | |
1595 void java_lang_Throwable::allocate_backtrace(Handle throwable, TRAPS) { | |
1596 // Allocate stack trace - backtrace is created but not filled in | |
1597 | |
1598 // No-op if stack trace is disabled | |
1599 if (!StackTraceInThrowable) return; | |
1600 | |
1601 objArrayOop h_oop = oopFactory::new_objectArray(trace_size, CHECK); | |
1602 objArrayHandle backtrace (THREAD, h_oop); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1603 typeArrayOop m_oop = oopFactory::new_metaDataArray(trace_chunk_size, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1604 typeArrayHandle methods (THREAD, m_oop); |
0 | 1605 typeArrayOop b = oopFactory::new_shortArray(trace_chunk_size, CHECK); |
1606 typeArrayHandle bcis(THREAD, b); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1607 objArrayOop mirror_oop = oopFactory::new_objectArray(trace_chunk_size, CHECK); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1608 objArrayHandle mirrors (THREAD, mirror_oop); |
0 | 1609 |
1610 // backtrace has space for one chunk (next is NULL) | |
1611 backtrace->obj_at_put(trace_methods_offset, methods()); | |
1612 backtrace->obj_at_put(trace_bcis_offset, bcis()); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1613 backtrace->obj_at_put(trace_mirrors_offset, mirrors()); |
0 | 1614 set_backtrace(throwable(), backtrace()); |
1615 } | |
1616 | |
1617 | |
1618 void java_lang_Throwable::fill_in_stack_trace_of_preallocated_backtrace(Handle throwable) { | |
1619 // Fill in stack trace into preallocated backtrace (no GC) | |
1620 | |
1621 // No-op if stack trace is disabled | |
1622 if (!StackTraceInThrowable) return; | |
1623 | |
1142 | 1624 assert(throwable->is_a(SystemDictionary::Throwable_klass()), "sanity check"); |
0 | 1625 |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1626 objArrayOop backtrace = (objArrayOop)java_lang_Throwable::backtrace(throwable()); |
0 | 1627 assert(backtrace != NULL, "backtrace not preallocated"); |
1628 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1629 oop m = backtrace->obj_at(trace_methods_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1630 typeArrayOop methods = typeArrayOop(m); |
0 | 1631 assert(methods != NULL && methods->length() > 0, "method array not preallocated"); |
1632 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1633 oop b = backtrace->obj_at(trace_bcis_offset); |
0 | 1634 typeArrayOop bcis = typeArrayOop(b); |
1635 assert(bcis != NULL, "bci array not preallocated"); | |
1636 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1637 oop mr = backtrace->obj_at(trace_mirrors_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1638 objArrayOop mirrors = objArrayOop(mr); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1639 assert(mirrors != NULL, "bci array not preallocated"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1640 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1641 assert(methods->length() == bcis->length() && |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1642 methods->length() == mirrors->length(), |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1643 "method and bci arrays should match"); |
0 | 1644 |
1645 JavaThread* thread = JavaThread::current(); | |
1646 ResourceMark rm(thread); | |
1647 vframeStream st(thread); | |
1648 | |
1649 // Unlike fill_in_stack_trace we do not skip fillInStackTrace or throwable init | |
1650 // methods as preallocated errors aren't created by "java" code. | |
1651 | |
1652 // fill in as much stack trace as possible | |
1653 int max_chunks = MIN2(methods->length(), (int)MaxJavaStackTraceDepth); | |
1654 int chunk_count = 0; | |
1655 | |
1656 for (;!st.at_end(); st.next()) { | |
4817
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1657 // Add entry and smear the -1 bci to 0 since the array only holds |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1658 // unsigned shorts. The later line number lookup would just smear |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1659 // the -1 to a 0 even if it could be recorded. |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1660 int bci = st.bci(); |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1661 if (bci == SynchronizationEntryBCI) bci = 0; |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1662 assert(bci == (jushort)bci, "doesn't fit"); |
a81f60ddab06
7130676: Tiered: assert(bci == 0 || 0<= bci && bci<code_size()) during stack trace construction
never
parents:
4009
diff
changeset
|
1663 bcis->ushort_at_put(chunk_count, bci); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1664 methods->metadata_at_put(chunk_count, st.method()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1665 mirrors->obj_at_put(chunk_count, |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1666 st.method()->method_holder()->java_mirror()); |
0 | 1667 |
1668 chunk_count++; | |
1669 | |
1670 // Bail-out for deep stacks | |
1671 if (chunk_count >= max_chunks) break; | |
1672 } | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1673 |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1674 // For Java 7+ we support the Throwable immutability protocol defined for Java 7. This support |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1675 // was missing in 7u0 so in 7u0 there is a workaround in the Throwable class. That workaround |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1676 // can be removed in a JDK using this JVM version |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1677 if (JDK_Version::is_gte_jdk17x_version()) { |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1678 java_lang_Throwable::set_stacktrace(throwable(), java_lang_Throwable::unassigned_stacktrace()); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1679 assert(java_lang_Throwable::unassigned_stacktrace() != NULL, "not initialized"); |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1680 } |
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
1681 |
0 | 1682 } |
1683 | |
1684 | |
1685 int java_lang_Throwable::get_stack_trace_depth(oop throwable, TRAPS) { | |
1686 if (throwable == NULL) { | |
1687 THROW_0(vmSymbols::java_lang_NullPointerException()); | |
1688 } | |
1689 objArrayOop chunk = objArrayOop(backtrace(throwable)); | |
1690 int depth = 0; | |
1691 if (chunk != NULL) { | |
1692 // Iterate over chunks and count full ones | |
1693 while (true) { | |
1694 objArrayOop next = objArrayOop(chunk->obj_at(trace_next_offset)); | |
1695 if (next == NULL) break; | |
1696 depth += trace_chunk_size; | |
1697 chunk = next; | |
1698 } | |
1699 assert(chunk != NULL && chunk->obj_at(trace_next_offset) == NULL, "sanity check"); | |
1700 // Count element in remaining partial chunk | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1701 typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset)); |
0 | 1702 typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset)); |
1703 assert(methods != NULL && bcis != NULL, "sanity check"); | |
1704 for (int i = 0; i < methods->length(); i++) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1705 if (methods->metadata_at(i) == NULL) break; |
0 | 1706 depth++; |
1707 } | |
1708 } | |
1709 return depth; | |
1710 } | |
1711 | |
1712 | |
1713 oop java_lang_Throwable::get_stack_trace_element(oop throwable, int index, TRAPS) { | |
1714 if (throwable == NULL) { | |
1715 THROW_0(vmSymbols::java_lang_NullPointerException()); | |
1716 } | |
1717 if (index < 0) { | |
1718 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL); | |
1719 } | |
1720 // Compute how many chunks to skip and index into actual chunk | |
1721 objArrayOop chunk = objArrayOop(backtrace(throwable)); | |
1722 int skip_chunks = index / trace_chunk_size; | |
1723 int chunk_index = index % trace_chunk_size; | |
1724 while (chunk != NULL && skip_chunks > 0) { | |
1725 chunk = objArrayOop(chunk->obj_at(trace_next_offset)); | |
1726 skip_chunks--; | |
1727 } | |
1728 if (chunk == NULL) { | |
1729 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL); | |
1730 } | |
1731 // Get method,bci from chunk | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1732 typeArrayOop methods = typeArrayOop(chunk->obj_at(trace_methods_offset)); |
0 | 1733 typeArrayOop bcis = typeArrayOop(chunk->obj_at(trace_bcis_offset)); |
1734 assert(methods != NULL && bcis != NULL, "sanity check"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1735 methodHandle method(THREAD, ((Method*)methods->metadata_at(chunk_index))); |
0 | 1736 int bci = bcis->ushort_at(chunk_index); |
1737 // Chunk can be partial full | |
1738 if (method.is_null()) { | |
1739 THROW_(vmSymbols::java_lang_IndexOutOfBoundsException(), NULL); | |
1740 } | |
1741 | |
1742 oop element = java_lang_StackTraceElement::create(method, bci, CHECK_0); | |
1743 return element; | |
1744 } | |
1745 | |
1746 oop java_lang_StackTraceElement::create(methodHandle method, int bci, TRAPS) { | |
1747 // SystemDictionary::stackTraceElement_klass() will be null for pre-1.4 JDKs | |
1748 assert(JDK_Version::is_gte_jdk14x_version(), "should only be called in >= 1.4"); | |
1749 | |
1750 // Allocate java.lang.StackTraceElement instance | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1751 Klass* k = SystemDictionary::StackTraceElement_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1752 assert(k != NULL, "must be loaded in 1.4+"); |
0 | 1753 instanceKlassHandle ik (THREAD, k); |
1754 if (ik->should_be_initialized()) { | |
1755 ik->initialize(CHECK_0); | |
1756 } | |
1757 | |
1758 Handle element = ik->allocate_instance_handle(CHECK_0); | |
1759 // Fill in class name | |
1760 ResourceMark rm(THREAD); | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6867
diff
changeset
|
1761 const char* str = method->method_holder()->external_name(); |
0 | 1762 oop classname = StringTable::intern((char*) str, CHECK_0); |
1763 java_lang_StackTraceElement::set_declaringClass(element(), classname); | |
1764 // Fill in method name | |
1765 oop methodname = StringTable::intern(method->name(), CHECK_0); | |
1766 java_lang_StackTraceElement::set_methodName(element(), methodname); | |
1767 // Fill in source file name | |
6940
18fb7da42534
8000725: NPG: method_holder() and pool_holder() and pool_holder field should be InstanceKlass
coleenp
parents:
6867
diff
changeset
|
1768 Symbol* source = method->method_holder()->source_file_name(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1769 if (ShowHiddenFrames && source == NULL) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1770 source = vmSymbols::unknown_class_name(); |
0 | 1771 oop filename = StringTable::intern(source, CHECK_0); |
1772 java_lang_StackTraceElement::set_fileName(element(), filename); | |
1773 // File in source line number | |
1774 int line_number; | |
1775 if (method->is_native()) { | |
1776 // Negative value different from -1 below, enabling Java code in | |
1777 // class java.lang.StackTraceElement to distinguish "native" from | |
1778 // "no LineNumberTable". | |
1779 line_number = -2; | |
1780 } else { | |
1781 // Returns -1 if no LineNumberTable, and otherwise actual line number | |
1782 line_number = method->line_number_from_bci(bci); | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1783 if (line_number == -1 && ShowHiddenFrames) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1784 line_number = bci + 1000000; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
1785 } |
0 | 1786 } |
1787 java_lang_StackTraceElement::set_lineNumber(element(), line_number); | |
1788 | |
1789 return element(); | |
1790 } | |
1791 | |
1792 | |
1793 void java_lang_reflect_AccessibleObject::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1794 Klass* k = SystemDictionary::reflect_AccessibleObject_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1795 compute_offset(override_offset, k, vmSymbols::override_name(), vmSymbols::bool_signature()); |
0 | 1796 } |
1797 | |
1798 jboolean java_lang_reflect_AccessibleObject::override(oop reflect) { | |
1799 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1800 return (jboolean) reflect->bool_field(override_offset); | |
1801 } | |
1802 | |
1803 void java_lang_reflect_AccessibleObject::set_override(oop reflect, jboolean value) { | |
1804 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1805 reflect->bool_field_put(override_offset, (int) value); | |
1806 } | |
1807 | |
1808 void java_lang_reflect_Method::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1809 Klass* k = SystemDictionary::reflect_Method_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1810 compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1811 compute_offset(name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1812 compute_offset(returnType_offset, k, vmSymbols::returnType_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1813 compute_offset(parameterTypes_offset, k, vmSymbols::parameterTypes_name(), vmSymbols::class_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1814 compute_offset(exceptionTypes_offset, k, vmSymbols::exceptionTypes_name(), vmSymbols::class_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1815 compute_offset(slot_offset, k, vmSymbols::slot_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1816 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
0 | 1817 // The generic signature and annotations fields are only present in 1.5 |
1818 signature_offset = -1; | |
1819 annotations_offset = -1; | |
1820 parameter_annotations_offset = -1; | |
1821 annotation_default_offset = -1; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1822 type_annotations_offset = -1; |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1823 compute_optional_offset(signature_offset, k, vmSymbols::signature_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1824 compute_optional_offset(annotations_offset, k, vmSymbols::annotations_name(), vmSymbols::byte_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1825 compute_optional_offset(parameter_annotations_offset, k, vmSymbols::parameter_annotations_name(), vmSymbols::byte_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1826 compute_optional_offset(annotation_default_offset, k, vmSymbols::annotation_default_name(), vmSymbols::byte_array_signature()); |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1827 compute_optional_offset(type_annotations_offset, k, vmSymbols::type_annotations_name(), vmSymbols::byte_array_signature()); |
0 | 1828 } |
1829 | |
1830 Handle java_lang_reflect_Method::create(TRAPS) { | |
1831 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1832 Klass* klass = SystemDictionary::reflect_Method_klass(); |
0 | 1833 // This class is eagerly initialized during VM initialization, since we keep a refence |
1834 // to one of the methods | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1835 assert(InstanceKlass::cast(klass)->is_initialized(), "must be initialized"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1836 return InstanceKlass::cast(klass)->allocate_instance_handle(CHECK_NH); |
0 | 1837 } |
1838 | |
1839 oop java_lang_reflect_Method::clazz(oop reflect) { | |
1840 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1841 return reflect->obj_field(clazz_offset); | |
1842 } | |
1843 | |
1844 void java_lang_reflect_Method::set_clazz(oop reflect, oop value) { | |
1845 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1846 reflect->obj_field_put(clazz_offset, value); | |
1847 } | |
1848 | |
1849 int java_lang_reflect_Method::slot(oop reflect) { | |
1850 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1851 return reflect->int_field(slot_offset); | |
1852 } | |
1853 | |
1854 void java_lang_reflect_Method::set_slot(oop reflect, int value) { | |
1855 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1856 reflect->int_field_put(slot_offset, value); | |
1857 } | |
1858 | |
1859 oop java_lang_reflect_Method::name(oop method) { | |
1860 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1861 return method->obj_field(name_offset); | |
1862 } | |
1863 | |
1864 void java_lang_reflect_Method::set_name(oop method, oop value) { | |
1865 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1866 method->obj_field_put(name_offset, value); | |
1867 } | |
1868 | |
1869 oop java_lang_reflect_Method::return_type(oop method) { | |
1870 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1871 return method->obj_field(returnType_offset); | |
1872 } | |
1873 | |
1874 void java_lang_reflect_Method::set_return_type(oop method, oop value) { | |
1875 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1876 method->obj_field_put(returnType_offset, value); | |
1877 } | |
1878 | |
1879 oop java_lang_reflect_Method::parameter_types(oop method) { | |
1880 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1881 return method->obj_field(parameterTypes_offset); | |
1882 } | |
1883 | |
1884 void java_lang_reflect_Method::set_parameter_types(oop method, oop value) { | |
1885 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1886 method->obj_field_put(parameterTypes_offset, value); | |
1887 } | |
1888 | |
1889 oop java_lang_reflect_Method::exception_types(oop method) { | |
1890 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1891 return method->obj_field(exceptionTypes_offset); | |
1892 } | |
1893 | |
1894 void java_lang_reflect_Method::set_exception_types(oop method, oop value) { | |
1895 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1896 method->obj_field_put(exceptionTypes_offset, value); | |
1897 } | |
1898 | |
1899 int java_lang_reflect_Method::modifiers(oop method) { | |
1900 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1901 return method->int_field(modifiers_offset); | |
1902 } | |
1903 | |
1904 void java_lang_reflect_Method::set_modifiers(oop method, int value) { | |
1905 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1906 method->int_field_put(modifiers_offset, value); | |
1907 } | |
1908 | |
1909 bool java_lang_reflect_Method::has_signature_field() { | |
1910 return (signature_offset >= 0); | |
1911 } | |
1912 | |
1913 oop java_lang_reflect_Method::signature(oop method) { | |
1914 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1915 assert(has_signature_field(), "signature field must be present"); | |
1916 return method->obj_field(signature_offset); | |
1917 } | |
1918 | |
1919 void java_lang_reflect_Method::set_signature(oop method, oop value) { | |
1920 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1921 assert(has_signature_field(), "signature field must be present"); | |
1922 method->obj_field_put(signature_offset, value); | |
1923 } | |
1924 | |
1925 bool java_lang_reflect_Method::has_annotations_field() { | |
1926 return (annotations_offset >= 0); | |
1927 } | |
1928 | |
1929 oop java_lang_reflect_Method::annotations(oop method) { | |
1930 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1931 assert(has_annotations_field(), "annotations field must be present"); | |
1932 return method->obj_field(annotations_offset); | |
1933 } | |
1934 | |
1935 void java_lang_reflect_Method::set_annotations(oop method, oop value) { | |
1936 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1937 assert(has_annotations_field(), "annotations field must be present"); | |
1938 method->obj_field_put(annotations_offset, value); | |
1939 } | |
1940 | |
1941 bool java_lang_reflect_Method::has_parameter_annotations_field() { | |
1942 return (parameter_annotations_offset >= 0); | |
1943 } | |
1944 | |
1945 oop java_lang_reflect_Method::parameter_annotations(oop method) { | |
1946 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1947 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
1948 return method->obj_field(parameter_annotations_offset); | |
1949 } | |
1950 | |
1951 void java_lang_reflect_Method::set_parameter_annotations(oop method, oop value) { | |
1952 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1953 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
1954 method->obj_field_put(parameter_annotations_offset, value); | |
1955 } | |
1956 | |
1957 bool java_lang_reflect_Method::has_annotation_default_field() { | |
1958 return (annotation_default_offset >= 0); | |
1959 } | |
1960 | |
1961 oop java_lang_reflect_Method::annotation_default(oop method) { | |
1962 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1963 assert(has_annotation_default_field(), "annotation default field must be present"); | |
1964 return method->obj_field(annotation_default_offset); | |
1965 } | |
1966 | |
1967 void java_lang_reflect_Method::set_annotation_default(oop method, oop value) { | |
1968 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
1969 assert(has_annotation_default_field(), "annotation default field must be present"); | |
1970 method->obj_field_put(annotation_default_offset, value); | |
1971 } | |
1972 | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1973 bool java_lang_reflect_Method::has_type_annotations_field() { |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1974 return (type_annotations_offset >= 0); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1975 } |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1976 |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1977 oop java_lang_reflect_Method::type_annotations(oop method) { |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1978 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1979 assert(has_type_annotations_field(), "type_annotations field must be present"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1980 return method->obj_field(type_annotations_offset); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1981 } |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1982 |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1983 void java_lang_reflect_Method::set_type_annotations(oop method, oop value) { |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1984 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1985 assert(has_type_annotations_field(), "type_annotations field must be present"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1986 method->obj_field_put(type_annotations_offset, value); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1987 } |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
1988 |
0 | 1989 void java_lang_reflect_Constructor::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
1990 Klass* k = SystemDictionary::reflect_Constructor_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1991 compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1992 compute_offset(parameterTypes_offset, k, vmSymbols::parameterTypes_name(), vmSymbols::class_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1993 compute_offset(exceptionTypes_offset, k, vmSymbols::exceptionTypes_name(), vmSymbols::class_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1994 compute_offset(slot_offset, k, vmSymbols::slot_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
1995 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
0 | 1996 // The generic signature and annotations fields are only present in 1.5 |
1997 signature_offset = -1; | |
1998 annotations_offset = -1; | |
1999 parameter_annotations_offset = -1; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2000 type_annotations_offset = -1; |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2001 compute_optional_offset(signature_offset, k, vmSymbols::signature_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2002 compute_optional_offset(annotations_offset, k, vmSymbols::annotations_name(), vmSymbols::byte_array_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2003 compute_optional_offset(parameter_annotations_offset, k, vmSymbols::parameter_annotations_name(), vmSymbols::byte_array_signature()); |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2004 compute_optional_offset(type_annotations_offset, k, vmSymbols::type_annotations_name(), vmSymbols::byte_array_signature()); |
0 | 2005 } |
2006 | |
2007 Handle java_lang_reflect_Constructor::create(TRAPS) { | |
2008 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2009 Symbol* name = vmSymbols::java_lang_reflect_Constructor(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2010 Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
0 | 2011 instanceKlassHandle klass (THREAD, k); |
2012 // Ensure it is initialized | |
2013 klass->initialize(CHECK_NH); | |
2014 return klass->allocate_instance_handle(CHECK_NH); | |
2015 } | |
2016 | |
2017 oop java_lang_reflect_Constructor::clazz(oop reflect) { | |
2018 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2019 return reflect->obj_field(clazz_offset); | |
2020 } | |
2021 | |
2022 void java_lang_reflect_Constructor::set_clazz(oop reflect, oop value) { | |
2023 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2024 reflect->obj_field_put(clazz_offset, value); | |
2025 } | |
2026 | |
2027 oop java_lang_reflect_Constructor::parameter_types(oop constructor) { | |
2028 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2029 return constructor->obj_field(parameterTypes_offset); | |
2030 } | |
2031 | |
2032 void java_lang_reflect_Constructor::set_parameter_types(oop constructor, oop value) { | |
2033 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2034 constructor->obj_field_put(parameterTypes_offset, value); | |
2035 } | |
2036 | |
2037 oop java_lang_reflect_Constructor::exception_types(oop constructor) { | |
2038 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2039 return constructor->obj_field(exceptionTypes_offset); | |
2040 } | |
2041 | |
2042 void java_lang_reflect_Constructor::set_exception_types(oop constructor, oop value) { | |
2043 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2044 constructor->obj_field_put(exceptionTypes_offset, value); | |
2045 } | |
2046 | |
2047 int java_lang_reflect_Constructor::slot(oop reflect) { | |
2048 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2049 return reflect->int_field(slot_offset); | |
2050 } | |
2051 | |
2052 void java_lang_reflect_Constructor::set_slot(oop reflect, int value) { | |
2053 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2054 reflect->int_field_put(slot_offset, value); | |
2055 } | |
2056 | |
2057 int java_lang_reflect_Constructor::modifiers(oop constructor) { | |
2058 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2059 return constructor->int_field(modifiers_offset); | |
2060 } | |
2061 | |
2062 void java_lang_reflect_Constructor::set_modifiers(oop constructor, int value) { | |
2063 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2064 constructor->int_field_put(modifiers_offset, value); | |
2065 } | |
2066 | |
2067 bool java_lang_reflect_Constructor::has_signature_field() { | |
2068 return (signature_offset >= 0); | |
2069 } | |
2070 | |
2071 oop java_lang_reflect_Constructor::signature(oop constructor) { | |
2072 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2073 assert(has_signature_field(), "signature field must be present"); | |
2074 return constructor->obj_field(signature_offset); | |
2075 } | |
2076 | |
2077 void java_lang_reflect_Constructor::set_signature(oop constructor, oop value) { | |
2078 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2079 assert(has_signature_field(), "signature field must be present"); | |
2080 constructor->obj_field_put(signature_offset, value); | |
2081 } | |
2082 | |
2083 bool java_lang_reflect_Constructor::has_annotations_field() { | |
2084 return (annotations_offset >= 0); | |
2085 } | |
2086 | |
2087 oop java_lang_reflect_Constructor::annotations(oop constructor) { | |
2088 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2089 assert(has_annotations_field(), "annotations field must be present"); | |
2090 return constructor->obj_field(annotations_offset); | |
2091 } | |
2092 | |
2093 void java_lang_reflect_Constructor::set_annotations(oop constructor, oop value) { | |
2094 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2095 assert(has_annotations_field(), "annotations field must be present"); | |
2096 constructor->obj_field_put(annotations_offset, value); | |
2097 } | |
2098 | |
2099 bool java_lang_reflect_Constructor::has_parameter_annotations_field() { | |
2100 return (parameter_annotations_offset >= 0); | |
2101 } | |
2102 | |
2103 oop java_lang_reflect_Constructor::parameter_annotations(oop method) { | |
2104 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2105 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
2106 return method->obj_field(parameter_annotations_offset); | |
2107 } | |
2108 | |
2109 void java_lang_reflect_Constructor::set_parameter_annotations(oop method, oop value) { | |
2110 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2111 assert(has_parameter_annotations_field(), "parameter annotations field must be present"); | |
2112 method->obj_field_put(parameter_annotations_offset, value); | |
2113 } | |
2114 | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2115 bool java_lang_reflect_Constructor::has_type_annotations_field() { |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2116 return (type_annotations_offset >= 0); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2117 } |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2118 |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2119 oop java_lang_reflect_Constructor::type_annotations(oop constructor) { |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2120 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2121 assert(has_type_annotations_field(), "type_annotations field must be present"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2122 return constructor->obj_field(type_annotations_offset); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2123 } |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2124 |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2125 void java_lang_reflect_Constructor::set_type_annotations(oop constructor, oop value) { |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2126 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2127 assert(has_type_annotations_field(), "type_annotations field must be present"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2128 constructor->obj_field_put(type_annotations_offset, value); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2129 } |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2130 |
0 | 2131 void java_lang_reflect_Field::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2132 Klass* k = SystemDictionary::reflect_Field_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2133 compute_offset(clazz_offset, k, vmSymbols::clazz_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2134 compute_offset(name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2135 compute_offset(type_offset, k, vmSymbols::type_name(), vmSymbols::class_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2136 compute_offset(slot_offset, k, vmSymbols::slot_name(), vmSymbols::int_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2137 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
0 | 2138 // The generic signature and annotations fields are only present in 1.5 |
2139 signature_offset = -1; | |
2140 annotations_offset = -1; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2141 type_annotations_offset = -1; |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2142 compute_optional_offset(signature_offset, k, vmSymbols::signature_name(), vmSymbols::string_signature()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2143 compute_optional_offset(annotations_offset, k, vmSymbols::annotations_name(), vmSymbols::byte_array_signature()); |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2144 compute_optional_offset(type_annotations_offset, k, vmSymbols::type_annotations_name(), vmSymbols::byte_array_signature()); |
0 | 2145 } |
2146 | |
2147 Handle java_lang_reflect_Field::create(TRAPS) { | |
2148 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2149 Symbol* name = vmSymbols::java_lang_reflect_Field(); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2150 Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
0 | 2151 instanceKlassHandle klass (THREAD, k); |
2152 // Ensure it is initialized | |
2153 klass->initialize(CHECK_NH); | |
2154 return klass->allocate_instance_handle(CHECK_NH); | |
2155 } | |
2156 | |
2157 oop java_lang_reflect_Field::clazz(oop reflect) { | |
2158 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2159 return reflect->obj_field(clazz_offset); | |
2160 } | |
2161 | |
2162 void java_lang_reflect_Field::set_clazz(oop reflect, oop value) { | |
2163 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2164 reflect->obj_field_put(clazz_offset, value); | |
2165 } | |
2166 | |
2167 oop java_lang_reflect_Field::name(oop field) { | |
2168 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2169 return field->obj_field(name_offset); | |
2170 } | |
2171 | |
2172 void java_lang_reflect_Field::set_name(oop field, oop value) { | |
2173 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2174 field->obj_field_put(name_offset, value); | |
2175 } | |
2176 | |
2177 oop java_lang_reflect_Field::type(oop field) { | |
2178 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2179 return field->obj_field(type_offset); | |
2180 } | |
2181 | |
2182 void java_lang_reflect_Field::set_type(oop field, oop value) { | |
2183 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2184 field->obj_field_put(type_offset, value); | |
2185 } | |
2186 | |
2187 int java_lang_reflect_Field::slot(oop reflect) { | |
2188 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2189 return reflect->int_field(slot_offset); | |
2190 } | |
2191 | |
2192 void java_lang_reflect_Field::set_slot(oop reflect, int value) { | |
2193 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2194 reflect->int_field_put(slot_offset, value); | |
2195 } | |
2196 | |
2197 int java_lang_reflect_Field::modifiers(oop field) { | |
2198 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2199 return field->int_field(modifiers_offset); | |
2200 } | |
2201 | |
2202 void java_lang_reflect_Field::set_modifiers(oop field, int value) { | |
2203 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2204 field->int_field_put(modifiers_offset, value); | |
2205 } | |
2206 | |
2207 bool java_lang_reflect_Field::has_signature_field() { | |
2208 return (signature_offset >= 0); | |
2209 } | |
2210 | |
2211 oop java_lang_reflect_Field::signature(oop field) { | |
2212 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2213 assert(has_signature_field(), "signature field must be present"); | |
2214 return field->obj_field(signature_offset); | |
2215 } | |
2216 | |
2217 void java_lang_reflect_Field::set_signature(oop field, oop value) { | |
2218 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2219 assert(has_signature_field(), "signature field must be present"); | |
2220 field->obj_field_put(signature_offset, value); | |
2221 } | |
2222 | |
2223 bool java_lang_reflect_Field::has_annotations_field() { | |
2224 return (annotations_offset >= 0); | |
2225 } | |
2226 | |
2227 oop java_lang_reflect_Field::annotations(oop field) { | |
2228 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2229 assert(has_annotations_field(), "annotations field must be present"); | |
2230 return field->obj_field(annotations_offset); | |
2231 } | |
2232 | |
2233 void java_lang_reflect_Field::set_annotations(oop field, oop value) { | |
2234 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
2235 assert(has_annotations_field(), "annotations field must be present"); | |
2236 field->obj_field_put(annotations_offset, value); | |
2237 } | |
2238 | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2239 bool java_lang_reflect_Field::has_type_annotations_field() { |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2240 return (type_annotations_offset >= 0); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2241 } |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2242 |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2243 oop java_lang_reflect_Field::type_annotations(oop field) { |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2244 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2245 assert(has_type_annotations_field(), "type_annotations field must be present"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2246 return field->obj_field(type_annotations_offset); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2247 } |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2248 |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2249 void java_lang_reflect_Field::set_type_annotations(oop field, oop value) { |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2250 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2251 assert(has_type_annotations_field(), "type_annotations field must be present"); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2252 field->obj_field_put(type_annotations_offset, value); |
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2253 } |
0 | 2254 |
2255 void sun_reflect_ConstantPool::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2256 Klass* k = SystemDictionary::reflect_ConstantPool_klass(); |
0 | 2257 // This null test can be removed post beta |
2258 if (k != NULL) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2259 // The field is called ConstantPool* in the sun.reflect.ConstantPool class. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2260 compute_offset(_oop_offset, k, vmSymbols::ConstantPool_name(), vmSymbols::object_signature()); |
0 | 2261 } |
2262 } | |
2263 | |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2264 void java_lang_reflect_Parameter::compute_offsets() { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2265 Klass* k = SystemDictionary::reflect_Parameter_klass(); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2266 if(NULL != k) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2267 compute_offset(name_offset, k, vmSymbols::name_name(), vmSymbols::string_signature()); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2268 compute_offset(modifiers_offset, k, vmSymbols::modifiers_name(), vmSymbols::int_signature()); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2269 compute_offset(index_offset, k, vmSymbols::index_name(), vmSymbols::int_signature()); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2270 compute_offset(executable_offset, k, vmSymbols::executable_name(), vmSymbols::executable_signature()); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2271 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2272 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2273 |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2274 Handle java_lang_reflect_Parameter::create(TRAPS) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2275 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2276 Symbol* name = vmSymbols::java_lang_reflect_Parameter(); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2277 Klass* k = SystemDictionary::resolve_or_fail(name, true, CHECK_NH); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2278 instanceKlassHandle klass (THREAD, k); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2279 // Ensure it is initialized |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2280 klass->initialize(CHECK_NH); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2281 return klass->allocate_instance_handle(CHECK_NH); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2282 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2283 |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2284 oop java_lang_reflect_Parameter::name(oop param) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2285 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2286 return param->obj_field(name_offset); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2287 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2288 |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2289 void java_lang_reflect_Parameter::set_name(oop param, oop value) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2290 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2291 param->obj_field_put(name_offset, value); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2292 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2293 |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2294 int java_lang_reflect_Parameter::modifiers(oop param) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2295 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2296 return param->int_field(modifiers_offset); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2297 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2298 |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2299 void java_lang_reflect_Parameter::set_modifiers(oop param, int value) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2300 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2301 param->int_field_put(modifiers_offset, value); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2302 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2303 |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2304 int java_lang_reflect_Parameter::index(oop param) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2305 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2306 return param->int_field(index_offset); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2307 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2308 |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2309 void java_lang_reflect_Parameter::set_index(oop param, int value) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2310 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2311 param->int_field_put(index_offset, value); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2312 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2313 |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2314 oop java_lang_reflect_Parameter::executable(oop param) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2315 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2316 return param->obj_field(executable_offset); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2317 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2318 |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2319 void java_lang_reflect_Parameter::set_executable(oop param, oop value) { |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2320 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2321 param->obj_field_put(executable_offset, value); |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2322 } |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
2323 |
0 | 2324 |
2325 Handle sun_reflect_ConstantPool::create(TRAPS) { | |
2326 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2327 Klass* k = SystemDictionary::reflect_ConstantPool_klass(); |
0 | 2328 instanceKlassHandle klass (THREAD, k); |
2329 // Ensure it is initialized | |
2330 klass->initialize(CHECK_NH); | |
2331 return klass->allocate_instance_handle(CHECK_NH); | |
2332 } | |
2333 | |
2334 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2335 void sun_reflect_ConstantPool::set_cp(oop reflect, ConstantPool* value) { |
0 | 2336 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2337 oop mirror = value->pool_holder()->java_mirror(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2338 // Save the mirror to get back the constant pool. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2339 reflect->obj_field_put(_oop_offset, mirror); |
0 | 2340 } |
2341 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2342 ConstantPool* sun_reflect_ConstantPool::get_cp(oop reflect) { |
0 | 2343 assert(Universe::is_fully_initialized(), "Need to find another solution to the reflection problem"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2344 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2345 oop mirror = reflect->obj_field(_oop_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2346 Klass* k = java_lang_Class::as_Klass(mirror); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2347 assert(k->oop_is_instance(), "Must be"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2348 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2349 // Get the constant pool back from the klass. Since class redefinition |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2350 // merges the new constant pool into the old, this is essentially the |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2351 // same constant pool as the original. If constant pool merging is |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2352 // no longer done in the future, this will have to change to save |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2353 // the original. |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2354 return InstanceKlass::cast(k)->constants(); |
0 | 2355 } |
2356 | |
2357 void sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2358 Klass* k = SystemDictionary::reflect_UnsafeStaticFieldAccessorImpl_klass(); |
0 | 2359 // This null test can be removed post beta |
2360 if (k != NULL) { | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2361 compute_offset(_base_offset, k, |
0 | 2362 vmSymbols::base_name(), vmSymbols::object_signature()); |
2363 } | |
2364 } | |
2365 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2366 oop java_lang_boxing_object::initialize_and_allocate(BasicType type, TRAPS) { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2367 Klass* k = SystemDictionary::box_klass(type); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2368 if (k == NULL) return NULL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2369 instanceKlassHandle h (THREAD, k); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2370 if (!h->is_initialized()) h->initialize(CHECK_0); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2371 return h->allocate_instance(THREAD); |
0 | 2372 } |
2373 | |
2374 | |
2375 oop java_lang_boxing_object::create(BasicType type, jvalue* value, TRAPS) { | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2376 oop box = initialize_and_allocate(type, CHECK_0); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2377 if (box == NULL) return NULL; |
0 | 2378 switch (type) { |
2379 case T_BOOLEAN: | |
2380 box->bool_field_put(value_offset, value->z); | |
2381 break; | |
2382 case T_CHAR: | |
2383 box->char_field_put(value_offset, value->c); | |
2384 break; | |
2385 case T_FLOAT: | |
2386 box->float_field_put(value_offset, value->f); | |
2387 break; | |
2388 case T_DOUBLE: | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2389 box->double_field_put(long_value_offset, value->d); |
0 | 2390 break; |
2391 case T_BYTE: | |
2392 box->byte_field_put(value_offset, value->b); | |
2393 break; | |
2394 case T_SHORT: | |
2395 box->short_field_put(value_offset, value->s); | |
2396 break; | |
2397 case T_INT: | |
2398 box->int_field_put(value_offset, value->i); | |
2399 break; | |
2400 case T_LONG: | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2401 box->long_field_put(long_value_offset, value->j); |
0 | 2402 break; |
2403 default: | |
2404 return NULL; | |
2405 } | |
2406 return box; | |
2407 } | |
2408 | |
2409 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2410 BasicType java_lang_boxing_object::basic_type(oop box) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2411 if (box == NULL) return T_ILLEGAL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2412 BasicType type = SystemDictionary::box_klass_type(box->klass()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2413 if (type == T_OBJECT) // 'unknown' value returned by SD::bkt |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2414 return T_ILLEGAL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2415 return type; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2416 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2417 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2418 |
0 | 2419 BasicType java_lang_boxing_object::get_value(oop box, jvalue* value) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2420 BasicType type = SystemDictionary::box_klass_type(box->klass()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2421 switch (type) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2422 case T_BOOLEAN: |
0 | 2423 value->z = box->bool_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2424 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2425 case T_CHAR: |
0 | 2426 value->c = box->char_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2427 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2428 case T_FLOAT: |
0 | 2429 value->f = box->float_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2430 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2431 case T_DOUBLE: |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2432 value->d = box->double_field(long_value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2433 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2434 case T_BYTE: |
0 | 2435 value->b = box->byte_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2436 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2437 case T_SHORT: |
0 | 2438 value->s = box->short_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2439 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2440 case T_INT: |
0 | 2441 value->i = box->int_field(value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2442 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2443 case T_LONG: |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2444 value->j = box->long_field(long_value_offset); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2445 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2446 default: |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2447 return T_ILLEGAL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2448 } // end switch |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2449 return type; |
0 | 2450 } |
2451 | |
2452 | |
2453 BasicType java_lang_boxing_object::set_value(oop box, jvalue* value) { | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2454 BasicType type = SystemDictionary::box_klass_type(box->klass()); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2455 switch (type) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2456 case T_BOOLEAN: |
0 | 2457 box->bool_field_put(value_offset, value->z); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2458 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2459 case T_CHAR: |
0 | 2460 box->char_field_put(value_offset, value->c); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2461 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2462 case T_FLOAT: |
0 | 2463 box->float_field_put(value_offset, value->f); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2464 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2465 case T_DOUBLE: |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2466 box->double_field_put(long_value_offset, value->d); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2467 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2468 case T_BYTE: |
0 | 2469 box->byte_field_put(value_offset, value->b); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2470 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2471 case T_SHORT: |
0 | 2472 box->short_field_put(value_offset, value->s); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2473 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2474 case T_INT: |
0 | 2475 box->int_field_put(value_offset, value->i); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2476 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2477 case T_LONG: |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
2478 box->long_field_put(long_value_offset, value->j); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2479 break; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2480 default: |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2481 return T_ILLEGAL; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2482 } // end switch |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
2483 return type; |
0 | 2484 } |
2485 | |
2486 | |
665
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2487 void java_lang_boxing_object::print(BasicType type, jvalue* value, outputStream* st) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2488 switch (type) { |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2489 case T_BOOLEAN: st->print("%s", value->z ? "true" : "false"); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2490 case T_CHAR: st->print("%d", value->c); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2491 case T_BYTE: st->print("%d", value->b); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2492 case T_SHORT: st->print("%d", value->s); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2493 case T_INT: st->print("%d", value->i); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2494 case T_LONG: st->print(INT64_FORMAT, value->j); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2495 case T_FLOAT: st->print("%f", value->f); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2496 case T_DOUBLE: st->print("%lf", value->d); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2497 default: st->print("type %d?", type); break; |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2498 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2499 } |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2500 |
c89f86385056
6814659: separable cleanups and subroutines for 6655638
jrose
parents:
579
diff
changeset
|
2501 |
0 | 2502 // Support for java_lang_ref_Reference |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2503 HeapWord *java_lang_ref_Reference::pending_list_lock_addr() { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2504 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Reference_klass()); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2505 address addr = ik->static_field_addr(static_lock_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2506 return (HeapWord*) addr; |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2507 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2508 |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2509 oop java_lang_ref_Reference::pending_list_lock() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2510 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Reference_klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2511 address addr = ik->static_field_addr(static_lock_offset); |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2512 if (UseCompressedOops) { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2513 return oopDesc::load_decode_heap_oop((narrowOop *)addr); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2514 } else { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2515 return oopDesc::load_decode_heap_oop((oop*)addr); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2516 } |
0 | 2517 } |
2518 | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2519 HeapWord *java_lang_ref_Reference::pending_list_addr() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2520 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::Reference_klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2521 address addr = ik->static_field_addr(static_pending_offset); |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2522 // XXX This might not be HeapWord aligned, almost rather be char *. |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2523 return (HeapWord*)addr; |
0 | 2524 } |
2525 | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2526 oop java_lang_ref_Reference::pending_list() { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2527 char *addr = (char *)pending_list_addr(); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2528 if (UseCompressedOops) { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2529 return oopDesc::load_decode_heap_oop((narrowOop *)addr); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2530 } else { |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2531 return oopDesc::load_decode_heap_oop((oop*)addr); |
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
2532 } |
0 | 2533 } |
2534 | |
2535 | |
2536 // Support for java_lang_ref_SoftReference | |
2537 | |
2538 jlong java_lang_ref_SoftReference::timestamp(oop ref) { | |
2539 return ref->long_field(timestamp_offset); | |
2540 } | |
2541 | |
2542 jlong java_lang_ref_SoftReference::clock() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2543 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::SoftReference_klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2544 jlong* offset = (jlong*)ik->static_field_addr(static_clock_offset); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2545 return *offset; |
0 | 2546 } |
2547 | |
2548 void java_lang_ref_SoftReference::set_clock(jlong value) { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2549 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::SoftReference_klass()); |
2376
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2550 jlong* offset = (jlong*)ik->static_field_addr(static_clock_offset); |
c7f3d0b4570f
7017732: move static fields into Class to prepare for perm gen removal
never
parents:
2357
diff
changeset
|
2551 *offset = value; |
0 | 2552 } |
2553 | |
2554 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2555 // Support for java_lang_invoke_MethodHandle |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2556 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2557 int java_lang_invoke_MethodHandle::_type_offset; |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2558 int java_lang_invoke_MethodHandle::_form_offset; |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2559 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2560 int java_lang_invoke_MemberName::_clazz_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2561 int java_lang_invoke_MemberName::_name_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2562 int java_lang_invoke_MemberName::_type_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2563 int java_lang_invoke_MemberName::_flags_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2564 int java_lang_invoke_MemberName::_vmtarget_offset; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2565 int java_lang_invoke_MemberName::_vmloader_offset; |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2566 int java_lang_invoke_MemberName::_vmindex_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2567 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2568 int java_lang_invoke_LambdaForm::_vmentry_offset; |
3905
c26de9aef2ed
7071307: MethodHandle bimorphic inlining should consider the frequency
never
parents:
3900
diff
changeset
|
2569 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2570 void java_lang_invoke_MethodHandle::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2571 Klass* klass_oop = SystemDictionary::MethodHandle_klass(); |
3938 | 2572 if (klass_oop != NULL && EnableInvokeDynamic) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2573 compute_offset(_type_offset, klass_oop, vmSymbols::type_name(), vmSymbols::java_lang_invoke_MethodType_signature()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2574 compute_optional_offset(_form_offset, klass_oop, vmSymbols::form_name(), vmSymbols::java_lang_invoke_LambdaForm_signature()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2575 if (_form_offset == 0) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2576 EnableInvokeDynamic = false; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2577 } |
710 | 2578 } |
2579 } | |
2580 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2581 void java_lang_invoke_MemberName::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2582 Klass* klass_oop = SystemDictionary::MemberName_klass(); |
3938 | 2583 if (klass_oop != NULL && EnableInvokeDynamic) { |
2584 compute_offset(_clazz_offset, klass_oop, vmSymbols::clazz_name(), vmSymbols::class_signature()); | |
2585 compute_offset(_name_offset, klass_oop, vmSymbols::name_name(), vmSymbols::string_signature()); | |
2586 compute_offset(_type_offset, klass_oop, vmSymbols::type_name(), vmSymbols::object_signature()); | |
2587 compute_offset(_flags_offset, klass_oop, vmSymbols::flags_name(), vmSymbols::int_signature()); | |
2588 MEMBERNAME_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); | |
710 | 2589 } |
2590 } | |
2591 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2592 void java_lang_invoke_LambdaForm::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2593 Klass* klass_oop = SystemDictionary::LambdaForm_klass(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2594 if (klass_oop != NULL && EnableInvokeDynamic) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2595 compute_offset(_vmentry_offset, klass_oop, vmSymbols::vmentry_name(), vmSymbols::java_lang_invoke_MemberName_signature()); |
710 | 2596 } |
2597 } | |
2598 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2599 oop java_lang_invoke_MethodHandle::type(oop mh) { |
710 | 2600 return mh->obj_field(_type_offset); |
2601 } | |
2602 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2603 void java_lang_invoke_MethodHandle::set_type(oop mh, oop mtype) { |
710 | 2604 mh->obj_field_put(_type_offset, mtype); |
2605 } | |
2606 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2607 oop java_lang_invoke_MethodHandle::form(oop mh) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2608 assert(_form_offset != 0, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2609 return mh->obj_field(_form_offset); |
710 | 2610 } |
2611 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2612 void java_lang_invoke_MethodHandle::set_form(oop mh, oop lform) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2613 assert(_form_offset != 0, ""); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2614 mh->obj_field_put(_form_offset, lform); |
710 | 2615 } |
2616 | |
2617 /// MemberName accessors | |
2618 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2619 oop java_lang_invoke_MemberName::clazz(oop mname) { |
710 | 2620 assert(is_instance(mname), "wrong type"); |
2621 return mname->obj_field(_clazz_offset); | |
2622 } | |
2623 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2624 void java_lang_invoke_MemberName::set_clazz(oop mname, oop clazz) { |
710 | 2625 assert(is_instance(mname), "wrong type"); |
2626 mname->obj_field_put(_clazz_offset, clazz); | |
2627 } | |
2628 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2629 oop java_lang_invoke_MemberName::name(oop mname) { |
710 | 2630 assert(is_instance(mname), "wrong type"); |
2631 return mname->obj_field(_name_offset); | |
2632 } | |
2633 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2634 void java_lang_invoke_MemberName::set_name(oop mname, oop name) { |
710 | 2635 assert(is_instance(mname), "wrong type"); |
2636 mname->obj_field_put(_name_offset, name); | |
2637 } | |
2638 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2639 oop java_lang_invoke_MemberName::type(oop mname) { |
710 | 2640 assert(is_instance(mname), "wrong type"); |
2641 return mname->obj_field(_type_offset); | |
2642 } | |
2643 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2644 void java_lang_invoke_MemberName::set_type(oop mname, oop type) { |
710 | 2645 assert(is_instance(mname), "wrong type"); |
2646 mname->obj_field_put(_type_offset, type); | |
2647 } | |
2648 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2649 int java_lang_invoke_MemberName::flags(oop mname) { |
710 | 2650 assert(is_instance(mname), "wrong type"); |
2651 return mname->int_field(_flags_offset); | |
2652 } | |
2653 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2654 void java_lang_invoke_MemberName::set_flags(oop mname, int flags) { |
710 | 2655 assert(is_instance(mname), "wrong type"); |
2656 mname->int_field_put(_flags_offset, flags); | |
2657 } | |
2658 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2659 Metadata* java_lang_invoke_MemberName::vmtarget(oop mname) { |
710 | 2660 assert(is_instance(mname), "wrong type"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2661 return (Metadata*)mname->address_field(_vmtarget_offset); |
710 | 2662 } |
2663 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2664 void java_lang_invoke_MemberName::set_vmtarget(oop mname, Metadata* ref) { |
710 | 2665 assert(is_instance(mname), "wrong type"); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2666 // check the type of the vmtarget |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
7180
diff
changeset
|
2667 oop dependency = NULL; |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2668 if (ref != NULL) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2669 switch (flags(mname) & (MN_IS_METHOD | |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2670 MN_IS_CONSTRUCTOR | |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2671 MN_IS_FIELD)) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2672 case MN_IS_METHOD: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2673 case MN_IS_CONSTRUCTOR: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2674 assert(ref->is_method(), "should be a method"); |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
7180
diff
changeset
|
2675 dependency = ((Method*)ref)->method_holder()->java_mirror(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2676 break; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2677 case MN_IS_FIELD: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2678 assert(ref->is_klass(), "should be a class"); |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
7180
diff
changeset
|
2679 dependency = ((Klass*)ref)->java_mirror(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2680 break; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2681 default: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2682 ShouldNotReachHere(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2683 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2684 } |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2685 mname->address_field_put(_vmtarget_offset, (address)ref); |
7185
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
7180
diff
changeset
|
2686 // Add a reference to the loader (actually mirror because anonymous classes will not have |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
7180
diff
changeset
|
2687 // distinct loaders) to ensure the metadata is kept alive |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
7180
diff
changeset
|
2688 // This mirror may be different than the one in clazz field. |
90273fc0a981
8000662: NPG: nashorn ant clean test262 out-of-memory with Java heap
coleenp
parents:
7180
diff
changeset
|
2689 mname->obj_field_put(_vmloader_offset, dependency); |
710 | 2690 } |
2691 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2692 intptr_t java_lang_invoke_MemberName::vmindex(oop mname) { |
710 | 2693 assert(is_instance(mname), "wrong type"); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2694 return (intptr_t) mname->address_field(_vmindex_offset); |
710 | 2695 } |
2696 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2697 void java_lang_invoke_MemberName::set_vmindex(oop mname, intptr_t index) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2698 assert(is_instance(mname), "wrong type"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2699 mname->address_field_put(_vmindex_offset, (address) index); |
710 | 2700 } |
2701 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2702 oop java_lang_invoke_LambdaForm::vmentry(oop lform) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2703 assert(is_instance(lform), "wrong type"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2704 return lform->obj_field(_vmentry_offset); |
710 | 2705 } |
2706 | |
2707 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2708 // Support for java_lang_invoke_MethodType |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2709 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2710 int java_lang_invoke_MethodType::_rtype_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2711 int java_lang_invoke_MethodType::_ptypes_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2712 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2713 void java_lang_invoke_MethodType::compute_offsets() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2714 Klass* k = SystemDictionary::MethodType_klass(); |
710 | 2715 if (k != NULL) { |
2716 compute_offset(_rtype_offset, k, vmSymbols::rtype_name(), vmSymbols::class_signature()); | |
2717 compute_offset(_ptypes_offset, k, vmSymbols::ptypes_name(), vmSymbols::class_array_signature()); | |
2718 } | |
2719 } | |
2720 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2721 void java_lang_invoke_MethodType::print_signature(oop mt, outputStream* st) { |
710 | 2722 st->print("("); |
2723 objArrayOop pts = ptypes(mt); | |
2724 for (int i = 0, limit = pts->length(); i < limit; i++) { | |
2725 java_lang_Class::print_signature(pts->obj_at(i), st); | |
2726 } | |
2727 st->print(")"); | |
2728 java_lang_Class::print_signature(rtype(mt), st); | |
2729 } | |
2730 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2731 Symbol* java_lang_invoke_MethodType::as_signature(oop mt, bool intern_if_not_found, TRAPS) { |
710 | 2732 ResourceMark rm; |
2733 stringStream buffer(128); | |
2734 print_signature(mt, &buffer); | |
2735 const char* sigstr = buffer.base(); | |
2736 int siglen = (int) buffer.size(); | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2737 Symbol *name; |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2738 if (!intern_if_not_found) { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2739 name = SymbolTable::probe(sigstr, siglen); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2740 } else { |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2741 name = SymbolTable::new_symbol(sigstr, siglen, THREAD); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2742 } |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
2743 return name; |
710 | 2744 } |
2745 | |
3461
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2746 bool java_lang_invoke_MethodType::equals(oop mt1, oop mt2) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2747 if (mt1 == mt2) |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2748 return true; |
3461
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2749 if (rtype(mt1) != rtype(mt2)) |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2750 return false; |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2751 if (ptype_count(mt1) != ptype_count(mt2)) |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2752 return false; |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2753 for (int i = ptype_count(mt1) - 1; i >= 0; i--) { |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2754 if (ptype(mt1, i) != ptype(mt2, i)) |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2755 return false; |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2756 } |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2757 return true; |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2758 } |
81d815b05abb
7056328: JSR 292 invocation sometimes fails in adapters for types not on boot class path
jrose
parents:
3363
diff
changeset
|
2759 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2760 oop java_lang_invoke_MethodType::rtype(oop mt) { |
710 | 2761 assert(is_instance(mt), "must be a MethodType"); |
2762 return mt->obj_field(_rtype_offset); | |
2763 } | |
2764 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2765 objArrayOop java_lang_invoke_MethodType::ptypes(oop mt) { |
710 | 2766 assert(is_instance(mt), "must be a MethodType"); |
2767 return (objArrayOop) mt->obj_field(_ptypes_offset); | |
2768 } | |
2769 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2770 oop java_lang_invoke_MethodType::ptype(oop mt, int idx) { |
710 | 2771 return ptypes(mt)->obj_at(idx); |
2772 } | |
2773 | |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2774 int java_lang_invoke_MethodType::ptype_count(oop mt) { |
1133
aa62b9388fce
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
1096
diff
changeset
|
2775 return ptypes(mt)->length(); |
aa62b9388fce
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
1096
diff
changeset
|
2776 } |
aa62b9388fce
6894206: JVM needs a way to traverse method handle structures
twisti
parents:
1096
diff
changeset
|
2777 |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2778 int java_lang_invoke_MethodType::ptype_slot_count(oop mt) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2779 objArrayOop pts = ptypes(mt); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2780 int count = pts->length(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2781 int slots = 0; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2782 for (int i = 0; i < count; i++) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2783 BasicType bt = java_lang_Class::as_BasicType(pts->obj_at(i)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2784 slots += type2size[bt]; |
710 | 2785 } |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2786 return slots; |
710 | 2787 } |
2788 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2789 int java_lang_invoke_MethodType::rtype_slot_count(oop mt) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2790 BasicType bt = java_lang_Class::as_BasicType(rtype(mt)); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2791 return type2size[bt]; |
1793
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1552
diff
changeset
|
2792 } |
d257356e35f0
6939224: MethodHandle.invokeGeneric needs to perform the correct set of conversions
jrose
parents:
1552
diff
changeset
|
2793 |
710 | 2794 |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2795 // Support for java_lang_invoke_CallSite |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2796 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2797 int java_lang_invoke_CallSite::_target_offset; |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2798 |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2799 void java_lang_invoke_CallSite::compute_offsets() { |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2800 if (!EnableInvokeDynamic) return; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2801 Klass* k = SystemDictionary::CallSite_klass(); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2802 if (k != NULL) { |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
2803 compute_offset(_target_offset, k, vmSymbols::target_name(), vmSymbols::java_lang_invoke_MethodHandle_signature()); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2804 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2805 } |
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
2806 |
710 | 2807 |
0 | 2808 // Support for java_security_AccessControlContext |
2809 | |
2810 int java_security_AccessControlContext::_context_offset = 0; | |
2811 int java_security_AccessControlContext::_privilegedContext_offset = 0; | |
2812 int java_security_AccessControlContext::_isPrivileged_offset = 0; | |
2813 | |
2814 void java_security_AccessControlContext::compute_offsets() { | |
2815 assert(_isPrivileged_offset == 0, "offsets should be initialized only once"); | |
2816 fieldDescriptor fd; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2817 InstanceKlass* ik = InstanceKlass::cast(SystemDictionary::AccessControlContext_klass()); |
0 | 2818 |
2819 if (!ik->find_local_field(vmSymbols::context_name(), vmSymbols::protectiondomain_signature(), &fd)) { | |
2820 fatal("Invalid layout of java.security.AccessControlContext"); | |
2821 } | |
2822 _context_offset = fd.offset(); | |
2823 | |
2824 if (!ik->find_local_field(vmSymbols::privilegedContext_name(), vmSymbols::accesscontrolcontext_signature(), &fd)) { | |
2825 fatal("Invalid layout of java.security.AccessControlContext"); | |
2826 } | |
2827 _privilegedContext_offset = fd.offset(); | |
2828 | |
2829 if (!ik->find_local_field(vmSymbols::isPrivileged_name(), vmSymbols::bool_signature(), &fd)) { | |
2830 fatal("Invalid layout of java.security.AccessControlContext"); | |
2831 } | |
2832 _isPrivileged_offset = fd.offset(); | |
2833 } | |
2834 | |
2835 | |
2836 oop java_security_AccessControlContext::create(objArrayHandle context, bool isPrivileged, Handle privileged_context, TRAPS) { | |
2837 assert(_isPrivileged_offset != 0, "offsets should have been initialized"); | |
2838 // Ensure klass is initialized | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2839 InstanceKlass::cast(SystemDictionary::AccessControlContext_klass())->initialize(CHECK_0); |
0 | 2840 // Allocate result |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2841 oop result = InstanceKlass::cast(SystemDictionary::AccessControlContext_klass())->allocate_instance(CHECK_0); |
0 | 2842 // Fill in values |
2843 result->obj_field_put(_context_offset, context()); | |
2844 result->obj_field_put(_privilegedContext_offset, privileged_context()); | |
2845 result->bool_field_put(_isPrivileged_offset, isPrivileged); | |
2846 return result; | |
2847 } | |
2848 | |
2849 | |
2850 // Support for java_lang_ClassLoader | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2851 |
3938 | 2852 bool java_lang_ClassLoader::offsets_computed = false; |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2853 int java_lang_ClassLoader::_loader_data_offset = -1; |
3938 | 2854 int java_lang_ClassLoader::parallelCapable_offset = -1; |
2855 | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2856 ClassLoaderData** java_lang_ClassLoader::loader_data_addr(oop loader) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2857 assert(loader != NULL && loader->is_oop(), "loader must be oop"); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2858 return (ClassLoaderData**) loader->address_field_addr(_loader_data_offset); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2859 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2860 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2861 ClassLoaderData* java_lang_ClassLoader::loader_data(oop loader) { |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2862 return *java_lang_ClassLoader::loader_data_addr(loader); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2863 } |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2864 |
3938 | 2865 void java_lang_ClassLoader::compute_offsets() { |
2866 assert(!offsets_computed, "offsets should be initialized only once"); | |
2867 offsets_computed = true; | |
2868 | |
2869 // The field indicating parallelCapable (parallelLockMap) is only present starting in 7, | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2870 Klass* k1 = SystemDictionary::ClassLoader_klass(); |
3938 | 2871 compute_optional_offset(parallelCapable_offset, |
2872 k1, vmSymbols::parallelCapable_name(), vmSymbols::concurrenthashmap_signature()); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2873 |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2874 CLASSLOADER_INJECTED_FIELDS(INJECTED_FIELD_COMPUTE_OFFSET); |
3938 | 2875 } |
0 | 2876 |
2877 oop java_lang_ClassLoader::parent(oop loader) { | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2878 assert(is_instance(loader), "loader must be oop"); |
0 | 2879 return loader->obj_field(parent_offset); |
2880 } | |
2881 | |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2882 bool java_lang_ClassLoader::isAncestor(oop loader, oop cl) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2883 assert(is_instance(loader), "loader must be oop"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2884 assert(cl == NULL || is_instance(cl), "cl argument must be oop"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2885 oop acl = loader; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2886 debug_only(jint loop_count = 0); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2887 // This loop taken verbatim from ClassLoader.java: |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2888 do { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2889 acl = parent(acl); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2890 if (cl == acl) { |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2891 return true; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2892 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2893 assert(++loop_count > 0, "loop_count overflow"); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2894 } while (acl != NULL); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2895 return false; |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2896 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
2897 |
0 | 2898 |
3938 | 2899 // For class loader classes, parallelCapable defined |
2900 // based on non-null field | |
2901 // Written to by java.lang.ClassLoader, vm only reads this field, doesn't set it | |
2902 bool java_lang_ClassLoader::parallelCapable(oop class_loader) { | |
2903 if (!JDK_Version::is_gte_jdk17x_version() | |
2904 || parallelCapable_offset == -1) { | |
2905 // Default for backward compatibility is false | |
2906 return false; | |
2907 } | |
2908 return (class_loader->obj_field(parallelCapable_offset) != NULL); | |
2909 } | |
2910 | |
0 | 2911 bool java_lang_ClassLoader::is_trusted_loader(oop loader) { |
2912 // Fix for 4474172; see evaluation for more details | |
2913 loader = non_reflection_class_loader(loader); | |
2914 | |
2915 oop cl = SystemDictionary::java_system_loader(); | |
2916 while(cl != NULL) { | |
2917 if (cl == loader) return true; | |
2918 cl = parent(cl); | |
2919 } | |
2920 return false; | |
2921 } | |
2922 | |
2923 oop java_lang_ClassLoader::non_reflection_class_loader(oop loader) { | |
2924 if (loader != NULL) { | |
2925 // See whether this is one of the class loaders associated with | |
2926 // the generated bytecodes for reflection, and if so, "magically" | |
2927 // delegate to its parent to prevent class loading from occurring | |
2928 // in places where applications using reflection didn't expect it. | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2929 Klass* delegating_cl_class = SystemDictionary::reflect_DelegatingClassLoader_klass(); |
0 | 2930 // This might be null in non-1.4 JDKs |
2931 if (delegating_cl_class != NULL && loader->is_a(delegating_cl_class)) { | |
2932 return parent(loader); | |
2933 } | |
2934 } | |
2935 return loader; | |
2936 } | |
2937 | |
2938 | |
2939 // Support for java_lang_System | |
2940 int java_lang_System::in_offset_in_bytes() { | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
2941 return (InstanceMirrorKlass::offset_of_static_fields() + static_in_offset); |
0 | 2942 } |
2943 | |
2944 | |
2945 int java_lang_System::out_offset_in_bytes() { | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
2946 return (InstanceMirrorKlass::offset_of_static_fields() + static_out_offset); |
0 | 2947 } |
2948 | |
2949 | |
2950 int java_lang_System::err_offset_in_bytes() { | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
2951 return (InstanceMirrorKlass::offset_of_static_fields() + static_err_offset); |
0 | 2952 } |
2953 | |
2954 | |
2955 | |
3938 | 2956 int java_lang_Class::_klass_offset; |
2957 int java_lang_Class::_array_klass_offset; | |
2958 int java_lang_Class::_resolved_constructor_offset; | |
2959 int java_lang_Class::_oop_size_offset; | |
2960 int java_lang_Class::_static_oop_field_count_offset; | |
6948
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
2961 #ifdef GRAAL |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
2962 int java_lang_Class::_graal_mirror_offset; |
e522a00b91aa
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/ after NPG - C++ build works
Doug Simon <doug.simon@oracle.com>
parents:
6940
diff
changeset
|
2963 #endif |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
2964 GrowableArray<Klass*>* java_lang_Class::_fixup_mirror_list = NULL; |
0 | 2965 int java_lang_Throwable::backtrace_offset; |
2966 int java_lang_Throwable::detailMessage_offset; | |
2967 int java_lang_Throwable::cause_offset; | |
2968 int java_lang_Throwable::stackTrace_offset; | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
2969 int java_lang_Throwable::static_unassigned_stacktrace_offset; |
0 | 2970 int java_lang_reflect_AccessibleObject::override_offset; |
2971 int java_lang_reflect_Method::clazz_offset; | |
2972 int java_lang_reflect_Method::name_offset; | |
2973 int java_lang_reflect_Method::returnType_offset; | |
2974 int java_lang_reflect_Method::parameterTypes_offset; | |
2975 int java_lang_reflect_Method::exceptionTypes_offset; | |
2976 int java_lang_reflect_Method::slot_offset; | |
2977 int java_lang_reflect_Method::modifiers_offset; | |
2978 int java_lang_reflect_Method::signature_offset; | |
2979 int java_lang_reflect_Method::annotations_offset; | |
2980 int java_lang_reflect_Method::parameter_annotations_offset; | |
2981 int java_lang_reflect_Method::annotation_default_offset; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2982 int java_lang_reflect_Method::type_annotations_offset; |
0 | 2983 int java_lang_reflect_Constructor::clazz_offset; |
2984 int java_lang_reflect_Constructor::parameterTypes_offset; | |
2985 int java_lang_reflect_Constructor::exceptionTypes_offset; | |
2986 int java_lang_reflect_Constructor::slot_offset; | |
2987 int java_lang_reflect_Constructor::modifiers_offset; | |
2988 int java_lang_reflect_Constructor::signature_offset; | |
2989 int java_lang_reflect_Constructor::annotations_offset; | |
2990 int java_lang_reflect_Constructor::parameter_annotations_offset; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2991 int java_lang_reflect_Constructor::type_annotations_offset; |
0 | 2992 int java_lang_reflect_Field::clazz_offset; |
2993 int java_lang_reflect_Field::name_offset; | |
2994 int java_lang_reflect_Field::type_offset; | |
2995 int java_lang_reflect_Field::slot_offset; | |
2996 int java_lang_reflect_Field::modifiers_offset; | |
2997 int java_lang_reflect_Field::signature_offset; | |
2998 int java_lang_reflect_Field::annotations_offset; | |
7457
35431a769282
8004823: Add VM support for type annotation reflection
stefank
parents:
7185
diff
changeset
|
2999 int java_lang_reflect_Field::type_annotations_offset; |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3000 int java_lang_reflect_Parameter::name_offset; |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3001 int java_lang_reflect_Parameter::modifiers_offset; |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3002 int java_lang_reflect_Parameter::index_offset; |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3003 int java_lang_reflect_Parameter::executable_offset; |
0 | 3004 int java_lang_boxing_object::value_offset; |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3005 int java_lang_boxing_object::long_value_offset; |
0 | 3006 int java_lang_ref_Reference::referent_offset; |
3007 int java_lang_ref_Reference::queue_offset; | |
3008 int java_lang_ref_Reference::next_offset; | |
3009 int java_lang_ref_Reference::discovered_offset; | |
3010 int java_lang_ref_Reference::static_lock_offset; | |
3011 int java_lang_ref_Reference::static_pending_offset; | |
3012 int java_lang_ref_Reference::number_of_fake_oop_fields; | |
3013 int java_lang_ref_SoftReference::timestamp_offset; | |
3014 int java_lang_ref_SoftReference::static_clock_offset; | |
3015 int java_lang_ClassLoader::parent_offset; | |
3016 int java_lang_System::static_in_offset; | |
3017 int java_lang_System::static_out_offset; | |
3018 int java_lang_System::static_err_offset; | |
3019 int java_lang_StackTraceElement::declaringClass_offset; | |
3020 int java_lang_StackTraceElement::methodName_offset; | |
3021 int java_lang_StackTraceElement::fileName_offset; | |
3022 int java_lang_StackTraceElement::lineNumber_offset; | |
3023 int java_lang_AssertionStatusDirectives::classes_offset; | |
3024 int java_lang_AssertionStatusDirectives::classEnabled_offset; | |
3025 int java_lang_AssertionStatusDirectives::packages_offset; | |
3026 int java_lang_AssertionStatusDirectives::packageEnabled_offset; | |
3027 int java_lang_AssertionStatusDirectives::deflt_offset; | |
3028 int java_nio_Buffer::_limit_offset; | |
3029 int java_util_concurrent_locks_AbstractOwnableSynchronizer::_owner_offset = 0; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3030 int sun_reflect_ConstantPool::_oop_offset; |
0 | 3031 int sun_reflect_UnsafeStaticFieldAccessorImpl::_base_offset; |
3032 | |
3033 | |
3034 // Support for java_lang_StackTraceElement | |
3035 | |
3036 void java_lang_StackTraceElement::set_fileName(oop element, oop value) { | |
3037 element->obj_field_put(fileName_offset, value); | |
3038 } | |
3039 | |
3040 void java_lang_StackTraceElement::set_declaringClass(oop element, oop value) { | |
3041 element->obj_field_put(declaringClass_offset, value); | |
3042 } | |
3043 | |
3044 void java_lang_StackTraceElement::set_methodName(oop element, oop value) { | |
3045 element->obj_field_put(methodName_offset, value); | |
3046 } | |
3047 | |
3048 void java_lang_StackTraceElement::set_lineNumber(oop element, int value) { | |
3049 element->int_field_put(lineNumber_offset, value); | |
3050 } | |
3051 | |
3052 | |
3053 // Support for java Assertions - java_lang_AssertionStatusDirectives. | |
3054 | |
3055 void java_lang_AssertionStatusDirectives::set_classes(oop o, oop val) { | |
3056 o->obj_field_put(classes_offset, val); | |
3057 } | |
3058 | |
3059 void java_lang_AssertionStatusDirectives::set_classEnabled(oop o, oop val) { | |
3060 o->obj_field_put(classEnabled_offset, val); | |
3061 } | |
3062 | |
3063 void java_lang_AssertionStatusDirectives::set_packages(oop o, oop val) { | |
3064 o->obj_field_put(packages_offset, val); | |
3065 } | |
3066 | |
3067 void java_lang_AssertionStatusDirectives::set_packageEnabled(oop o, oop val) { | |
3068 o->obj_field_put(packageEnabled_offset, val); | |
3069 } | |
3070 | |
3071 void java_lang_AssertionStatusDirectives::set_deflt(oop o, bool val) { | |
3072 o->bool_field_put(deflt_offset, val); | |
3073 } | |
3074 | |
3075 | |
3076 // Support for intrinsification of java.nio.Buffer.checkIndex | |
3077 int java_nio_Buffer::limit_offset() { | |
3078 return _limit_offset; | |
3079 } | |
3080 | |
3081 | |
3082 void java_nio_Buffer::compute_offsets() { | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3083 Klass* k = SystemDictionary::nio_Buffer_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3084 assert(k != NULL, "must be loaded in 1.4+"); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3085 compute_offset(_limit_offset, k, vmSymbols::limit_name(), vmSymbols::int_signature()); |
0 | 3086 } |
3087 | |
3088 void java_util_concurrent_locks_AbstractOwnableSynchronizer::initialize(TRAPS) { | |
3089 if (_owner_offset != 0) return; | |
3090 | |
3091 assert(JDK_Version::is_gte_jdk16x_version(), "Must be JDK 1.6 or later"); | |
3092 SystemDictionary::load_abstract_ownable_synchronizer_klass(CHECK); | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3093 Klass* k = SystemDictionary::abstract_ownable_synchronizer_klass(); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3094 compute_offset(_owner_offset, k, |
0 | 3095 vmSymbols::exclusive_owner_thread_name(), vmSymbols::thread_signature()); |
3096 } | |
3097 | |
3098 oop java_util_concurrent_locks_AbstractOwnableSynchronizer::get_owner_threadObj(oop obj) { | |
3099 assert(_owner_offset != 0, "Must be initialized"); | |
3100 return obj->obj_field(_owner_offset); | |
3101 } | |
3102 | |
3103 // Compute hard-coded offsets | |
3104 // Invoked before SystemDictionary::initialize, so pre-loaded classes | |
3105 // are not available to determine the offset_of_static_fields. | |
3106 void JavaClasses::compute_hard_coded_offsets() { | |
113
ba764ed4b6f2
6420645: Create a vm that uses compressed oops for up to 32gb heapsizes
coleenp
parents:
98
diff
changeset
|
3107 const int x = heapOopSize; |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3108 const int header = instanceOopDesc::base_offset_in_bytes(); |
0 | 3109 |
3110 // Throwable Class | |
3111 java_lang_Throwable::backtrace_offset = java_lang_Throwable::hc_backtrace_offset * x + header; | |
3112 java_lang_Throwable::detailMessage_offset = java_lang_Throwable::hc_detailMessage_offset * x + header; | |
3113 java_lang_Throwable::cause_offset = java_lang_Throwable::hc_cause_offset * x + header; | |
3114 java_lang_Throwable::stackTrace_offset = java_lang_Throwable::hc_stackTrace_offset * x + header; | |
3820
0b80db433fcb
7046490: Preallocated OOME objects should obey Throwable stack trace protocol
dholmes
parents:
3795
diff
changeset
|
3115 java_lang_Throwable::static_unassigned_stacktrace_offset = java_lang_Throwable::hc_static_unassigned_stacktrace_offset * x; |
0 | 3116 |
3117 // java_lang_boxing_object | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3118 java_lang_boxing_object::value_offset = java_lang_boxing_object::hc_value_offset + header; |
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3119 java_lang_boxing_object::long_value_offset = align_size_up((java_lang_boxing_object::hc_value_offset + header), BytesPerLong); |
0 | 3120 |
3121 // java_lang_ref_Reference: | |
3122 java_lang_ref_Reference::referent_offset = java_lang_ref_Reference::hc_referent_offset * x + header; | |
3123 java_lang_ref_Reference::queue_offset = java_lang_ref_Reference::hc_queue_offset * x + header; | |
3124 java_lang_ref_Reference::next_offset = java_lang_ref_Reference::hc_next_offset * x + header; | |
3125 java_lang_ref_Reference::discovered_offset = java_lang_ref_Reference::hc_discovered_offset * x + header; | |
3126 java_lang_ref_Reference::static_lock_offset = java_lang_ref_Reference::hc_static_lock_offset * x; | |
3127 java_lang_ref_Reference::static_pending_offset = java_lang_ref_Reference::hc_static_pending_offset * x; | |
3128 // Artificial fields for java_lang_ref_Reference | |
3129 // The first field is for the discovered field added in 1.4 | |
3130 java_lang_ref_Reference::number_of_fake_oop_fields = 1; | |
3131 | |
3132 // java_lang_ref_SoftReference Class | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3133 java_lang_ref_SoftReference::timestamp_offset = align_size_up((java_lang_ref_SoftReference::hc_timestamp_offset * x + header), BytesPerLong); |
0 | 3134 // Don't multiply static fields because they are always in wordSize units |
3135 java_lang_ref_SoftReference::static_clock_offset = java_lang_ref_SoftReference::hc_static_clock_offset * x; | |
3136 | |
3137 // java_lang_ClassLoader | |
3138 java_lang_ClassLoader::parent_offset = java_lang_ClassLoader::hc_parent_offset * x + header; | |
3139 | |
3140 // java_lang_System | |
3141 java_lang_System::static_in_offset = java_lang_System::hc_static_in_offset * x; | |
3142 java_lang_System::static_out_offset = java_lang_System::hc_static_out_offset * x; | |
3143 java_lang_System::static_err_offset = java_lang_System::hc_static_err_offset * x; | |
3144 | |
3145 // java_lang_StackTraceElement | |
3146 java_lang_StackTraceElement::declaringClass_offset = java_lang_StackTraceElement::hc_declaringClass_offset * x + header; | |
3147 java_lang_StackTraceElement::methodName_offset = java_lang_StackTraceElement::hc_methodName_offset * x + header; | |
3148 java_lang_StackTraceElement::fileName_offset = java_lang_StackTraceElement::hc_fileName_offset * x + header; | |
3149 java_lang_StackTraceElement::lineNumber_offset = java_lang_StackTraceElement::hc_lineNumber_offset * x + header; | |
3150 java_lang_AssertionStatusDirectives::classes_offset = java_lang_AssertionStatusDirectives::hc_classes_offset * x + header; | |
3151 java_lang_AssertionStatusDirectives::classEnabled_offset = java_lang_AssertionStatusDirectives::hc_classEnabled_offset * x + header; | |
3152 java_lang_AssertionStatusDirectives::packages_offset = java_lang_AssertionStatusDirectives::hc_packages_offset * x + header; | |
3153 java_lang_AssertionStatusDirectives::packageEnabled_offset = java_lang_AssertionStatusDirectives::hc_packageEnabled_offset * x + header; | |
3154 java_lang_AssertionStatusDirectives::deflt_offset = java_lang_AssertionStatusDirectives::hc_deflt_offset * x + header; | |
3155 | |
3156 } | |
3157 | |
3158 | |
3159 // Compute non-hard-coded field offsets of all the classes in this file | |
3160 void JavaClasses::compute_offsets() { | |
3938 | 3161 // java_lang_Class::compute_offsets was called earlier in bootstrap |
3162 java_lang_ClassLoader::compute_offsets(); | |
0 | 3163 java_lang_Thread::compute_offsets(); |
3164 java_lang_ThreadGroup::compute_offsets(); | |
2416
38fea01eb669
6817525: turn on method handle functionality by default for JSR 292
twisti
parents:
2379
diff
changeset
|
3165 if (EnableInvokeDynamic) { |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3166 java_lang_invoke_MethodHandle::compute_offsets(); |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3167 java_lang_invoke_MemberName::compute_offsets(); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3168 java_lang_invoke_LambdaForm::compute_offsets(); |
2357
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3169 java_lang_invoke_MethodType::compute_offsets(); |
8033953d67ff
7012648: move JSR 292 to package java.lang.invoke and adjust names
jrose
parents:
2356
diff
changeset
|
3170 java_lang_invoke_CallSite::compute_offsets(); |
726
be93aad57795
6655646: dynamic languages need dynamically linked call sites
jrose
parents:
710
diff
changeset
|
3171 } |
0 | 3172 java_security_AccessControlContext::compute_offsets(); |
3173 // Initialize reflection classes. The layouts of these classes | |
3174 // changed with the new reflection implementation in JDK 1.4, and | |
3175 // since the Universe doesn't know what JDK version it is until this | |
3176 // point we defer computation of these offsets until now. | |
3177 java_lang_reflect_AccessibleObject::compute_offsets(); | |
3178 java_lang_reflect_Method::compute_offsets(); | |
3179 java_lang_reflect_Constructor::compute_offsets(); | |
3180 java_lang_reflect_Field::compute_offsets(); | |
3181 if (JDK_Version::is_gte_jdk14x_version()) { | |
3182 java_nio_Buffer::compute_offsets(); | |
3183 } | |
3184 if (JDK_Version::is_gte_jdk15x_version()) { | |
3185 sun_reflect_ConstantPool::compute_offsets(); | |
3186 sun_reflect_UnsafeStaticFieldAccessorImpl::compute_offsets(); | |
3187 } | |
7462
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3188 if (JDK_Version::is_jdk18x_version()) |
ade95d680b42
8004728: Add hotspot support for parameter reflection
coleenp
parents:
7458
diff
changeset
|
3189 java_lang_reflect_Parameter::compute_offsets(); |
710 | 3190 |
3191 // generated interpreter code wants to know about the offsets we just computed: | |
3192 AbstractAssembler::update_delayed_values(); | |
0 | 3193 } |
3194 | |
3195 #ifndef PRODUCT | |
3196 | |
3197 // These functions exist to assert the validity of hard-coded field offsets to guard | |
3198 // against changes in the class files | |
3199 | |
3200 bool JavaClasses::check_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) { | |
3201 EXCEPTION_MARK; | |
3202 fieldDescriptor fd; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3203 TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3204 Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); |
0 | 3205 instanceKlassHandle h_klass (THREAD, k); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3206 TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3207 TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3208 if (!h_klass->find_local_field(f_name, f_sig, &fd)) { |
0 | 3209 tty->print_cr("Nonstatic field %s.%s not found", klass_name, field_name); |
3210 return false; | |
3211 } | |
3212 if (fd.is_static()) { | |
3213 tty->print_cr("Nonstatic field %s.%s appears to be static", klass_name, field_name); | |
3214 return false; | |
3215 } | |
3216 if (fd.offset() == hardcoded_offset ) { | |
3217 return true; | |
3218 } else { | |
3219 tty->print_cr("Offset of nonstatic field %s.%s is hardcoded as %d but should really be %d.", | |
3220 klass_name, field_name, hardcoded_offset, fd.offset()); | |
3221 return false; | |
3222 } | |
3223 } | |
3224 | |
3225 | |
3226 bool JavaClasses::check_static_offset(const char *klass_name, int hardcoded_offset, const char *field_name, const char* field_sig) { | |
3227 EXCEPTION_MARK; | |
3228 fieldDescriptor fd; | |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3229 TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3230 Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); |
0 | 3231 instanceKlassHandle h_klass (THREAD, k); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3232 TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3233 TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3234 if (!h_klass->find_local_field(f_name, f_sig, &fd)) { |
0 | 3235 tty->print_cr("Static field %s.%s not found", klass_name, field_name); |
3236 return false; | |
3237 } | |
3238 if (!fd.is_static()) { | |
3239 tty->print_cr("Static field %s.%s appears to be nonstatic", klass_name, field_name); | |
3240 return false; | |
3241 } | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
3242 if (fd.offset() == hardcoded_offset + InstanceMirrorKlass::offset_of_static_fields()) { |
0 | 3243 return true; |
3244 } else { | |
6735
aed758eda82a
7195833: NPG: Rename instanceClassLoaderKlass, instanceRefKlass and instanceMirrorKlass
coleenp
parents:
6725
diff
changeset
|
3245 tty->print_cr("Offset of static field %s.%s is hardcoded as %d but should really be %d.", klass_name, field_name, hardcoded_offset, fd.offset() - InstanceMirrorKlass::offset_of_static_fields()); |
0 | 3246 return false; |
3247 } | |
3248 } | |
3249 | |
3250 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3251 bool JavaClasses::check_constant(const char *klass_name, int hardcoded_constant, const char *field_name, const char* field_sig) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3252 EXCEPTION_MARK; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3253 fieldDescriptor fd; |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3254 TempNewSymbol klass_sym = SymbolTable::new_symbol(klass_name, CATCH); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3255 Klass* k = SystemDictionary::resolve_or_fail(klass_sym, true, CATCH); |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3256 instanceKlassHandle h_klass (THREAD, k); |
2177
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3257 TempNewSymbol f_name = SymbolTable::new_symbol(field_name, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3258 TempNewSymbol f_sig = SymbolTable::new_symbol(field_sig, CATCH); |
3582bf76420e
6990754: Use native memory and reference counting to implement SymbolTable
coleenp
parents:
1989
diff
changeset
|
3259 if (!h_klass->find_local_field(f_name, f_sig, &fd)) { |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3260 tty->print_cr("Static field %s.%s not found", klass_name, field_name); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3261 return false; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3262 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3263 if (!fd.is_static() || !fd.has_initial_value()) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3264 tty->print_cr("Static field %s.%s appears to be non-constant", klass_name, field_name); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3265 return false; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3266 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3267 if (!fd.initial_value_tag().is_int()) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3268 tty->print_cr("Static field %s.%s is not an int", klass_name, field_name); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3269 return false; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3270 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3271 jint field_value = fd.int_initial_value(); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3272 if (field_value == hardcoded_constant) { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3273 return true; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3274 } else { |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3275 tty->print_cr("Constant value of static field %s.%s is hardcoded as %d but should really be %d.", klass_name, field_name, hardcoded_constant, field_value); |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3276 return false; |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3277 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3278 } |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3279 |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3280 |
0 | 3281 // Check the hard-coded field offsets of all the classes in this file |
3282 | |
3283 void JavaClasses::check_offsets() { | |
3284 bool valid = true; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3285 HandleMark hm; |
0 | 3286 |
3287 #define CHECK_OFFSET(klass_name, cpp_klass_name, field_name, field_sig) \ | |
3288 valid &= check_offset(klass_name, cpp_klass_name :: field_name ## _offset, #field_name, field_sig) | |
3289 | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3290 #define CHECK_LONG_OFFSET(klass_name, cpp_klass_name, field_name, field_sig) \ |
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3291 valid &= check_offset(klass_name, cpp_klass_name :: long_ ## field_name ## _offset, #field_name, field_sig) |
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3292 |
0 | 3293 #define CHECK_STATIC_OFFSET(klass_name, cpp_klass_name, field_name, field_sig) \ |
3294 valid &= check_static_offset(klass_name, cpp_klass_name :: static_ ## field_name ## _offset, #field_name, field_sig) | |
3295 | |
132
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3296 #define CHECK_CONSTANT(klass_name, cpp_klass_name, field_name, field_sig) \ |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3297 valid &= check_constant(klass_name, cpp_klass_name :: field_name, #field_name, field_sig) |
60b728ec77c1
6652736: well known classes in system dictionary are inefficiently processed
jrose
parents:
113
diff
changeset
|
3298 |
0 | 3299 // java.lang.String |
3300 | |
3301 CHECK_OFFSET("java/lang/String", java_lang_String, value, "[C"); | |
6057 | 3302 if (java_lang_String::has_offset_field()) { |
3303 CHECK_OFFSET("java/lang/String", java_lang_String, offset, "I"); | |
3304 CHECK_OFFSET("java/lang/String", java_lang_String, count, "I"); | |
3305 } | |
3306 if (java_lang_String::has_hash_field()) { | |
3307 CHECK_OFFSET("java/lang/String", java_lang_String, hash, "I"); | |
3308 } | |
0 | 3309 |
3310 // java.lang.Class | |
3311 | |
3312 // Fake fields | |
3313 // CHECK_OFFSET("java/lang/Class", java_lang_Class, klass); // %%% this needs to be checked | |
3314 // CHECK_OFFSET("java/lang/Class", java_lang_Class, array_klass); // %%% this needs to be checked | |
3315 // CHECK_OFFSET("java/lang/Class", java_lang_Class, resolved_constructor); // %%% this needs to be checked | |
3316 | |
3317 // java.lang.Throwable | |
3318 | |
3319 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, backtrace, "Ljava/lang/Object;"); | |
3320 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, detailMessage, "Ljava/lang/String;"); | |
3321 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, cause, "Ljava/lang/Throwable;"); | |
3322 CHECK_OFFSET("java/lang/Throwable", java_lang_Throwable, stackTrace, "[Ljava/lang/StackTraceElement;"); | |
3323 | |
3324 // Boxed primitive objects (java_lang_boxing_object) | |
3325 | |
3326 CHECK_OFFSET("java/lang/Boolean", java_lang_boxing_object, value, "Z"); | |
3327 CHECK_OFFSET("java/lang/Character", java_lang_boxing_object, value, "C"); | |
3328 CHECK_OFFSET("java/lang/Float", java_lang_boxing_object, value, "F"); | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3329 CHECK_LONG_OFFSET("java/lang/Double", java_lang_boxing_object, value, "D"); |
0 | 3330 CHECK_OFFSET("java/lang/Byte", java_lang_boxing_object, value, "B"); |
3331 CHECK_OFFSET("java/lang/Short", java_lang_boxing_object, value, "S"); | |
3332 CHECK_OFFSET("java/lang/Integer", java_lang_boxing_object, value, "I"); | |
165
437d03ea40b1
6703888: Compressed Oops: use the 32-bits gap after klass in a object
kvn
parents:
132
diff
changeset
|
3333 CHECK_LONG_OFFSET("java/lang/Long", java_lang_boxing_object, value, "J"); |
0 | 3334 |
3335 // java.lang.ClassLoader | |
3336 | |
3337 CHECK_OFFSET("java/lang/ClassLoader", java_lang_ClassLoader, parent, "Ljava/lang/ClassLoader;"); | |
3338 | |
3339 // java.lang.System | |
3340 | |
3341 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, in, "Ljava/io/InputStream;"); | |
3342 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, out, "Ljava/io/PrintStream;"); | |
3343 CHECK_STATIC_OFFSET("java/lang/System", java_lang_System, err, "Ljava/io/PrintStream;"); | |
3344 | |
3345 // java.lang.StackTraceElement | |
3346 | |
3347 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, declaringClass, "Ljava/lang/String;"); | |
3348 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, methodName, "Ljava/lang/String;"); | |
3349 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, fileName, "Ljava/lang/String;"); | |
3350 CHECK_OFFSET("java/lang/StackTraceElement", java_lang_StackTraceElement, lineNumber, "I"); | |
3351 | |
3352 // java.lang.ref.Reference | |
3353 | |
3354 CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, referent, "Ljava/lang/Object;"); | |
3355 CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, queue, "Ljava/lang/ref/ReferenceQueue;"); | |
3356 CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, next, "Ljava/lang/ref/Reference;"); | |
3357 // Fake field | |
3358 //CHECK_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, discovered, "Ljava/lang/ref/Reference;"); | |
3359 CHECK_STATIC_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, lock, "Ljava/lang/ref/Reference$Lock;"); | |
3360 CHECK_STATIC_OFFSET("java/lang/ref/Reference", java_lang_ref_Reference, pending, "Ljava/lang/ref/Reference;"); | |
3361 | |
3362 // java.lang.ref.SoftReference | |
3363 | |
3364 CHECK_OFFSET("java/lang/ref/SoftReference", java_lang_ref_SoftReference, timestamp, "J"); | |
3365 CHECK_STATIC_OFFSET("java/lang/ref/SoftReference", java_lang_ref_SoftReference, clock, "J"); | |
3366 | |
3367 // java.lang.AssertionStatusDirectives | |
3368 // | |
3369 // The CheckAssertionStatusDirectives boolean can be removed from here and | |
3370 // globals.hpp after the AssertionStatusDirectives class has been integrated | |
3371 // into merlin "for some time." Without it, the vm will fail with early | |
3372 // merlin builds. | |
3373 | |
3374 if (CheckAssertionStatusDirectives && JDK_Version::is_gte_jdk14x_version()) { | |
3375 const char* nm = "java/lang/AssertionStatusDirectives"; | |
3376 const char* sig = "[Ljava/lang/String;"; | |
3377 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, classes, sig); | |
3378 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, classEnabled, "[Z"); | |
3379 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, packages, sig); | |
3380 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, packageEnabled, "[Z"); | |
3381 CHECK_OFFSET(nm, java_lang_AssertionStatusDirectives, deflt, "Z"); | |
3382 } | |
3383 | |
3384 if (!valid) vm_exit_during_initialization("Hard-coded field offset verification failed"); | |
3385 } | |
3386 | |
3387 #endif // PRODUCT | |
3388 | |
3938 | 3389 int InjectedField::compute_offset() { |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3390 Klass* klass_oop = klass(); |
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3391 for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) { |
3938 | 3392 if (!may_be_java && !fs.access_flags().is_internal()) { |
3393 // Only look at injected fields | |
3394 continue; | |
3395 } | |
3396 if (fs.name() == name() && fs.signature() == signature()) { | |
3397 return fs.offset(); | |
3398 } | |
3399 } | |
3400 ResourceMark rm; | |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3401 tty->print_cr("Invalid layout of %s at %s/%s%s", InstanceKlass::cast(klass_oop)->external_name(), name()->as_C_string(), signature()->as_C_string(), may_be_java ? " (may_be_java)" : ""); |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3402 #ifndef PRODUCT |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3403 klass_oop->print(); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3404 tty->print_cr("all fields:"); |
6725
da91efe96a93
6964458: Reimplement class meta-data storage to use native memory
coleenp
parents:
6267
diff
changeset
|
3405 for (AllFieldStream fs(InstanceKlass::cast(klass_oop)); !fs.done(); fs.next()) { |
6266
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3406 tty->print_cr(" name: %s, sig: %s, flags: %08x", fs.name()->as_C_string(), fs.signature()->as_C_string(), fs.access_flags().as_int()); |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3407 } |
1d7922586cf6
7023639: JSR 292 method handle invocation needs a fast path for compiled code
twisti
parents:
6224
diff
changeset
|
3408 #endif //PRODUCT |
3938 | 3409 fatal("Invalid layout of preloaded class"); |
3410 return -1; | |
3411 } | |
3412 | |
0 | 3413 void javaClasses_init() { |
3414 JavaClasses::compute_offsets(); | |
3415 JavaClasses::check_offsets(); | |
3416 FilteredFieldsMap::initialize(); // must be done after computing offsets. | |
3417 } |