comparison src/share/vm/graal/graalCompilerToVM.cpp @ 7484:69318374c8d7

Merge.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 14:41:15 +0100
parents 729a79037bd5 d0fbdf2f7a0e
children 7cae58134ff7
comparison
equal deleted inserted replaced
7483:729a79037bd5 7484:69318374c8d7
734 set_long("logPrimitiveStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_primitive_id))); 734 set_long("logPrimitiveStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_primitive_id)));
735 set_long("logObjectStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_object_id))); 735 set_long("logObjectStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_object_id)));
736 set_long("logPrintfStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_printf_id))); 736 set_long("logPrintfStub", VmIds::addStub(GraalRuntime::entry_for(GraalRuntime::graal_log_printf_id)));
737 set_long("aescryptEncryptBlockStub", VmIds::addStub(StubRoutines::aescrypt_encryptBlock())); 737 set_long("aescryptEncryptBlockStub", VmIds::addStub(StubRoutines::aescrypt_encryptBlock()));
738 set_long("aescryptDecryptBlockStub", VmIds::addStub(StubRoutines::aescrypt_decryptBlock())); 738 set_long("aescryptDecryptBlockStub", VmIds::addStub(StubRoutines::aescrypt_decryptBlock()));
739 set_long("cipherBlockChainingEncryptAESCryptStub", VmIds::addStub(StubRoutines::cipherBlockChaining_encryptAESCrypt()));
740 set_long("cipherBlockChainingDecryptAESCryptStub", VmIds::addStub(StubRoutines::cipherBlockChaining_decryptAESCrypt()));
739 741
740 set_int("deoptReasonNone", Deoptimization::Reason_none); 742 set_int("deoptReasonNone", Deoptimization::Reason_none);
741 set_int("deoptReasonNullCheck", Deoptimization::Reason_null_check); 743 set_int("deoptReasonNullCheck", Deoptimization::Reason_null_check);
742 set_int("deoptReasonRangeCheck", Deoptimization::Reason_range_check); 744 set_int("deoptReasonRangeCheck", Deoptimization::Reason_range_check);
743 set_int("deoptReasonClassCheck", Deoptimization::Reason_class_check); 745 set_int("deoptReasonClassCheck", Deoptimization::Reason_class_check);