Print this page
rev 1072 : [mq]: meth.walker.patch
| Split |
Close |
| Expand all |
| Collapse all |
--- old/src/share/vm/classfile/vmSymbols.cpp
+++ new/src/share/vm/classfile/vmSymbols.cpp
1 1 /*
2 2 * Copyright 1997-2008 Sun Microsystems, Inc. All Rights Reserved.
3 3 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4 4 *
5 5 * This code is free software; you can redistribute it and/or modify it
6 6 * under the terms of the GNU General Public License version 2 only, as
7 7 * published by the Free Software Foundation.
8 8 *
9 9 * This code is distributed in the hope that it will be useful, but WITHOUT
10 10 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11 11 * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12 12 * version 2 for more details (a copy is included in the LICENSE file that
13 13 * accompanied this code).
14 14 *
15 15 * You should have received a copy of the GNU General Public License version
16 16 * 2 along with this work; if not, write to the Free Software Foundation,
17 17 * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18 18 *
19 19 * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
20 20 * CA 95054 USA or visit www.sun.com if you need additional information or
21 21 * have any questions.
22 22 *
23 23 */
24 24
25 25 # include "incls/_precompiled.incl"
26 26 # include "incls/_vmSymbols.cpp.incl"
27 27
28 28
29 29 symbolOop vmSymbols::_symbols[vmSymbols::SID_LIMIT];
30 30
31 31 symbolOop vmSymbols::_type_signatures[T_VOID+1] = { NULL /*, NULL...*/ };
32 32
33 33 inline int compare_symbol(symbolOop a, symbolOop b) {
34 34 if (a == b) return 0;
35 35 // follow the natural address order:
36 36 return (address)a > (address)b ? +1 : -1;
37 37 }
38 38
39 39 static vmSymbols::SID vm_symbol_index[vmSymbols::SID_LIMIT];
40 40 extern "C" {
41 41 static int compare_vmsymbol_sid(const void* void_a, const void* void_b) {
42 42 symbolOop a = vmSymbols::symbol_at(*((vmSymbols::SID*) void_a));
43 43 symbolOop b = vmSymbols::symbol_at(*((vmSymbols::SID*) void_b));
44 44 return compare_symbol(a, b);
45 45 }
46 46 }
47 47
48 48 #ifndef PRODUCT
49 49 #define VM_SYMBOL_ENUM_NAME_BODY(name, string) #name "\0"
50 50 static const char* vm_symbol_enum_names =
51 51 VM_SYMBOLS_DO(VM_SYMBOL_ENUM_NAME_BODY, VM_ALIAS_IGNORE)
52 52 "\0";
53 53 static const char* vm_symbol_enum_name(vmSymbols::SID sid) {
54 54 const char* string = &vm_symbol_enum_names[0];
55 55 int skip = (int)sid - (int)vmSymbols::FIRST_SID;
56 56 for (; skip != 0; skip--) {
57 57 size_t skiplen = strlen(string);
58 58 if (skiplen == 0) return "<unknown>"; // overflow
59 59 string += skiplen+1;
60 60 }
61 61 return string;
62 62 }
|
↓ open down ↓ |
62 lines elided |
↑ open up ↑ |
63 63 #endif //PRODUCT
64 64
65 65 // Put all the VM symbol strings in one place.
66 66 // Makes for a more compact libjvm.
67 67 #define VM_SYMBOL_BODY(name, string) string "\0"
68 68 static const char* vm_symbol_bodies = VM_SYMBOLS_DO(VM_SYMBOL_BODY, VM_ALIAS_IGNORE);
69 69
70 70 void vmSymbols::initialize(TRAPS) {
71 71 assert((int)SID_LIMIT <= (1<<log2_SID_LIMIT), "must fit in this bitfield");
72 72 assert((int)SID_LIMIT*5 > (1<<log2_SID_LIMIT), "make the bitfield smaller, please");
73 + assert(vmIntrinsics::FLAG_LIMIT <= (1 << vmIntrinsics::log2_FLAG_LIMIT), "must fit in this bitfield");
73 74
74 75 if (!UseSharedSpaces) {
75 76 const char* string = &vm_symbol_bodies[0];
76 77 for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) {
77 78 symbolOop sym = oopFactory::new_symbol(string, CHECK);
78 79 _symbols[index] = sym;
79 80 string += strlen(string); // skip string body
80 81 string += 1; // skip trailing null
81 82 }
82 83
83 84 _type_signatures[T_BYTE] = byte_signature();
84 85 _type_signatures[T_CHAR] = char_signature();
85 86 _type_signatures[T_DOUBLE] = double_signature();
86 87 _type_signatures[T_FLOAT] = float_signature();
87 88 _type_signatures[T_INT] = int_signature();
88 89 _type_signatures[T_LONG] = long_signature();
89 90 _type_signatures[T_SHORT] = short_signature();
90 91 _type_signatures[T_BOOLEAN] = bool_signature();
91 92 _type_signatures[T_VOID] = void_signature();
92 93 // no single signatures for T_OBJECT or T_ARRAY
93 94 }
94 95
95 96 #ifdef ASSERT
96 97 // Check for duplicates:
97 98 for (int i1 = (int)FIRST_SID; i1 < (int)SID_LIMIT; i1++) {
98 99 symbolOop sym = symbol_at((SID)i1);
99 100 for (int i2 = (int)FIRST_SID; i2 < i1; i2++) {
100 101 if (symbol_at((SID)i2) == sym) {
101 102 tty->print("*** Duplicate VM symbol SIDs %s(%d) and %s(%d): \"",
102 103 vm_symbol_enum_name((SID)i2), i2,
103 104 vm_symbol_enum_name((SID)i1), i1);
104 105 sym->print_symbol_on(tty);
105 106 tty->print_cr("\"");
106 107 }
107 108 }
108 109 }
109 110 #endif //ASSERT
110 111
111 112 // Create an index for find_id:
112 113 {
113 114 for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) {
114 115 vm_symbol_index[index] = (SID)index;
115 116 }
116 117 int num_sids = SID_LIMIT-FIRST_SID;
117 118 qsort(&vm_symbol_index[FIRST_SID], num_sids, sizeof(vm_symbol_index[0]),
118 119 compare_vmsymbol_sid);
119 120 }
120 121
121 122 #ifdef ASSERT
122 123 {
123 124 // Spot-check correspondence between strings, symbols, and enums:
124 125 assert(_symbols[NO_SID] == NULL, "must be");
125 126 const char* str = "java/lang/Object";
126 127 symbolOop sym = oopFactory::new_symbol(str, CHECK);
127 128 assert(strcmp(str, (char*)sym->base()) == 0, "");
128 129 assert(sym == java_lang_Object(), "");
129 130 SID sid = VM_SYMBOL_ENUM_NAME(java_lang_Object);
130 131 assert(find_sid(sym) == sid, "");
131 132 assert(symbol_at(sid) == sym, "");
132 133
133 134 // Make sure find_sid produces the right answer in each case.
134 135 for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) {
135 136 sym = symbol_at((SID)index);
136 137 sid = find_sid(sym);
137 138 assert(sid == (SID)index, "symbol index works");
138 139 // Note: If there are duplicates, this assert will fail.
139 140 // A "Duplicate VM symbol" message will have already been printed.
140 141 }
141 142
142 143 // The string "format" happens (at the moment) not to be a vmSymbol,
143 144 // though it is a method name in java.lang.String.
144 145 str = "format";
145 146 sym = oopFactory::new_symbol(str, CHECK);
146 147 sid = find_sid(sym);
147 148 assert(sid == NO_SID, "symbol index works (negative test)");
148 149 }
149 150 #endif
150 151 }
151 152
152 153
153 154 #ifndef PRODUCT
154 155 const char* vmSymbols::name_for(vmSymbols::SID sid) {
155 156 if (sid == NO_SID)
156 157 return "NO_SID";
157 158 const char* string = &vm_symbol_bodies[0];
158 159 for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) {
159 160 if (index == (int)sid)
160 161 return string;
161 162 string += strlen(string); // skip string body
162 163 string += 1; // skip trailing null
163 164 }
164 165 return "BAD_SID";
165 166 }
166 167 #endif
167 168
168 169
169 170
170 171 void vmSymbols::oops_do(OopClosure* f, bool do_all) {
171 172 for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) {
172 173 f->do_oop((oop*) &_symbols[index]);
173 174 }
174 175 for (int i = 0; i < T_VOID+1; i++) {
175 176 if (_type_signatures[i] != NULL) {
176 177 assert(i >= T_BOOLEAN, "checking");
177 178 f->do_oop((oop*)&_type_signatures[i]);
178 179 } else if (do_all) {
179 180 f->do_oop((oop*)&_type_signatures[i]);
180 181 }
181 182 }
182 183 }
183 184
184 185
185 186 BasicType vmSymbols::signature_type(symbolOop s) {
186 187 assert(s != NULL, "checking");
187 188 for (int i = T_BOOLEAN; i < T_VOID+1; i++) {
188 189 if (s == _type_signatures[i]) {
189 190 return (BasicType)i;
190 191 }
191 192 }
192 193 return T_OBJECT;
193 194 }
194 195
195 196
196 197 static int mid_hint = (int)vmSymbols::FIRST_SID+1;
197 198
198 199 #ifndef PRODUCT
199 200 static int find_sid_calls, find_sid_probes;
200 201 // (Typical counts are calls=7000 and probes=17000.)
201 202 #endif
202 203
203 204 vmSymbols::SID vmSymbols::find_sid(symbolOop symbol) {
204 205 // Handle the majority of misses by a bounds check.
205 206 // Then, use a binary search over the index.
206 207 // Expected trip count is less than log2_SID_LIMIT, about eight.
207 208 // This is slow but acceptable, given that calls are not
208 209 // dynamically common. (methodOop::intrinsic_id has a cache.)
209 210 NOT_PRODUCT(find_sid_calls++);
210 211 int min = (int)FIRST_SID, max = (int)SID_LIMIT - 1;
211 212 SID sid = NO_SID, sid1;
212 213 int cmp1;
213 214 sid1 = vm_symbol_index[min];
214 215 cmp1 = compare_symbol(symbol, symbol_at(sid1));
215 216 if (cmp1 <= 0) { // before the first
216 217 if (cmp1 == 0) sid = sid1;
217 218 } else {
218 219 sid1 = vm_symbol_index[max];
219 220 cmp1 = compare_symbol(symbol, symbol_at(sid1));
220 221 if (cmp1 >= 0) { // after the last
221 222 if (cmp1 == 0) sid = sid1;
222 223 } else {
223 224 // After checking the extremes, do a binary search.
224 225 ++min; --max; // endpoints are done
225 226 int mid = mid_hint; // start at previous success
226 227 while (max >= min) {
227 228 assert(mid >= min && mid <= max, "");
228 229 NOT_PRODUCT(find_sid_probes++);
229 230 sid1 = vm_symbol_index[mid];
230 231 cmp1 = compare_symbol(symbol, symbol_at(sid1));
231 232 if (cmp1 == 0) {
232 233 mid_hint = mid;
233 234 sid = sid1;
234 235 break;
235 236 }
236 237 if (cmp1 < 0)
237 238 max = mid - 1; // symbol < symbol_at(sid)
238 239 else
239 240 min = mid + 1;
240 241
241 242 // Pick a new probe point:
242 243 mid = (max + min) / 2;
243 244 }
244 245 }
245 246 }
246 247
247 248 #ifdef ASSERT
248 249 // Perform the exhaustive self-check the first 1000 calls,
249 250 // and every 100 calls thereafter.
250 251 static int find_sid_check_count = -2000;
251 252 if ((uint)++find_sid_check_count > (uint)100) {
252 253 if (find_sid_check_count > 0) find_sid_check_count = 0;
253 254
254 255 // Make sure this is the right answer, using linear search.
255 256 // (We have already proven that there are no duplicates in the list.)
256 257 SID sid2 = NO_SID;
257 258 for (int index = (int)FIRST_SID; index < (int)SID_LIMIT; index++) {
258 259 symbolOop sym2 = symbol_at((SID)index);
259 260 if (sym2 == symbol) {
260 261 sid2 = (SID)index;
261 262 break;
262 263 }
263 264 }
|
↓ open down ↓ |
181 lines elided |
↑ open up ↑ |
264 265 // Unless it's a duplicate, assert that the sids are the same.
265 266 if (_symbols[sid] != _symbols[sid2]) {
266 267 assert(sid == sid2, "binary same as linear search");
267 268 }
268 269 }
269 270 #endif //ASSERT
270 271
271 272 return sid;
272 273 }
273 274
275 +static vmIntrinsics::ID wrapper_intrinsic(BasicType type, bool unboxing) {
276 +#define TYPE2(type, unboxing) ((int)(type)*2 + ((unboxing) ? 1 : 0))
277 + switch (TYPE2(type, unboxing)) {
278 +#define BASIC_TYPE_CASE(type, box, unbox) \
279 + case TYPE2(type, false): return vmIntrinsics::box; \
280 + case TYPE2(type, true): return vmIntrinsics::unbox
281 + BASIC_TYPE_CASE(T_BOOLEAN, _Boolean_valueOf, _booleanValue);
282 + BASIC_TYPE_CASE(T_BYTE, _Byte_valueOf, _byteValue);
283 + BASIC_TYPE_CASE(T_CHAR, _Character_valueOf, _charValue);
284 + BASIC_TYPE_CASE(T_SHORT, _Short_valueOf, _shortValue);
285 + BASIC_TYPE_CASE(T_INT, _Integer_valueOf, _intValue);
286 + BASIC_TYPE_CASE(T_LONG, _Long_valueOf, _longValue);
287 + BASIC_TYPE_CASE(T_FLOAT, _Float_valueOf, _floatValue);
288 + BASIC_TYPE_CASE(T_DOUBLE, _Double_valueOf, _doubleValue);
289 +#undef BASIC_TYPE_CASE
290 + }
291 +#undef TYPE2
292 + return vmIntrinsics::_none;
293 +}
294 +
295 +vmIntrinsics::ID vmIntrinsics::for_boxing(BasicType type) {
296 + return wrapper_intrinsic(type, false);
297 +}
298 +vmIntrinsics::ID vmIntrinsics::for_unboxing(BasicType type) {
299 + return wrapper_intrinsic(type, true);
300 +}
301 +
302 +methodOop vmIntrinsics::method_for(vmIntrinsics::ID id) {
303 + if (id == _none) return NULL;
304 + symbolOop cname = vmSymbols::symbol_at(class_for(id));
305 + symbolOop mname = vmSymbols::symbol_at(name_for(id));
306 + symbolOop msig = vmSymbols::symbol_at(signature_for(id));
307 + if (cname == NULL || mname == NULL || msig == NULL) return NULL;
308 + klassOop k = SystemDictionary::find_well_known_klass(cname);
309 + if (k == NULL) return NULL;
310 + return instanceKlass::cast(k)->find_method(mname, msig);
311 +}
312 +
274 313
275 314 #define VM_INTRINSIC_INITIALIZE(id, klass, name, sig, flags) #id "\0"
276 315 static const char* vm_intrinsic_name_bodies =
277 316 VM_INTRINSICS_DO(VM_INTRINSIC_INITIALIZE,
278 317 VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
279 318
280 319 static const char* vm_intrinsic_name_table[vmIntrinsics::ID_LIMIT];
281 320
282 321 const char* vmIntrinsics::name_at(vmIntrinsics::ID id) {
283 322 const char** nt = &vm_intrinsic_name_table[0];
284 323 if (nt[_none] == NULL) {
285 324 char* string = (char*) &vm_intrinsic_name_bodies[0];
286 325 for (int index = FIRST_ID; index < ID_LIMIT; index++) {
287 326 nt[index] = string;
288 327 string += strlen(string); // skip string body
289 328 string += 1; // skip trailing null
290 329 }
291 330 assert(!strcmp(nt[_hashCode], "_hashCode"), "lined up");
292 331 nt[_none] = "_none";
293 332 }
294 333 if ((uint)id < (uint)ID_LIMIT)
295 334 return vm_intrinsic_name_table[(uint)id];
296 335 else
297 336 return "(unknown intrinsic)";
298 337 }
299 338
300 339 // These are flag-matching functions:
301 340 inline bool match_F_R(jshort flags) {
302 341 const int req = 0;
303 342 const int neg = JVM_ACC_STATIC | JVM_ACC_SYNCHRONIZED;
304 343 return (flags & (req | neg)) == req;
305 344 }
306 345 inline bool match_F_RN(jshort flags) {
307 346 const int req = JVM_ACC_NATIVE;
308 347 const int neg = JVM_ACC_STATIC | JVM_ACC_SYNCHRONIZED;
309 348 return (flags & (req | neg)) == req;
310 349 }
311 350 inline bool match_F_S(jshort flags) {
312 351 const int req = JVM_ACC_STATIC;
313 352 const int neg = JVM_ACC_SYNCHRONIZED;
314 353 return (flags & (req | neg)) == req;
315 354 }
316 355 inline bool match_F_SN(jshort flags) {
317 356 const int req = JVM_ACC_STATIC | JVM_ACC_NATIVE;
318 357 const int neg = JVM_ACC_SYNCHRONIZED;
319 358 return (flags & (req | neg)) == req;
320 359 }
321 360 inline bool match_F_RNY(jshort flags) {
322 361 const int req = JVM_ACC_NATIVE | JVM_ACC_SYNCHRONIZED;
323 362 const int neg = JVM_ACC_STATIC;
324 363 return (flags & (req | neg)) == req;
325 364 }
326 365
327 366 // These are for forming case labels:
328 367 #define ID3(x, y, z) (( jint)(z) + \
329 368 ((jint)(y) << vmSymbols::log2_SID_LIMIT) + \
330 369 ((jint)(x) << (2*vmSymbols::log2_SID_LIMIT)) )
331 370 #define SID_ENUM(n) vmSymbols::VM_SYMBOL_ENUM_NAME(n)
332 371
333 372 vmIntrinsics::ID vmIntrinsics::find_id(vmSymbols::SID holder,
334 373 vmSymbols::SID name,
335 374 vmSymbols::SID sig,
336 375 jshort flags) {
337 376 assert((int)vmSymbols::SID_LIMIT <= (1<<vmSymbols::log2_SID_LIMIT), "must fit");
338 377
339 378 // Let the C compiler build the decision tree.
340 379
341 380 #define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
342 381 case ID3(SID_ENUM(klass), SID_ENUM(name), SID_ENUM(sig)): \
343 382 if (!match_##fcode(flags)) break; \
344 383 return id;
345 384
346 385 switch (ID3(holder, name, sig)) {
347 386 VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
348 387 VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
349 388 }
350 389 return vmIntrinsics::_none;
351 390
352 391 #undef VM_INTRINSIC_CASE
353 392 }
354 393
355 394
356 395 const char* vmIntrinsics::short_name_as_C_string(vmIntrinsics::ID id, char* buf, int buflen) {
357 396 const char* str = name_at(id);
358 397 #ifndef PRODUCT
359 398 const char* kname = vmSymbols::name_for(class_for(id));
360 399 const char* mname = vmSymbols::name_for(name_for(id));
361 400 const char* sname = vmSymbols::name_for(signature_for(id));
362 401 const char* fname = "";
363 402 switch (flags_for(id)) {
364 403 case F_RN: fname = "native "; break;
365 404 case F_SN: fname = "native static "; break;
366 405 case F_S: fname = "static "; break;
367 406 case F_RNY:fname = "native synchronized "; break;
368 407 }
369 408 const char* kptr = strrchr(kname, '/');
|
↓ open down ↓ |
86 lines elided |
↑ open up ↑ |
370 409 if (kptr != NULL) kname = kptr + 1;
371 410 int len = jio_snprintf(buf, buflen, "%s: %s%s.%s%s",
372 411 str, fname, kname, mname, sname);
373 412 if (len < buflen)
374 413 str = buf;
375 414 #endif //PRODUCT
376 415 return str;
377 416 }
378 417
379 418
380 -// These are for friendly printouts of intrinsics:
419 +// These are to get information about intrinsics.
381 420
382 -vmSymbols::SID vmIntrinsics::class_for(vmIntrinsics::ID id) {
383 -#ifndef PRODUCT
384 -#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
385 - case id: return SID_ENUM(klass);
421 +#define ID4(x, y, z, f) ((ID3(x, y, z) << vmIntrinsics::log2_FLAG_LIMIT) | (int)(f))
386 422
387 - switch (id) {
388 - VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
389 - VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
390 - }
391 -#undef VM_INTRINSIC_CASE
392 -#endif //PRODUCT
393 - return vmSymbols::NO_SID;
423 +static const jint intrinsic_info_array[vmIntrinsics::ID_LIMIT+1] = {
424 +#define VM_INTRINSIC_INFO(ignore_id, klass, name, sig, fcode) \
425 + ID4(SID_ENUM(klass), SID_ENUM(name), SID_ENUM(sig), vmIntrinsics::fcode),
426 +
427 + 0, VM_INTRINSICS_DO(VM_INTRINSIC_INFO,
428 + VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE)
429 + 0
430 +#undef VM_INTRINSIC_INFO
431 +};
432 +
433 +inline jint intrinsic_info(vmIntrinsics::ID id) {
434 + return intrinsic_info_array[vmIntrinsics::ID_from((int)id)];
394 435 }
395 436
396 -vmSymbols::SID vmIntrinsics::name_for(vmIntrinsics::ID id) {
397 -#ifndef PRODUCT
398 -#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
399 - case id: return SID_ENUM(name);
437 +vmSymbols::SID vmIntrinsics::class_for(vmIntrinsics::ID id) {
438 + jint info = intrinsic_info(id);
439 + int shift = 2*vmSymbols::log2_SID_LIMIT + log2_FLAG_LIMIT, mask = right_n_bits(vmSymbols::log2_SID_LIMIT);
440 + assert(((ID4(31,1022,1023,15) >> shift) & mask) == 31, "");
441 + return vmSymbols::SID( (info >> shift) & mask );
442 +}
400 443
401 - switch (id) {
402 - VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
403 - VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
404 - }
405 -#undef VM_INTRINSIC_CASE
406 -#endif //PRODUCT
407 - return vmSymbols::NO_SID;
444 +vmSymbols::SID vmIntrinsics::name_for(vmIntrinsics::ID id) {
445 + jint info = intrinsic_info(id);
446 + int shift = vmSymbols::log2_SID_LIMIT + log2_FLAG_LIMIT, mask = right_n_bits(vmSymbols::log2_SID_LIMIT);
447 + assert(((ID4(31,1022,1023,15) >> shift) & mask) == 1022, "");
448 + return vmSymbols::SID( (info >> shift) & mask );
408 449 }
409 450
410 451 vmSymbols::SID vmIntrinsics::signature_for(vmIntrinsics::ID id) {
411 -#ifndef PRODUCT
412 -#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
413 - case id: return SID_ENUM(sig);
414 -
415 - switch (id) {
416 - VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
417 - VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
418 - }
419 -#undef VM_INTRINSIC_CASE
420 -#endif //PRODUCT
421 - return vmSymbols::NO_SID;
452 + jint info = intrinsic_info(id);
453 + int shift = log2_FLAG_LIMIT, mask = right_n_bits(vmSymbols::log2_SID_LIMIT);
454 + assert(((ID4(31,1022,1023,15) >> shift) & mask) == 1023, "");
455 + return vmSymbols::SID( (info >> shift) & mask );
422 456 }
423 457
424 458 vmIntrinsics::Flags vmIntrinsics::flags_for(vmIntrinsics::ID id) {
425 -#ifndef PRODUCT
426 -#define VM_INTRINSIC_CASE(id, klass, name, sig, fcode) \
427 - case id: return fcode;
428 -
429 - switch (id) {
430 - VM_INTRINSICS_DO(VM_INTRINSIC_CASE,
431 - VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
432 - }
433 -#undef VM_INTRINSIC_CASE
434 -#endif //PRODUCT
435 - return F_none;
459 + jint info = intrinsic_info(id);
460 + int shift = 0, mask = right_n_bits(log2_FLAG_LIMIT);
461 + assert(((ID4(31,1022,1023,15) >> shift) & mask) == 15, "");
462 + return Flags( (info >> shift) & mask );
436 463 }
437 464
438 465
439 466 #ifndef PRODUCT
440 467 // verify_method performs an extra check on a matched intrinsic method
441 468
442 469 static bool match_method(methodOop m, symbolOop n, symbolOop s) {
443 470 return (m->name() == n &&
444 471 m->signature() == s);
445 472 }
446 473
447 474 static vmIntrinsics::ID match_method_with_klass(methodOop m, symbolOop mk) {
448 475 #define VM_INTRINSIC_MATCH(id, klassname, namepart, sigpart, flags) \
449 476 { symbolOop k = vmSymbols::klassname(); \
450 477 if (mk == k) { \
451 478 symbolOop n = vmSymbols::namepart(); \
452 479 symbolOop s = vmSymbols::sigpart(); \
453 480 if (match_method(m, n, s)) \
454 481 return vmIntrinsics::id; \
455 482 } }
456 483 VM_INTRINSICS_DO(VM_INTRINSIC_MATCH,
457 484 VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_SYMBOL_IGNORE, VM_ALIAS_IGNORE);
458 485 return vmIntrinsics::_none;
459 486 #undef VM_INTRINSIC_MATCH
460 487 }
461 488
462 489 void vmIntrinsics::verify_method(ID actual_id, methodOop m) {
463 490 symbolOop mk = Klass::cast(m->method_holder())->name();
464 491 ID declared_id = match_method_with_klass(m, mk);
465 492
466 493 if (declared_id == actual_id) return; // success
467 494
468 495 if (declared_id == _none && actual_id != _none && mk == vmSymbols::java_lang_StrictMath()) {
469 496 // Here are a few special cases in StrictMath not declared in vmSymbols.hpp.
470 497 switch (actual_id) {
471 498 case _min:
472 499 case _max:
473 500 case _dsqrt:
474 501 declared_id = match_method_with_klass(m, vmSymbols::java_lang_Math());
475 502 if (declared_id == actual_id) return; // acceptable alias
476 503 break;
477 504 }
478 505 }
479 506
480 507 const char* declared_name = name_at(declared_id);
481 508 const char* actual_name = name_at(actual_id);
482 509 methodHandle mh = m;
483 510 m = NULL;
484 511 ttyLocker ttyl;
485 512 if (xtty != NULL) {
486 513 xtty->begin_elem("intrinsic_misdeclared actual='%s' declared='%s'",
487 514 actual_name, declared_name);
488 515 xtty->method(mh);
489 516 xtty->end_elem("");
490 517 }
491 518 if (PrintMiscellaneous && (WizardMode || Verbose)) {
492 519 tty->print_cr("*** misidentified method; %s(%d) should be %s(%d):",
493 520 declared_name, declared_id, actual_name, actual_id);
494 521 mh()->print_short_name(tty);
495 522 tty->cr();
496 523 }
497 524 }
498 525 #endif //PRODUCT
|
↓ open down ↓ |
53 lines elided |
↑ open up ↑ |
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX