Mercurial > hg > graal-jvmci-8
comparison src/share/vm/code/nmethod.cpp @ 2044:06f017f7daa7
Merge.
author | Thomas Wuerthinger <wuerthinger@ssw.jku.at> |
---|---|
date | Fri, 07 Jan 2011 18:18:08 +0100 |
parents | 4853c5cad3aa 09b4dd4f152b |
children | 91fe28b03d6a |
comparison
equal
deleted
inserted
replaced
1942:00bc9eaf0e24 | 2044:06f017f7daa7 |
---|---|
20 * or visit www.oracle.com if you need additional information or have any | 20 * or visit www.oracle.com if you need additional information or have any |
21 * questions. | 21 * questions. |
22 * | 22 * |
23 */ | 23 */ |
24 | 24 |
25 # include "incls/_precompiled.incl" | 25 #include "precompiled.hpp" |
26 # include "incls/_nmethod.cpp.incl" | 26 #include "code/codeCache.hpp" |
27 #include "code/compiledIC.hpp" | |
28 #include "code/nmethod.hpp" | |
29 #include "code/scopeDesc.hpp" | |
30 #include "compiler/abstractCompiler.hpp" | |
31 #include "compiler/compileLog.hpp" | |
32 #include "compiler/compilerOracle.hpp" | |
33 #include "compiler/disassembler.hpp" | |
34 #include "interpreter/bytecode.hpp" | |
35 #include "oops/methodDataOop.hpp" | |
36 #include "prims/jvmtiRedefineClassesTrace.hpp" | |
37 #include "runtime/sharedRuntime.hpp" | |
38 #include "runtime/sweeper.hpp" | |
39 #include "utilities/dtrace.hpp" | |
40 #include "utilities/events.hpp" | |
41 #include "utilities/xmlstream.hpp" | |
42 #ifdef SHARK | |
43 #include "shark/sharkCompiler.hpp" | |
44 #endif | |
27 | 45 |
28 #ifdef DTRACE_ENABLED | 46 #ifdef DTRACE_ENABLED |
29 | 47 |
30 // Only bother with this argument setup if dtrace is available | 48 // Only bother with this argument setup if dtrace is available |
31 | 49 |
599 ByteSize basic_lock_owner_sp_offset, | 617 ByteSize basic_lock_owner_sp_offset, |
600 ByteSize basic_lock_sp_offset, | 618 ByteSize basic_lock_sp_offset, |
601 OopMapSet* oop_maps ) | 619 OopMapSet* oop_maps ) |
602 : CodeBlob("native nmethod", code_buffer, sizeof(nmethod), | 620 : CodeBlob("native nmethod", code_buffer, sizeof(nmethod), |
603 nmethod_size, offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps), | 621 nmethod_size, offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps), |
604 _compiled_synchronized_native_basic_lock_owner_sp_offset(basic_lock_owner_sp_offset), | 622 _native_receiver_sp_offset(basic_lock_owner_sp_offset), |
605 _compiled_synchronized_native_basic_lock_sp_offset(basic_lock_sp_offset) | 623 _native_basic_lock_sp_offset(basic_lock_sp_offset) |
606 { | 624 { |
607 { | 625 { |
608 debug_only(No_Safepoint_Verifier nsv;) | 626 debug_only(No_Safepoint_Verifier nsv;) |
609 assert_locked_or_safepoint(CodeCache_lock); | 627 assert_locked_or_safepoint(CodeCache_lock); |
610 | 628 |
676 CodeOffsets* offsets, | 694 CodeOffsets* offsets, |
677 CodeBuffer* code_buffer, | 695 CodeBuffer* code_buffer, |
678 int frame_size) | 696 int frame_size) |
679 : CodeBlob("dtrace nmethod", code_buffer, sizeof(nmethod), | 697 : CodeBlob("dtrace nmethod", code_buffer, sizeof(nmethod), |
680 nmethod_size, offsets->value(CodeOffsets::Frame_Complete), frame_size, NULL), | 698 nmethod_size, offsets->value(CodeOffsets::Frame_Complete), frame_size, NULL), |
681 _compiled_synchronized_native_basic_lock_owner_sp_offset(in_ByteSize(-1)), | 699 _native_receiver_sp_offset(in_ByteSize(-1)), |
682 _compiled_synchronized_native_basic_lock_sp_offset(in_ByteSize(-1)) | 700 _native_basic_lock_sp_offset(in_ByteSize(-1)) |
683 { | 701 { |
684 { | 702 { |
685 debug_only(No_Safepoint_Verifier nsv;) | 703 debug_only(No_Safepoint_Verifier nsv;) |
686 assert_locked_or_safepoint(CodeCache_lock); | 704 assert_locked_or_safepoint(CodeCache_lock); |
687 | 705 |
770 AbstractCompiler* compiler, | 788 AbstractCompiler* compiler, |
771 int comp_level | 789 int comp_level |
772 ) | 790 ) |
773 : CodeBlob("nmethod", code_buffer, sizeof(nmethod), | 791 : CodeBlob("nmethod", code_buffer, sizeof(nmethod), |
774 nmethod_size, offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps), | 792 nmethod_size, offsets->value(CodeOffsets::Frame_Complete), frame_size, oop_maps), |
775 _compiled_synchronized_native_basic_lock_owner_sp_offset(in_ByteSize(-1)), | 793 _native_receiver_sp_offset(in_ByteSize(-1)), |
776 _compiled_synchronized_native_basic_lock_sp_offset(in_ByteSize(-1)) | 794 _native_basic_lock_sp_offset(in_ByteSize(-1)) |
777 { | 795 { |
778 assert(debug_info->oop_recorder() == code_buffer->oop_recorder(), "shared OR"); | 796 assert(debug_info->oop_recorder() == code_buffer->oop_recorder(), "shared OR"); |
779 { | 797 { |
780 debug_only(No_Safepoint_Verifier nsv;) | 798 debug_only(No_Safepoint_Verifier nsv;) |
781 assert_locked_or_safepoint(CodeCache_lock); | 799 assert_locked_or_safepoint(CodeCache_lock); |