Mercurial > hg > truffle

comparison src/share/vm/runtime/javaCalls.cpp @ 21559:be896a1983c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 48c1ebd24120
children
comparison
equal deleted inserted replaced
21558:d563baeca9df 21559:be896a1983c0
38 #include "runtime/javaCalls.hpp" 38 #include "runtime/javaCalls.hpp"
39 #include "runtime/mutexLocker.hpp" 39 #include "runtime/mutexLocker.hpp"
40 #include "runtime/signature.hpp" 40 #include "runtime/signature.hpp"
41 #include "runtime/stubRoutines.hpp" 41 #include "runtime/stubRoutines.hpp"
42 #include "runtime/thread.inline.hpp" 42 #include "runtime/thread.inline.hpp"
43 #ifdef GRAAL 43 #ifdef JVMCI
44 #include "graal/graalJavaAccess.hpp" 44 #include "jvmci/jvmciJavaAccess.hpp"
45 #include "graal/graalRuntime.hpp" 45 #include "jvmci/jvmciRuntime.hpp"
46 #endif 46 #endif
47 47
48 // ----------------------------------------------------- 48 // -----------------------------------------------------
49 // Implementation of JavaCallWrapper 49 // Implementation of JavaCallWrapper
50 50
341 assert(!thread->handle_area()->no_handle_mark_active(), "cannot call out to Java here"); 341 assert(!thread->handle_area()->no_handle_mark_active(), "cannot call out to Java here");
342 342
343 343
344 CHECK_UNHANDLED_OOPS_ONLY(thread->clear_unhandled_oops();) 344 CHECK_UNHANDLED_OOPS_ONLY(thread->clear_unhandled_oops();)
345 345
346 #ifdef GRAAL 346 #ifdef JVMCI
347 nmethod* nm = args->alternative_target(); 347 nmethod* nm = args->alternative_target();
348 if (nm == NULL) { 348 if (nm == NULL) {
349 #endif 349 #endif
350 // Verify the arguments 350 // Verify the arguments
351 351
352 if (CheckJNICalls) { 352 if (CheckJNICalls) {
353 args->verify(method, result->get_type(), thread); 353 args->verify(method, result->get_type(), thread);
354 } 354 }
355 else debug_only(args->verify(method, result->get_type(), thread)); 355 else debug_only(args->verify(method, result->get_type(), thread));
356 #ifdef GRAAL 356 #ifdef JVMCI
357 } 357 }
358 #else 358 #else
359 359
360 // Ignore call if method is empty 360 // Ignore call if method is empty
361 if (method->is_empty_method()) { 361 if (method->is_empty_method()) {
416 } else { 416 } else {
417 // Touch pages checked if the OS needs them to be touched to be mapped. 417 // Touch pages checked if the OS needs them to be touched to be mapped.
418 os::bang_stack_shadow_pages(); 418 os::bang_stack_shadow_pages();
419 } 419 }
420 420
421 #ifdef GRAAL 421 #ifdef JVMCI
422 if (nm != NULL) { 422 if (nm != NULL) {
423 if (nm->is_alive()) { 423 if (nm->is_alive()) {
424 ((JavaThread*) THREAD)->set_graal_alternate_call_target(nm->verified_entry_point()); 424 ((JavaThread*) THREAD)->set_jvmci_alternate_call_target(nm->verified_entry_point());
425 entry_point = method->adapter()->get_i2c_entry(); 425 entry_point = method->adapter()->get_i2c_entry();
426 } else { 426 } else {
427 THROW(vmSymbols::com_oracle_jvmci_code_InvalidInstalledCodeException()); 427 THROW(vmSymbols::com_oracle_jvmci_code_InvalidInstalledCodeException());
428 } 428 }
429 } 429 }