comparison src/share/vm/graal/graalCompilerToVM.cpp @ 9453:cdc839f22a23

renamed HotSpot specific parts of deoptimization stub: DEOPTIMIZE -> UNCOMMON_TRAP
author Doug Simon <doug.simon@oracle.com>
date Tue, 30 Apr 2013 20:07:53 +0200
parents 20dc10bb82d1
children 3e7d22d31f7e
comparison
equal deleted inserted replaced
9452:c1ba734c1ea0 9453:cdc839f22a23
760 set_address("handleDeoptStub", SharedRuntime::deopt_blob()->unpack()); 760 set_address("handleDeoptStub", SharedRuntime::deopt_blob()->unpack());
761 set_address("monitorEnterStub", GraalRuntime::entry_for(GraalRuntime::monitorenter_id)); 761 set_address("monitorEnterStub", GraalRuntime::entry_for(GraalRuntime::monitorenter_id));
762 set_address("monitorExitStub", GraalRuntime::entry_for(GraalRuntime::monitorexit_id)); 762 set_address("monitorExitStub", GraalRuntime::entry_for(GraalRuntime::monitorexit_id));
763 set_address("verifyOopStub", GraalRuntime::entry_for(GraalRuntime::verify_oop_id)); 763 set_address("verifyOopStub", GraalRuntime::entry_for(GraalRuntime::verify_oop_id));
764 set_address("vmErrorStub", GraalRuntime::entry_for(GraalRuntime::vm_error_id)); 764 set_address("vmErrorStub", GraalRuntime::entry_for(GraalRuntime::vm_error_id));
765 set_address("deoptimizeStub", SharedRuntime::deopt_blob()->uncommon_trap());
766 set_address("unwindExceptionStub", GraalRuntime::entry_for(GraalRuntime::unwind_exception_call_id)); 765 set_address("unwindExceptionStub", GraalRuntime::entry_for(GraalRuntime::unwind_exception_call_id));
767 set_address("osrMigrationEndStub", GraalRuntime::entry_for(GraalRuntime::OSR_migration_end_id)); 766 set_address("osrMigrationEndStub", GraalRuntime::entry_for(GraalRuntime::OSR_migration_end_id));
768 set_address("createNullPointerExceptionStub", GraalRuntime::entry_for(GraalRuntime::create_null_pointer_exception_id)); 767 set_address("createNullPointerExceptionStub", GraalRuntime::entry_for(GraalRuntime::create_null_pointer_exception_id));
769 set_address("createOutOfBoundsExceptionStub", GraalRuntime::entry_for(GraalRuntime::create_out_of_bounds_exception_id)); 768 set_address("createOutOfBoundsExceptionStub", GraalRuntime::entry_for(GraalRuntime::create_out_of_bounds_exception_id));
770 set_address("javaTimeMillisStub", CAST_FROM_FN_PTR(address, os::javaTimeMillis)); 769 set_address("javaTimeMillisStub", CAST_FROM_FN_PTR(address, os::javaTimeMillis));
786 set_address("newInstanceAddress", GraalRuntime::new_instance); 785 set_address("newInstanceAddress", GraalRuntime::new_instance);
787 set_address("newArrayAddress", GraalRuntime::new_array); 786 set_address("newArrayAddress", GraalRuntime::new_array);
788 set_address("newMultiArrayAddress", GraalRuntime::new_multi_array); 787 set_address("newMultiArrayAddress", GraalRuntime::new_multi_array);
789 set_address("registerFinalizerAddress", SharedRuntime::register_finalizer); 788 set_address("registerFinalizerAddress", SharedRuntime::register_finalizer);
790 set_address("threadIsInterruptedAddress", GraalRuntime::thread_is_interrupted); 789 set_address("threadIsInterruptedAddress", GraalRuntime::thread_is_interrupted);
790 set_address("uncommonTrapStub", SharedRuntime::deopt_blob()->uncommon_trap());
791 791
792 set_int("deoptReasonNone", Deoptimization::Reason_none); 792 set_int("deoptReasonNone", Deoptimization::Reason_none);
793 set_int("deoptReasonNullCheck", Deoptimization::Reason_null_check); 793 set_int("deoptReasonNullCheck", Deoptimization::Reason_null_check);
794 set_int("deoptReasonRangeCheck", Deoptimization::Reason_range_check); 794 set_int("deoptReasonRangeCheck", Deoptimization::Reason_range_check);
795 set_int("deoptReasonClassCheck", Deoptimization::Reason_class_check); 795 set_int("deoptReasonClassCheck", Deoptimization::Reason_class_check);