Mercurial > hg > truffle
diff src/share/vm/graal/graalRuntime.cpp @ 19011:203c7256e123
Merge.
author | Chris Seaton <chris.seaton@oracle.com> |
---|---|
date | Thu, 29 Jan 2015 00:12:55 +0000 |
parents | 9c2396ef02db |
children | 7366593c0610 |
line wrap: on
line diff
--- a/src/share/vm/graal/graalRuntime.cpp Thu Jan 29 00:12:30 2015 +0000 +++ b/src/share/vm/graal/graalRuntime.cpp Thu Jan 29 00:12:55 2015 +0000 @@ -38,7 +38,6 @@ #include "runtime/reflection.hpp" #include "utilities/debug.hpp" -address GraalRuntime::_external_deopt_i2c_entry = NULL; jobject GraalRuntime::_HotSpotGraalRuntime_instance = NULL; bool GraalRuntime::_HotSpotGraalRuntime_initialized = false; bool GraalRuntime::_shutdown_called = false; @@ -60,13 +59,6 @@ graal_compute_offsets(); -#ifdef TARGET_ARCH_x86 -#ifdef _LP64 - // Only supported on x86_64 for now - _external_deopt_i2c_entry = create_external_deopt_i2c(); -#endif -#endif - // Ensure _non_oop_bits is initialized Universe::non_oop_word(); @@ -89,39 +81,6 @@ return buffer_blob; } -address GraalRuntime::create_external_deopt_i2c() { - ResourceMark rm; - BufferBlob* buffer = BufferBlob::create("externalDeopt", 1*K); - CodeBuffer cb(buffer); - short buffer_locs[20]; - cb.insts()->initialize_shared_locs((relocInfo*)buffer_locs, sizeof(buffer_locs)/sizeof(relocInfo)); - MacroAssembler masm(&cb); - - int total_args_passed = 6; - - BasicType* sig_bt = NEW_RESOURCE_ARRAY(BasicType, total_args_passed); - VMRegPair* regs = NEW_RESOURCE_ARRAY(VMRegPair, total_args_passed); - int i = 0; - sig_bt[i++] = T_INT; - sig_bt[i++] = T_LONG; - sig_bt[i++] = T_VOID; // long stakes 2 slots - sig_bt[i++] = T_INT; - sig_bt[i++] = T_OBJECT; - sig_bt[i++] = T_INT; // The number of actual arguments passed to the method. - - int comp_args_on_stack = SharedRuntime::java_calling_convention(sig_bt, regs, total_args_passed, false); - - SharedRuntime::gen_i2c_adapter(&masm, total_args_passed, comp_args_on_stack, sig_bt, regs, total_args_passed - 1); - masm.flush(); - - AdapterBlob* adapter = AdapterBlob::create(&cb); - if (PrintAdapterHandlers) { - tty->print_cr("Decoding external_deopt_i2c"); - Disassembler::decode(adapter->code_begin(), adapter->code_end()); - } - return adapter->code_begin(); -} - BasicType GraalRuntime::kindToBasicType(jchar ch) { switch(ch) { case 'z': return T_BOOLEAN;