Mercurial > hg > truffle

comparison src/share/vm/code/nmethod.cpp @ 4559:723df37192d6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make it possible again to build a real client libjvm, drop the UseGraal flag. Use the --vm option instead of a special -vm option in the bench command
author Gilles Duboscq <duboscq@ssw.jku.at>
date Fri, 10 Feb 2012 17:04:03 +0100
parents 125678ef7587
children ef00461e29af
comparison
equal deleted inserted replaced
4558:3706975946e4 4559:723df37192d6
837 _stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs()); 837 _stub_offset = content_offset() + code_buffer->total_offset_of(code_buffer->stubs());
838 838
839 // Exception handler and deopt handler are in the stub section 839 // Exception handler and deopt handler are in the stub section
840 assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set"); 840 assert(offsets->value(CodeOffsets::Exceptions) != -1, "must be set");
841 assert(offsets->value(CodeOffsets::Deopt ) != -1, "must be set"); 841 assert(offsets->value(CodeOffsets::Deopt ) != -1, "must be set");
842 if (UseGraal) { 842 #ifdef GRAAL
843 // graal produces no (!) stub section 843 // graal produces no (!) stub section
844 _exception_offset = code_offset() + offsets->value(CodeOffsets::Exceptions); 844 _exception_offset = code_offset() + offsets->value(CodeOffsets::Exceptions);
845 _deoptimize_offset = code_offset() + offsets->value(CodeOffsets::Deopt); 845 _deoptimize_offset = code_offset() + offsets->value(CodeOffsets::Deopt);
846 if (offsets->value(CodeOffsets::DeoptMH) != -1) { 846 if (offsets->value(CodeOffsets::DeoptMH) != -1) {
847 _deoptimize_mh_offset = code_offset() + offsets->value(CodeOffsets::DeoptMH); 847 _deoptimize_mh_offset = code_offset() + offsets->value(CodeOffsets::DeoptMH);
848 } else { 848 } else {
849 _deoptimize_mh_offset = -1; 849 _deoptimize_mh_offset = -1;
850 } 850 }
851 } else { 851 #else
852 _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions); 852 _exception_offset = _stub_offset + offsets->value(CodeOffsets::Exceptions);
853 _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt); 853 _deoptimize_offset = _stub_offset + offsets->value(CodeOffsets::Deopt);
854 if (offsets->value(CodeOffsets::DeoptMH) != -1) { 854 if (offsets->value(CodeOffsets::DeoptMH) != -1) {
855 _deoptimize_mh_offset = _stub_offset + offsets->value(CodeOffsets::DeoptMH); 855 _deoptimize_mh_offset = _stub_offset + offsets->value(CodeOffsets::DeoptMH);
856 } else { 856 } else {
857 _deoptimize_mh_offset = -1; 857 _deoptimize_mh_offset = -1;
858 } 858 }
859 } 859 #endif
860 if (offsets->value(CodeOffsets::UnwindHandler) != -1) { 860 if (offsets->value(CodeOffsets::UnwindHandler) != -1) {
861 _unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler); 861 _unwind_handler_offset = code_offset() + offsets->value(CodeOffsets::UnwindHandler);
862 } else { 862 } else {
863 _unwind_handler_offset = -1; 863 _unwind_handler_offset = -1;
864 } 864 }
2353 // Right now there is no way to find out which entries support 2353 // Right now there is no way to find out which entries support
2354 // an interrupt point. It would be nice if we had this 2354 // an interrupt point. It would be nice if we had this
2355 // information in a table. 2355 // information in a table.
2356 break; 2356 break;
2357 } 2357 }
2358 assert(UseGraal || stub == NULL || stub_contains(stub), "static call stub outside stub section"); 2358 #ifndef GRAAL
2359 assert(stub == NULL || stub_contains(stub), "static call stub outside stub section");
2360 #endif
2359 } 2361 }
2360 } 2362 }
2361 2363
2362 2364
2363 // ----------------------------------------------------------------------------- 2365 // -----------------------------------------------------------------------------