Mercurial > hg > graal-jvmci-8
comparison src/share/vm/code/nmethod.cpp @ 9668:fe9a18fbb15e
added subclasses for HotSpotInstalledCode: HotSpotNmethod and HotSpotRuntimeStub
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 13 May 2013 18:19:43 +0200 |
parents | c6a1ffc707ff |
children | cf0e31151830 |
comparison
equal
deleted
inserted
replaced
9667:1ef7b26e9177 | 9668:fe9a18fbb15e |
---|---|
1399 // The caller can be calling the method statically or through an inline | 1399 // The caller can be calling the method statically or through an inline |
1400 // cache call. | 1400 // cache call. |
1401 if (!is_osr_method() && !is_not_entrant()) { | 1401 if (!is_osr_method() && !is_not_entrant()) { |
1402 address stub = SharedRuntime::get_handle_wrong_method_stub(); | 1402 address stub = SharedRuntime::get_handle_wrong_method_stub(); |
1403 #ifdef GRAAL | 1403 #ifdef GRAAL |
1404 if (_graal_installed_code != NULL && !HotSpotInstalledCode::isDefault(_graal_installed_code)) { | 1404 if (_graal_installed_code != NULL && !HotSpotNmethod::isDefault(_graal_installed_code)) { |
1405 // This was manually installed machine code. Patch entry with stub that throws an exception. | 1405 // This was manually installed machine code. Patch entry with stub that throws an exception. |
1406 stub = SharedRuntime::get_deoptimized_installed_code_stub(); | 1406 stub = SharedRuntime::get_deoptimized_installed_code_stub(); |
1407 } | 1407 } |
1408 #endif | 1408 #endif |
1409 NativeJump::patch_verified_entry(entry_point(), verified_entry_point(), stub); | 1409 NativeJump::patch_verified_entry(entry_point(), verified_entry_point(), stub); |
1696 } | 1696 } |
1697 | 1697 |
1698 #ifdef GRAAL | 1698 #ifdef GRAAL |
1699 // Follow Graal method | 1699 // Follow Graal method |
1700 if (_graal_installed_code != NULL) { | 1700 if (_graal_installed_code != NULL) { |
1701 if (HotSpotInstalledCode::isDefault(_graal_installed_code)) { | 1701 if (HotSpotNmethod::isDefault(_graal_installed_code)) { |
1702 if (!is_alive->do_object_b(_graal_installed_code)) { | 1702 if (!is_alive->do_object_b(_graal_installed_code)) { |
1703 _graal_installed_code = NULL; | 1703 _graal_installed_code = NULL; |
1704 } | 1704 } |
1705 } else { | 1705 } else { |
1706 if (can_unload(is_alive, (oop*)&_graal_installed_code, unloading_occurred)) { | 1706 if (can_unload(is_alive, (oop*)&_graal_installed_code, unloading_occurred)) { |