Mercurial > hg > truffle
comparison src/share/vm/code/nmethod.cpp @ 4562:ef00461e29af
Merge
author | Christian Haeubl <christian.haeubl@oracle.com> |
---|---|
date | Fri, 10 Feb 2012 10:16:19 -0800 |
parents | 35ca3ade314d 723df37192d6 |
children | 33df1aeaebbf |
comparison
equal
deleted
inserted
replaced
4561:35ca3ade314d | 4562:ef00461e29af |
---|---|
835 _stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs()); | 835 _stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs()); |
836 | 836 |
837 // Exception handler and deopt handler are in the stub section | 837 // Exception handler and deopt handler are in the stub section |
838 assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set"); | 838 assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set"); |
839 assert(offsets->value(CodeOffsets::Deopt ) != -1, "must be set"); | 839 assert(offsets->value(CodeOffsets::Deopt ) != -1, "must be set"); |
840 if (UseGraal) { | 840 #ifdef GRAAL |
841 // graal produces no (!) stub section | 841 // graal produces no (!) stub section |
842 _exception_offset = code_offset() + offsets->value(CodeOffsets::Exceptions); | 842 _exception_offset = code_offset() + offsets->value(CodeOffsets::Exceptions); |
843 _deoptimize_offset = code_offset() + offsets->value(CodeOffsets::Deopt); | 843 _deoptimize_offset = code_offset() + offsets->value(CodeOffsets::Deopt); |
844 if (offsets->value(CodeOffsets::DeoptMH) != -1) { | 844 if (offsets->value(CodeOffsets::DeoptMH) != -1) { |
845 _deoptimize_mh_offset = code_offset() + offsets->value(CodeOffsets::DeoptMH); | 845 _deoptimize_mh_offset = code_offset() + offsets->value(CodeOffsets::DeoptMH); |
846 } else { | 846 } else { |
847 _deoptimize_mh_offset = -1; | 847 _deoptimize_mh_offset = -1; |
848 } | 848 } |
849 } else { | 849 #else |
850 _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions); | 850 _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions); |
851 _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt); | 851 _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt); |
852 if (offsets->value(CodeOffsets::DeoptMH) != -1) { | 852 if (offsets->value(CodeOffsets::DeoptMH) != -1) { |
853 _deoptimize_mh_offset = _stub_offset + offsets->value(CodeOffsets::DeoptMH); | 853 _deoptimize_mh_offset = _stub_offset + offsets->value(CodeOffsets::DeoptMH); |
854 } else { | 854 } else { |
855 _deoptimize_mh_offset = -1; | 855 _deoptimize_mh_offset = -1; |
856 } | 856 } |
857 } | 857 #endif |
858 if (offsets->value(CodeOffsets::UnwindHandler) != -1) { | 858 if (offsets->value(CodeOffsets::UnwindHandler) != -1) { |
859 _unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler); | 859 _unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler); |
860 } else { | 860 } else { |
861 _unwind_handler_offset = -1; | 861 _unwind_handler_offset = -1; |
862 } | 862 } |
2351 // Right now there is no way to find out which entries support | 2351 // Right now there is no way to find out which entries support |
2352 // an interrupt point. It would be nice if we had this | 2352 // an interrupt point. It would be nice if we had this |
2353 // information in a table. | 2353 // information in a table. |
2354 break; | 2354 break; |
2355 } | 2355 } |
2356 assert(UseGraal || stub == NULL || stub_contains(stub), "static call stub outside stub section"); | 2356 #ifndef GRAAL |
2357 assert(stub == NULL || stub_contains(stub), "static call stub outside stub section"); | |
2358 #endif | |
2357 } | 2359 } |
2358 } | 2360 } |
2359 | 2361 |
2360 | 2362 |
2361 // ----------------------------------------------------------------------------- | 2363 // ----------------------------------------------------------------------------- |