comparison src/share/vm/graal/graalCodeInstaller.cpp @ 14574:6bab029d6e3a

removed com/oracle/graal/hotspot/bridge/Marks.java and replaced with enum
author twisti
date Mon, 17 Mar 2014 17:32:35 -0700
parents 45812e05cdb3
children 2ec76bd5f309
comparison
equal deleted inserted replaced
14573:e3888db8b8a1 14574:6bab029d6e3a
467 467
468 #ifndef PRODUCT 468 #ifndef PRODUCT
469 _comments = (arrayOop) HotSpotCompiledCode::comments(compiled_code); 469 _comments = (arrayOop) HotSpotCompiledCode::comments(compiled_code);
470 #endif 470 #endif
471 471
472 _next_call_type = MARK_INVOKE_INVALID; 472 _next_call_type = INVOKE_INVALID;
473 } 473 }
474 474
475 // perform data and call relocation on the CodeBuffer 475 // perform data and call relocation on the CodeBuffer
476 bool CodeInstaller::initialize_buffer(CodeBuffer& buffer) { 476 bool CodeInstaller::initialize_buffer(CodeBuffer& buffer) {
477 int locs_buffer_size = _sites->length() * (relocInfo::length_limit + sizeof(relocInfo)); 477 int locs_buffer_size = _sites->length() * (relocInfo::length_limit + sizeof(relocInfo));
774 774
775 TRACE_graal_3("method call"); 775 TRACE_graal_3("method call");
776 CodeInstaller::pd_relocate_JavaMethod(hotspot_method, pc_offset); 776 CodeInstaller::pd_relocate_JavaMethod(hotspot_method, pc_offset);
777 } 777 }
778 778
779 _next_call_type = MARK_INVOKE_INVALID; 779 _next_call_type = INVOKE_INVALID;
780 780
781 if (debug_info != NULL) { 781 if (debug_info != NULL) {
782 _debug_recorder->end_safepoint(next_pc_offset); 782 _debug_recorder->end_safepoint(next_pc_offset);
783 } 783 }
784 } 784 }
804 jint id = id_obj->int_field(java_lang_boxing_object::value_offset_in_bytes(T_INT)); 804 jint id = id_obj->int_field(java_lang_boxing_object::value_offset_in_bytes(T_INT));
805 805
806 address pc = _instructions->start() + pc_offset; 806 address pc = _instructions->start() + pc_offset;
807 807
808 switch (id) { 808 switch (id) {
809 case MARK_UNVERIFIED_ENTRY: 809 case UNVERIFIED_ENTRY:
810 _offsets.set_value(CodeOffsets::Entry, pc_offset); 810 _offsets.set_value(CodeOffsets::Entry, pc_offset);
811 break; 811 break;
812 case MARK_VERIFIED_ENTRY: 812 case VERIFIED_ENTRY:
813 _offsets.set_value(CodeOffsets::Verified_Entry, pc_offset); 813 _offsets.set_value(CodeOffsets::Verified_Entry, pc_offset);
814 break; 814 break;
815 case MARK_OSR_ENTRY: 815 case OSR_ENTRY:
816 _offsets.set_value(CodeOffsets::OSR_Entry, pc_offset); 816 _offsets.set_value(CodeOffsets::OSR_Entry, pc_offset);
817 break; 817 break;
818 case MARK_EXCEPTION_HANDLER_ENTRY: 818 case EXCEPTION_HANDLER_ENTRY:
819 _offsets.set_value(CodeOffsets::Exceptions, pc_offset); 819 _offsets.set_value(CodeOffsets::Exceptions, pc_offset);
820 break; 820 break;
821 case MARK_DEOPT_HANDLER_ENTRY: 821 case DEOPT_HANDLER_ENTRY:
822 _offsets.set_value(CodeOffsets::Deopt, pc_offset); 822 _offsets.set_value(CodeOffsets::Deopt, pc_offset);
823 break; 823 break;
824 case MARK_INVOKEVIRTUAL: 824 case INVOKEVIRTUAL:
825 case MARK_INVOKEINTERFACE: 825 case INVOKEINTERFACE:
826 case MARK_INLINE_INVOKE: 826 case INLINE_INVOKE:
827 case MARK_INVOKESTATIC: 827 case INVOKESTATIC:
828 case MARK_INVOKESPECIAL: 828 case INVOKESPECIAL:
829 _next_call_type = (MarkId) id; 829 _next_call_type = (MarkId) id;
830 _invoke_mark_pc = pc; 830 _invoke_mark_pc = pc;
831 break; 831 break;
832 case MARK_POLL_NEAR: 832 case POLL_NEAR:
833 case MARK_POLL_FAR: 833 case POLL_FAR:
834 case MARK_POLL_RETURN_NEAR: 834 case POLL_RETURN_NEAR:
835 case MARK_POLL_RETURN_FAR: 835 case POLL_RETURN_FAR:
836 pd_relocate_poll(pc, id); 836 pd_relocate_poll(pc, id);
837 break; 837 break;
838 default: 838 default:
839 ShouldNotReachHere(); 839 ShouldNotReachHere();
840 break; 840 break;