Mercurial > hg > graal-compiler
comparison src/share/vm/graal/graalCompilerToVM.cpp @ 9463:902a974d55c8
Merge.
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Tue, 30 Apr 2013 23:24:25 +0200 |
parents | 861a9e0aba38 56c12e0c15c1 |
children | 5fa54bf57f8c |
comparison
equal
deleted
inserted
replaced
9462:861a9e0aba38 | 9463:902a974d55c8 |
---|---|
759 set_address("handleDeoptStub", SharedRuntime::deopt_blob()->unpack()); | 759 set_address("handleDeoptStub", SharedRuntime::deopt_blob()->unpack()); |
760 set_address("monitorEnterStub", GraalRuntime::entry_for(GraalRuntime::monitorenter_id)); | 760 set_address("monitorEnterStub", GraalRuntime::entry_for(GraalRuntime::monitorenter_id)); |
761 set_address("monitorExitStub", GraalRuntime::entry_for(GraalRuntime::monitorexit_id)); | 761 set_address("monitorExitStub", GraalRuntime::entry_for(GraalRuntime::monitorexit_id)); |
762 set_address("verifyOopStub", GraalRuntime::entry_for(GraalRuntime::verify_oop_id)); | 762 set_address("verifyOopStub", GraalRuntime::entry_for(GraalRuntime::verify_oop_id)); |
763 set_address("vmErrorStub", GraalRuntime::entry_for(GraalRuntime::vm_error_id)); | 763 set_address("vmErrorStub", GraalRuntime::entry_for(GraalRuntime::vm_error_id)); |
764 set_address("deoptimizeStub", SharedRuntime::deopt_blob()->uncommon_trap()); | |
765 set_address("unwindExceptionStub", GraalRuntime::entry_for(GraalRuntime::unwind_exception_call_id)); | 764 set_address("unwindExceptionStub", GraalRuntime::entry_for(GraalRuntime::unwind_exception_call_id)); |
766 set_address("osrMigrationEndStub", GraalRuntime::entry_for(GraalRuntime::OSR_migration_end_id)); | 765 set_address("osrMigrationEndStub", GraalRuntime::entry_for(GraalRuntime::OSR_migration_end_id)); |
767 set_address("createNullPointerExceptionStub", GraalRuntime::entry_for(GraalRuntime::create_null_pointer_exception_id)); | 766 set_address("createNullPointerExceptionStub", GraalRuntime::entry_for(GraalRuntime::create_null_pointer_exception_id)); |
768 set_address("createOutOfBoundsExceptionStub", GraalRuntime::entry_for(GraalRuntime::create_out_of_bounds_exception_id)); | 767 set_address("createOutOfBoundsExceptionStub", GraalRuntime::entry_for(GraalRuntime::create_out_of_bounds_exception_id)); |
769 set_address("javaTimeMillisStub", CAST_FROM_FN_PTR(address, os::javaTimeMillis)); | 768 set_address("javaTimeMillisStub", CAST_FROM_FN_PTR(address, os::javaTimeMillis)); |
774 set_address("arithmeticCosStub", CAST_FROM_FN_PTR(address, SharedRuntime::dcos)); | 773 set_address("arithmeticCosStub", CAST_FROM_FN_PTR(address, SharedRuntime::dcos)); |
775 set_address("arithmeticTanStub", CAST_FROM_FN_PTR(address, SharedRuntime::dtan)); | 774 set_address("arithmeticTanStub", CAST_FROM_FN_PTR(address, SharedRuntime::dtan)); |
776 set_address("logPrimitiveStub", GraalRuntime::entry_for(GraalRuntime::log_primitive_id)); | 775 set_address("logPrimitiveStub", GraalRuntime::entry_for(GraalRuntime::log_primitive_id)); |
777 set_address("logObjectStub", GraalRuntime::entry_for(GraalRuntime::log_object_id)); | 776 set_address("logObjectStub", GraalRuntime::entry_for(GraalRuntime::log_object_id)); |
778 set_address("logPrintfStub", GraalRuntime::entry_for(GraalRuntime::log_printf_id)); | 777 set_address("logPrintfStub", GraalRuntime::entry_for(GraalRuntime::log_printf_id)); |
779 set_address("stubPrintfStub", GraalRuntime::entry_for(GraalRuntime::stub_printf_id)); | |
780 set_address("aescryptEncryptBlockStub", StubRoutines::aescrypt_encryptBlock()); | 778 set_address("aescryptEncryptBlockStub", StubRoutines::aescrypt_encryptBlock()); |
781 set_address("aescryptDecryptBlockStub", StubRoutines::aescrypt_decryptBlock()); | 779 set_address("aescryptDecryptBlockStub", StubRoutines::aescrypt_decryptBlock()); |
782 set_address("cipherBlockChainingEncryptAESCryptStub", StubRoutines::cipherBlockChaining_encryptAESCrypt()); | 780 set_address("cipherBlockChainingEncryptAESCryptStub", StubRoutines::cipherBlockChaining_encryptAESCrypt()); |
783 set_address("cipherBlockChainingDecryptAESCryptStub", StubRoutines::cipherBlockChaining_decryptAESCrypt()); | 781 set_address("cipherBlockChainingDecryptAESCryptStub", StubRoutines::cipherBlockChaining_decryptAESCrypt()); |
784 | 782 |
785 set_address("newInstanceAddress", GraalRuntime::new_instance); | 783 set_address("newInstanceAddress", GraalRuntime::new_instance); |
786 set_address("newArrayAddress", GraalRuntime::new_array); | 784 set_address("newArrayAddress", GraalRuntime::new_array); |
787 set_address("newMultiArrayAddress", GraalRuntime::new_multi_array); | 785 set_address("newMultiArrayAddress", GraalRuntime::new_multi_array); |
788 set_address("registerFinalizerAddress", SharedRuntime::register_finalizer); | 786 set_address("registerFinalizerAddress", SharedRuntime::register_finalizer); |
789 set_address("threadIsInterruptedAddress", GraalRuntime::thread_is_interrupted); | 787 set_address("threadIsInterruptedAddress", GraalRuntime::thread_is_interrupted); |
788 set_address("uncommonTrapStub", SharedRuntime::deopt_blob()->uncommon_trap()); | |
789 set_address("stubPrintfAddress", GraalRuntime::stub_printf); | |
790 set_address("identityHashCodeAddress", GraalRuntime::identity_hash_code); | 790 set_address("identityHashCodeAddress", GraalRuntime::identity_hash_code); |
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); |