Mercurial > hg > truffle

comparison src/share/vm/runtime/sharedRuntime.hpp @ 13451:02f27ecb4f3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Wed, 18 Dec 2013 00:00:24 +0100
parents 347d444a6fb7 570aaefce624
children f6c04e69cf75
comparison
equal deleted inserted replaced
13371:4db09b7304da 13451:02f27ecb4f3a
54 bool is_optimized, TRAPS); 54 bool is_optimized, TRAPS);
55 55
56 // Shared stub locations 56 // Shared stub locations
57 57
58 static RuntimeStub* _wrong_method_blob; 58 static RuntimeStub* _wrong_method_blob;
59 static RuntimeStub* _wrong_method_abstract_blob;
59 static RuntimeStub* _ic_miss_blob; 60 static RuntimeStub* _ic_miss_blob;
60 static RuntimeStub* _resolve_opt_virtual_call_blob; 61 static RuntimeStub* _resolve_opt_virtual_call_blob;
61 static RuntimeStub* _resolve_virtual_call_blob; 62 static RuntimeStub* _resolve_virtual_call_blob;
62 static RuntimeStub* _resolve_static_call_blob; 63 static RuntimeStub* _resolve_static_call_blob;
63 64
208 static address get_handle_wrong_method_stub() { 209 static address get_handle_wrong_method_stub() {
209 assert(_wrong_method_blob!= NULL, "oops"); 210 assert(_wrong_method_blob!= NULL, "oops");
210 return _wrong_method_blob->entry_point(); 211 return _wrong_method_blob->entry_point();
211 } 212 }
212 213
214 static address get_handle_wrong_method_abstract_stub() {
215 assert(_wrong_method_abstract_blob!= NULL, "oops");
216 return _wrong_method_abstract_blob->entry_point();
217 }
218
213 #ifdef COMPILER2 219 #ifdef COMPILER2
214 static void generate_uncommon_trap_blob(void); 220 static void generate_uncommon_trap_blob(void);
215 static UncommonTrapBlob* uncommon_trap_blob() { return _uncommon_trap_blob; } 221 static UncommonTrapBlob* uncommon_trap_blob() { return _uncommon_trap_blob; }
216 #endif // COMPILER2 222 #endif // COMPILER2
217 223
483 jint length, JavaThread* thread); 489 jint length, JavaThread* thread);
484 490
485 // handle ic miss with caller being compiled code 491 // handle ic miss with caller being compiled code
486 // wrong method handling (inline cache misses, zombie methods) 492 // wrong method handling (inline cache misses, zombie methods)
487 static address handle_wrong_method(JavaThread* thread); 493 static address handle_wrong_method(JavaThread* thread);
494 static address handle_wrong_method_abstract(JavaThread* thread);
488 static address handle_wrong_method_ic_miss(JavaThread* thread); 495 static address handle_wrong_method_ic_miss(JavaThread* thread);
489 496
490 #ifndef PRODUCT 497 #ifndef PRODUCT
491 498
492 // Collect and print inline cache miss statistics 499 // Collect and print inline cache miss statistics