Mercurial > hg > truffle
comparison src/share/vm/code/nmethod.cpp @ 18125:2a69cbe850a8
Reduce diff with upstream
author | Gilles Duboscq <duboscq@ssw.jku.at> |
---|---|
date | Mon, 20 Oct 2014 19:07:20 +0200 |
parents | 52b4284cb496 |
children | dcfdd60edaf1 |
comparison
equal
deleted
inserted
replaced
18124:689092d5cf44 | 18125:2a69cbe850a8 |
---|---|
662 + adjust_pcs_size(debug_info->pcs_size()) | 662 + adjust_pcs_size(debug_info->pcs_size()) |
663 + round_to(dependencies->size_in_bytes() , oopSize) | 663 + round_to(dependencies->size_in_bytes() , oopSize) |
664 + round_to(handler_table->size_in_bytes(), oopSize) | 664 + round_to(handler_table->size_in_bytes(), oopSize) |
665 + round_to(nul_chk_table->size_in_bytes(), oopSize) | 665 + round_to(nul_chk_table->size_in_bytes(), oopSize) |
666 + round_to(debug_info->data_size() , oopSize); | 666 + round_to(debug_info->data_size() , oopSize); |
667 | |
667 nm = new (nmethod_size) | 668 nm = new (nmethod_size) |
668 nmethod(method(), nmethod_size, compile_id, entry_bci, offsets, | 669 nmethod(method(), nmethod_size, compile_id, entry_bci, offsets, |
669 orig_pc_offset, debug_info, dependencies, code_buffer, frame_size, | 670 orig_pc_offset, debug_info, dependencies, code_buffer, frame_size, |
670 oop_maps, | 671 oop_maps, |
671 handler_table, | 672 handler_table, |
932 _stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs()); | 933 _stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs()); |
933 | 934 |
934 #ifdef GRAAL | 935 #ifdef GRAAL |
935 _graal_installed_code = installed_code(); | 936 _graal_installed_code = installed_code(); |
936 _speculation_log = (instanceOop)speculation_log(); | 937 _speculation_log = (instanceOop)speculation_log(); |
937 #endif | 938 |
938 if (compiler->is_graal()) { | 939 if (compiler->is_graal()) { |
939 // Graal might not produce any stub sections | 940 // Graal might not produce any stub sections |
940 if (offsets->value(CodeOffsets::Exceptions) != -1) { | 941 if (offsets->value(CodeOffsets::Exceptions) != -1) { |
941 _exception_offset = code_offset() + offsets->value(CodeOffsets::Exceptions); | 942 _exception_offset = code_offset() + offsets->value(CodeOffsets::Exceptions); |
942 } else { | 943 } else { |
951 _deoptimize_mh_offset = code_offset() + offsets->value(CodeOffsets::DeoptMH); | 952 _deoptimize_mh_offset = code_offset() + offsets->value(CodeOffsets::DeoptMH); |
952 } else { | 953 } else { |
953 _deoptimize_mh_offset = -1; | 954 _deoptimize_mh_offset = -1; |
954 } | 955 } |
955 } else { | 956 } else { |
956 // Exception handler and deopt handler are in the stub section | 957 #endif |
957 assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set"); | 958 // Exception handler and deopt handler are in the stub section |
958 assert(offsets->value(CodeOffsets::Deopt ) != -1, "must be set"); | 959 assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set"); |
959 | 960 assert(offsets->value(CodeOffsets::Deopt ) != -1, "must be set"); |
960 _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions); | 961 |
961 _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt); | 962 _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions); |
962 if (offsets->value(CodeOffsets::DeoptMH) != -1) { | 963 _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt); |
963 _deoptimize_mh_offset = _stub_offset + offsets->value(CodeOffsets::DeoptMH); | 964 if (offsets->value(CodeOffsets::DeoptMH) != -1) { |
964 } else { | 965 _deoptimize_mh_offset = _stub_offset + offsets->value(CodeOffsets::DeoptMH); |
965 _deoptimize_mh_offset = -1; | 966 } else { |
966 } | 967 _deoptimize_mh_offset = -1; |
968 #ifdef GRAAL | |
969 } | |
970 #endif | |
967 } | 971 } |
968 if (offsets->value(CodeOffsets::UnwindHandler) != -1) { | 972 if (offsets->value(CodeOffsets::UnwindHandler) != -1) { |
969 _unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler); | 973 _unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler); |
970 } else { | 974 } else { |
971 _unwind_handler_offset = -1; | 975 _unwind_handler_offset = -1; |