Mercurial > hg > graal-jvmci-8
diff src/share/vm/runtime/sharedRuntime.cpp @ 21559:be896a1983c0
recast all Graal native code as JVMCI code (JBS:GRAAL-53)
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Thu, 28 May 2015 15:36:48 +0200 |
parents | 2e35a4ea22ac |
children | c28cb37b2e1d |
line wrap: on
line diff
--- a/src/share/vm/runtime/sharedRuntime.cpp Wed May 27 13:43:27 2015 +0200 +++ b/src/share/vm/runtime/sharedRuntime.cpp Thu May 28 15:36:48 2015 +0200 @@ -111,8 +111,8 @@ _resolve_virtual_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_virtual_call_C), "resolve_virtual_call"); _resolve_static_call_blob = generate_resolve_blob(CAST_FROM_FN_PTR(address, SharedRuntime::resolve_static_call_C), "resolve_static_call"); -#if defined(COMPILER2) || defined(GRAAL) - // Vectors are generated only by C2 and Graal. +#if defined(COMPILER2) || defined(JVMCI) + // Vectors are generated only by C2 and JVMCI. bool support_wide = is_wide_vector(MaxVectorSize); if (support_wide) { _polling_page_vectors_safepoint_handler_blob = generate_handler_blob(CAST_FROM_FN_PTR(address, SafepointSynchronize::handle_polling_page_exception), POLL_AT_VECTOR_LOOP); @@ -488,8 +488,8 @@ // Reset method handle flag. thread->set_is_method_handle_return(false); -#ifdef GRAAL - // Graal's ExceptionHandlerStub expects the thread local exception PC to be clear +#ifdef JVMCI + // JVMCI's ExceptionHandlerStub expects the thread local exception PC to be clear // and other exception handler continuations do not read it thread->set_exception_pc(NULL); #endif @@ -650,8 +650,8 @@ assert(nm != NULL, "must exist"); ResourceMark rm; -#ifdef GRAAL - if (nm->is_compiled_by_graal()) { +#ifdef JVMCI + if (nm->is_compiled_by_jvmci()) { // lookup exception handler for this pc int catch_pco = ret_pc - nm->code_begin(); ExceptionHandlerTable table(nm); @@ -795,10 +795,10 @@ throw_and_post_jvmti_exception(thread, exception); JRT_END -#ifdef GRAAL +#ifdef JVMCI address SharedRuntime::deoptimize_for_implicit_exception(JavaThread* thread, address pc, nmethod* nm, int deopt_reason) { assert(deopt_reason > Deoptimization::Reason_none && deopt_reason < Deoptimization::Reason_LIMIT, "invalid deopt reason"); - thread->set_graal_implicit_exception_pc(pc); + thread->set_jvmci_implicit_exception_pc(pc); thread->set_pending_deoptimization(Deoptimization::make_trap_request((Deoptimization::DeoptReason)deopt_reason, Deoptimization::Action_reinterpret)); return (SharedRuntime::deopt_blob()->implicit_exception_uncommon_trap()); } @@ -901,8 +901,8 @@ #ifndef PRODUCT _implicit_null_throws++; #endif -#ifdef GRAAL - if (nm->is_compiled_by_graal() && nm->pc_desc_at(pc) != NULL) { +#ifdef JVMCI + if (nm->is_compiled_by_jvmci() && nm->pc_desc_at(pc) != NULL) { // If there's no PcDesc then we'll die way down inside of // deopt instead of just getting normal error reporting, // so only go there if it will succeed. @@ -910,7 +910,7 @@ } else { #endif target_pc = nm->continuation_for_implicit_exception(pc); -#ifdef GRAAL +#ifdef JVMCI } #endif // If there's an unexpected fault, target_pc might be NULL, @@ -928,13 +928,13 @@ #ifndef PRODUCT _implicit_div0_throws++; #endif -#ifdef GRAAL - if (nm->is_compiled_by_graal() && nm->pc_desc_at(pc) != NULL) { +#ifdef JVMCI + if (nm->is_compiled_by_jvmci() && nm->pc_desc_at(pc) != NULL) { return deoptimize_for_implicit_exception(thread, pc, nm, Deoptimization::Reason_div0_check); } else { #endif target_pc = nm->continuation_for_implicit_exception(pc); -#ifdef GRAAL +#ifdef JVMCI } #endif // If there's an unexpected fault, target_pc might be NULL, @@ -1013,7 +1013,7 @@ JRT_ENTRY_NO_ASYNC(void, SharedRuntime::register_finalizer(JavaThread* thread, oopDesc* obj)) -#ifdef GRAAL +#ifdef JVMCI if (!obj->klass()->has_finalizer()) { return; }