truffle: src/cpu/x86/vm/templateInterpreter_x86

comparison src/cpu/x86/vm/templateInterpreter_x86_32.cpp @ 6725:da91efe96a93

6964458: Reimplement class meta-data storage to use native memory Summary: Remove PermGen, allocate meta-data in metaspace linked to class loaders, rewrite GC walking, rewrite and rename metadata to be C++ classes Reviewed-by: jmasa, stefank, never, coleenp, kvn, brutisso, mgerdin, dholmes, jrose, twisti, roland Contributed-by: jmasa <jon.masamitsu@oracle.com>, stefank <stefan.karlsson@oracle.com>, mgerdin <mikael.gerdin@oracle.com>, never <tom.rodriguez@oracle.com>

author	coleenp
date	Sat, 01 Sep 2012 13:25:18 -0400
parents	1d7922586cf6
children	cd3d6a6b95d9

comparison

equal deleted inserted replaced

-:36d1d483d5d6
+:da91efe96a93
 #include "interpreter/interpreter.hpp"
 #include "interpreter/interpreterGenerator.hpp"
 #include "interpreter/interpreterRuntime.hpp"
 #include "interpreter/templateTable.hpp"
 #include "oops/arrayOop.hpp"
-#include "oops/methodDataOop.hpp"
+#include "oops/methodData.hpp"
-#include "oops/methodOop.hpp"
+#include "oops/method.hpp"
 #include "oops/oop.inline.hpp"
 #include "prims/jvmtiExport.hpp"
 #include "prims/jvmtiThreadState.hpp"
 #include "runtime/arguments.hpp"
 #include "runtime/deoptimization.hpp"
 __ jcc(Assembler::equal, L_giant_index);
 }
 __ get_cache_and_index_at_bcp(rbx, rcx, 1, sizeof(u2));
 __ bind(L_got_cache);
 __ movl(rbx, Address(rbx, rcx,
-Address::times_ptr, constantPoolCacheOopDesc::base_offset() +
+Address::times_ptr, ConstantPoolCache::base_offset() +
 ConstantPoolCacheEntry::flags_offset()));
 __ andptr(rbx, 0xFF);
 __ lea(rsp, Address(rsp, rbx, Interpreter::stackElementScale()));
 __ dispatch_next(state, step);
 //
 // rbx,: method
 // rcx: invocation counter
 //
 void InterpreterGenerator::generate_counter_incr(Label* overflow, Label* profile_method, Label* profile_method_continue) {
-const Address invocation_counter(rbx, in_bytes(methodOopDesc::invocation_counter_offset()) +
+const Address invocation_counter(rbx, in_bytes(Method::invocation_counter_offset()) +
 in_bytes(InvocationCounter::counter_offset()));
-// Note: In tiered we increment either counters in methodOop or in MDO depending if we're profiling or not.
+// Note: In tiered we increment either counters in Method* or in MDO depending if we're profiling or not.
 if (TieredCompilation) {
 int increment = InvocationCounter::count_increment;
 int mask = ((1 << Tier0InvokeNotifyFreqLog)  - 1) << InvocationCounter::count_shift;
 Label no_mdo, done;
 if (ProfileInterpreter) {
 // Are we profiling?
-__ movptr(rax, Address(rbx, methodOopDesc::method_data_offset()));
+__ movptr(rax, Address(rbx, Method::method_data_offset()));
 __ testptr(rax, rax);
 __ jccb(Assembler::zero, no_mdo);
 // Increment counter in the MDO
-const Address mdo_invocation_counter(rax, in_bytes(methodDataOopDesc::invocation_counter_offset()) +
+const Address mdo_invocation_counter(rax, in_bytes(MethodData::invocation_counter_offset()) +
 in_bytes(InvocationCounter::counter_offset()));
 __ increment_mask_and_jump(mdo_invocation_counter, increment, mask, rcx, false, Assembler::zero, overflow);
 __ jmpb(done);
 }
 __ bind(no_mdo);
-// Increment counter in methodOop (we don't need to load it, it's in rcx).
+// Increment counter in Method* (we don't need to load it, it's in rcx).
 __ increment_mask_and_jump(invocation_counter, increment, mask, rcx, true, Assembler::zero, overflow);
 __ bind(done);
 } else {
-const Address backedge_counter  (rbx, methodOopDesc::backedge_counter_offset() +
+const Address backedge_counter  (rbx, Method::backedge_counter_offset() +
 InvocationCounter::counter_offset());
-if (ProfileInterpreter) { // %%% Merge this into methodDataOop
+if (ProfileInterpreter) { // %%% Merge this into MethodData*
-__ incrementl(Address(rbx,methodOopDesc::interpreter_invocation_counter_offset()));
+__ incrementl(Address(rbx,Method::interpreter_invocation_counter_offset()));
 }
 // Update standard invocation counters
 __ movl(rax, backedge_counter);               // load backedge counter
 __ incrementl(rcx, InvocationCounter::count_increment);
 // rsp - sender_sp
 // C++ interpreter only
 // rsi - previous interpreter state pointer
-const Address size_of_parameters(rbx, methodOopDesc::size_of_parameters_offset());
+const Address size_of_parameters(rbx, Method::size_of_parameters_offset());
 // InterpreterRuntime::frequency_counter_overflow takes one argument
 // indicating if the counter overflow occurs at a backwards branch (non-NULL bcp).
 // The call returns the address of the verified entry point for the method or NULL
 // if the compilation did not complete (either went background or bailed out).
 __ movptr(rax, (intptr_t)false);
 __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), rax);
-__ movptr(rbx, Address(rbp, method_offset));   // restore methodOop
+__ movptr(rbx, Address(rbp, method_offset));   // restore Method*
 // Preserve invariant that rsi/rdi contain bcp/locals of sender frame
 // and jump to the interpreted entry.
 __ jmp(*do_continue, relocInfo::none);
 //
 // Registers live on entry:
 //
 // Asm interpreter
 // rdx: number of additional locals this frame needs (what we must check)
-// rbx,: methodOop
+// rbx,: Method*
 // destroyed on exit
 // rax,
 // NOTE:  since the additional locals are also always pushed (wasn't obvious in
 __ bind(after_frame_check);
 }
 // Allocate monitor and lock method (asm interpreter)
-// rbx, - methodOop
+// rbx, - Method*
 //
 void InterpreterGenerator::lock_method(void) {
 // synchronize method
-const Address access_flags      (rbx, methodOopDesc::access_flags_offset());
+const Address access_flags      (rbx, Method::access_flags_offset());
 const Address monitor_block_top (rbp, frame::interpreter_frame_monitor_block_top_offset * wordSize);
 const int entry_size            = frame::interpreter_frame_monitor_size() * wordSize;
 #ifdef ASSERT
 { Label L;
 const int mirror_offset = in_bytes(Klass::java_mirror_offset());
 __ movl(rax, access_flags);
 __ testl(rax, JVM_ACC_STATIC);
 __ movptr(rax, Address(rdi, Interpreter::local_offset_in_bytes(0)));  // get receiver (assume this is frequent case)
 __ jcc(Assembler::zero, done);
-__ movptr(rax, Address(rbx, methodOopDesc::const_offset()));
+__ movptr(rax, Address(rbx, Method::const_offset()));
-__ movptr(rax, Address(rax, constMethodOopDesc::constants_offset()));
+__ movptr(rax, Address(rax, ConstMethod::constants_offset()));
-__ movptr(rax, Address(rax, constantPoolOopDesc::pool_holder_offset_in_bytes()));
+__ movptr(rax, Address(rax, ConstantPool::pool_holder_offset_in_bytes()));
 __ movptr(rax, Address(rax, mirror_offset));
 __ bind(done);
 }
 // add space for monitor & lock
 __ subptr(rsp, entry_size);                                           // add space for a monitor entry
 __ enter();                                         // save old & set new rbp,
 __ push(rsi);                                       // set sender sp
 __ push((int32_t)NULL_WORD);                        // leave last_sp as null
-__ movptr(rsi, Address(rbx,methodOopDesc::const_offset())); // get constMethodOop
+__ movptr(rsi, Address(rbx,Method::const_offset())); // get ConstMethod*
-__ lea(rsi, Address(rsi,constMethodOopDesc::codes_offset())); // get codebase
+__ lea(rsi, Address(rsi,ConstMethod::codes_offset())); // get codebase
-__ push(rbx);                                      // save methodOop
+__ push(rbx);                                      // save Method*
 if (ProfileInterpreter) {
 Label method_data_continue;
-__ movptr(rdx, Address(rbx, in_bytes(methodOopDesc::method_data_offset())));
+__ movptr(rdx, Address(rbx, in_bytes(Method::method_data_offset())));
 __ testptr(rdx, rdx);
 __ jcc(Assembler::zero, method_data_continue);
-__ addptr(rdx, in_bytes(methodDataOopDesc::data_offset()));
+__ addptr(rdx, in_bytes(MethodData::data_offset()));
 __ bind(method_data_continue);
 __ push(rdx);                                       // set the mdp (method data pointer)
 } else {
 __ push(0);
 }
-__ movptr(rdx, Address(rbx, methodOopDesc::const_offset()));
+__ movptr(rdx, Address(rbx, Method::const_offset()));
-__ movptr(rdx, Address(rdx, constMethodOopDesc::constants_offset()));
+__ movptr(rdx, Address(rdx, ConstMethod::constants_offset()));
-__ movptr(rdx, Address(rdx, constantPoolOopDesc::cache_offset_in_bytes()));
+__ movptr(rdx, Address(rdx, ConstantPool::cache_offset_in_bytes()));
 __ push(rdx);                                       // set constant pool cache
 __ push(rdi);                                       // set locals pointer
 if (native_call) {
 __ push(0);                                       // no bcp
 } else {
 // Call an accessor method (assuming it is resolved, otherwise drop into vanilla (slow path) entry
 address InterpreterGenerator::generate_accessor_entry(void) {
-// rbx,: methodOop
+// rbx,: Method*
 // rcx: receiver (preserve for slow entry into asm interpreter)
 // rsi: senderSP must preserved for slow path, set SP to it on fast path
 address entry_point = __ pc();
 // check if local 0 != NULL and read field
 __ testptr(rax, rax);
 __ jcc(Assembler::zero, slow_path);
 // read first instruction word and extract bytecode @ 1 and index @ 2
-__ movptr(rdx, Address(rbx, methodOopDesc::const_offset()));
+__ movptr(rdx, Address(rbx, Method::const_offset()));
-__ movptr(rdi, Address(rdx, constMethodOopDesc::constants_offset()));
+__ movptr(rdi, Address(rdx, ConstMethod::constants_offset()));
-__ movl(rdx, Address(rdx, constMethodOopDesc::codes_offset()));
+__ movl(rdx, Address(rdx, ConstMethod::codes_offset()));
 // Shift codes right to get the index on the right.
 // The bytecode fetched looks like <index><0xb4><0x2a>
 __ shrl(rdx, 2*BitsPerByte);
 __ shll(rdx, exact_log2(in_words(ConstantPoolCacheEntry::size())));
-__ movptr(rdi, Address(rdi, constantPoolOopDesc::cache_offset_in_bytes()));
+__ movptr(rdi, Address(rdi, ConstantPool::cache_offset_in_bytes()));
 // rax,: local 0
 // rbx,: method
 // rcx: receiver - do not destroy since it is needed for slow path!
 // rcx: scratch
 // contains Bytecode::_getfield in b1 byte.
 assert(in_words(ConstantPoolCacheEntry::size()) == 4, "adjust shift below");
 __ movl(rcx,
 Address(rdi,
 rdx,
-Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::indices_offset()));
+Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::indices_offset()));
 __ shrl(rcx, 2*BitsPerByte);
 __ andl(rcx, 0xFF);
 __ cmpl(rcx, Bytecodes::_getfield);
 __ jcc(Assembler::notEqual, slow_path);
 // Note: constant pool entry is not valid before bytecode is resolved
 __ movptr(rcx,
 Address(rdi,
 rdx,
-Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::f2_offset()));
+Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::f2_offset()));
 __ movl(rdx,
 Address(rdi,
 rdx,
-Address::times_ptr, constantPoolCacheOopDesc::base_offset() + ConstantPoolCacheEntry::flags_offset()));
+Address::times_ptr, ConstantPoolCache::base_offset() + ConstantPoolCacheEntry::flags_offset()));
 Label notByte, notShort, notChar;
 const Address field_address (rax, rcx, Address::times_1);
 // Need to differentiate between igetfield, agetfield, bgetfield etc.
 //   and so we don't need to call the G1 pre-barrier. Thus we can use the
 //   regular method entry code to generate the NPE.
 //
 // This code is based on generate_accessor_enty.
-// rbx,: methodOop
+// rbx,: Method*
 // rcx: receiver (preserve for slow entry into asm interpreter)
 // rsi: senderSP must preserved for slow path, set SP to it on fast path
 address entry = __ pc();
 address InterpreterGenerator::generate_native_entry(bool synchronized) {
 // determine code generation flags
 bool inc_counter  = UseCompiler || CountCompiledCalls;
-// rbx,: methodOop
+// rbx,: Method*
 // rsi: sender sp
 // rsi: previous interpreter state (C++ interpreter) must preserve
 address entry_point = __ pc();
-const Address size_of_parameters(rbx, methodOopDesc::size_of_parameters_offset());
+const Address size_of_parameters(rbx, Method::size_of_parameters_offset());
-const Address invocation_counter(rbx, methodOopDesc::invocation_counter_offset() + InvocationCounter::counter_offset());
+const Address invocation_counter(rbx, Method::invocation_counter_offset() + InvocationCounter::counter_offset());
-const Address access_flags      (rbx, methodOopDesc::access_flags_offset());
+const Address access_flags      (rbx, Method::access_flags_offset());
 // get parameter size (always needed)
 __ load_unsigned_short(rcx, size_of_parameters);
 // native calls don't need the stack size check since they have no expression stack
 // and the arguments are already on the stack and we only add a handful of words
 // to the stack
-// rbx,: methodOop
+// rbx,: Method*
 // rcx: size of parameters
 // rsi: sender sp
 __ pop(rax);                                       // get return address
 // for natives the size of locals is zero
 const Register thread = rdi;
 const Register t      = rcx;
 // allocate space for parameters
 __ get_method(method);
-__ verify_oop(method);
+__ load_unsigned_short(t, Address(method, Method::size_of_parameters_offset()));
-__ load_unsigned_short(t, Address(method, methodOopDesc::size_of_parameters_offset()));
 __ shlptr(t, Interpreter::logStackElementSize);
 __ addptr(t, 2*wordSize);     // allocate two more slots for JNIEnv and possible mirror
 __ subptr(rsp, t);
 __ andptr(rsp, -(StackAlignmentInBytes)); // gcc needs 16 byte aligned stacks to do XMM intrinsics
 // get signature handler
 { Label L;
-__ movptr(t, Address(method, methodOopDesc::signature_handler_offset()));
+__ movptr(t, Address(method, Method::signature_handler_offset()));
 __ testptr(t, t);
 __ jcc(Assembler::notZero, L);
 __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::prepare_native_call), method);
 __ get_method(method);
-__ movptr(t, Address(method, methodOopDesc::signature_handler_offset()));
+__ movptr(t, Address(method, Method::signature_handler_offset()));
 __ bind(L);
 }
 // call signature handler
 assert(InterpreterRuntime::SignatureHandlerGenerator::from() == rdi, "adjust this code");
 __ movptr(Address(rbp, frame::interpreter_frame_result_handler_offset*wordSize), rax);
 // pass mirror handle if static call
 { Label L;
 const int mirror_offset = in_bytes(Klass::java_mirror_offset());
-__ movl(t, Address(method, methodOopDesc::access_flags_offset()));
+__ movl(t, Address(method, Method::access_flags_offset()));
 __ testl(t, JVM_ACC_STATIC);
 __ jcc(Assembler::zero, L);
 // get mirror
-__ movptr(t, Address(method, methodOopDesc:: const_offset()));
+__ movptr(t, Address(method, Method:: const_offset()));
-__ movptr(t, Address(t, constMethodOopDesc::constants_offset()));
+__ movptr(t, Address(t, ConstMethod::constants_offset()));
-__ movptr(t, Address(t, constantPoolOopDesc::pool_holder_offset_in_bytes()));
+__ movptr(t, Address(t, ConstantPool::pool_holder_offset_in_bytes()));
 __ movptr(t, Address(t, mirror_offset));
 // copy mirror into activation frame
 __ movptr(Address(rbp, frame::interpreter_frame_oop_temp_offset * wordSize), t);
 // pass handle to mirror
 __ lea(t, Address(rbp, frame::interpreter_frame_oop_temp_offset * wordSize));
 __ bind(L);
 }
 // get native function entry point
 { Label L;
-__ movptr(rax, Address(method, methodOopDesc::native_function_offset()));
+__ movptr(rax, Address(method, Method::native_function_offset()));
 ExternalAddress unsatisfied(SharedRuntime::native_method_throw_unsatisfied_link_error_entry());
 __ cmpptr(rax, unsatisfied.addr());
 __ jcc(Assembler::notEqual, L);
 __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::prepare_native_call), method);
 __ get_method(method);
-__ verify_oop(method);
+__ movptr(rax, Address(method, Method::native_function_offset()));
-__ movptr(rax, Address(method, methodOopDesc::native_function_offset()));
 __ bind(L);
 }
 // pass JNIEnv
 __ get_thread(thread);
 // restore rsi to have legal interpreter frame,
 // i.e., bci == 0 <=> rsi == code_base()
 // Can't call_VM until bcp is within reasonable.
 __ get_method(method);      // method is junk from thread_in_native to now.
-__ verify_oop(method);
+__ movptr(rsi, Address(method,Method::const_offset()));   // get ConstMethod*
-__ movptr(rsi, Address(method,methodOopDesc::const_offset()));   // get constMethodOop
+__ lea(rsi, Address(rsi,ConstMethod::codes_offset()));    // get codebase
-__ lea(rsi, Address(rsi,constMethodOopDesc::codes_offset()));    // get codebase
 // handle exceptions (exception handling will handle unlocking!)
 { Label L;
 __ cmpptr(Address(thread, Thread::pending_exception_offset()), (int32_t)NULL_WORD);
 __ jcc(Assembler::zero, L);
 __ bind(L);
 }
 // do unlocking if necessary
 { Label L;
-__ movl(t, Address(method, methodOopDesc::access_flags_offset()));
+__ movl(t, Address(method, Method::access_flags_offset()));
 __ testl(t, JVM_ACC_SYNCHRONIZED);
 __ jcc(Assembler::zero, L);
 // the code below should be shared with interpreter macro assembler implementation
 { Label unlock;
 // BasicObjectLock will be first in list, since this is a synchronized method. However, need
 //
 address InterpreterGenerator::generate_normal_entry(bool synchronized) {
 // determine code generation flags
 bool inc_counter  = UseCompiler || CountCompiledCalls;
-// rbx,: methodOop
+// rbx,: Method*
 // rsi: sender sp
 address entry_point = __ pc();
-const Address size_of_parameters(rbx, methodOopDesc::size_of_parameters_offset());
+const Address size_of_parameters(rbx, Method::size_of_parameters_offset());
-const Address size_of_locals    (rbx, methodOopDesc::size_of_locals_offset());
+const Address size_of_locals    (rbx, Method::size_of_locals_offset());
-const Address invocation_counter(rbx, methodOopDesc::invocation_counter_offset() + InvocationCounter::counter_offset());
+const Address invocation_counter(rbx, Method::invocation_counter_offset() + InvocationCounter::counter_offset());
-const Address access_flags      (rbx, methodOopDesc::access_flags_offset());
+const Address access_flags      (rbx, Method::access_flags_offset());
 // get parameter size (always needed)
 __ load_unsigned_short(rcx, size_of_parameters);
-// rbx,: methodOop
+// rbx,: Method*
 // rcx: size of parameters
 // rsi: sender_sp (could differ from sp+wordSize if we were called via c2i )
 __ load_unsigned_short(rdx, size_of_locals);       // get size of locals in words
 // When control flow reaches any of the entry types for the interpreter
 // the following holds ->
 //
 // Arguments:
 //
-// rbx,: methodOop
+// rbx,: Method*
 // rcx: receiver
 //
 //
 // Stack layout immediately at entry
 //
 //   ...
 // [ monitor entry      ]
 // [ expr. stack bottom ]
 // [ saved rsi          ]
 // [ current rdi        ]
-// [ methodOop          ]
+// [ Method*            ]
 // [ saved rbp,          ] <--- rbp,
 // [ return address     ]
 // [ local variable m   ]
 //   ...
 // [ local variable 1   ]
 return true;
 }
 }
 // How much stack a method activation needs in words.
-int AbstractInterpreter::size_top_interpreter_activation(methodOop method) {
+int AbstractInterpreter::size_top_interpreter_activation(Method* method) {
 const int stub_code = 4;  // see generate_call_stub
 // Save space for one monitor to get into the interpreted method in case
 // the method is synchronized
 int monitor_size    = method->is_synchronized() ?
 // total overhead size: entry_size + (saved rbp, thru expr stack bottom).
 // be sure to change this if you add/subtract anything to/from the overhead area
 const int overhead_size = -frame::interpreter_frame_initial_sp_offset;
-const int extra_stack = methodOopDesc::extra_stack_entries();
+const int extra_stack = Method::extra_stack_entries();
 const int method_stack = (method->max_locals() + method->max_stack() + extra_stack) *
 Interpreter::stackElementWords;
 return overhead_size + method_stack + stub_code;
 }
 // asm based interpreter deoptimization helpers
-int AbstractInterpreter::layout_activation(methodOop method,
+int AbstractInterpreter::layout_activation(Method* method,
 int tempcount,
 int popframe_extra_args,
 int moncount,
 int caller_actual_parameters,
 int callee_param_count,
 __ testl(rax, rax);
 __ jcc(Assembler::notZero, caller_not_deoptimized);
 // Compute size of arguments for saving when returning to deoptimized caller
 __ get_method(rax);
-__ verify_oop(rax);
+__ load_unsigned_short(rax, Address(rax, in_bytes(Method::size_of_parameters_offset())));
-__ load_unsigned_short(rax, Address(rax, in_bytes(methodOopDesc::size_of_parameters_offset())));
 __ shlptr(rax, Interpreter::logStackElementSize);
 __ restore_locals();
 __ subptr(rdi, rax);
 __ addptr(rdi, wordSize);
 // Save these arguments
 __ movptr(Address(thread, JavaThread::vm_result_offset()), rax);
 // remove the activation (without doing throws on illegalMonitorExceptions)
 __ remove_activation(vtos, rdx, false, true, false);
 // restore exception
 __ get_thread(thread);
-__ movptr(rax, Address(thread, JavaThread::vm_result_offset()));
+__ get_vm_result(rax, thread);
-__ movptr(Address(thread, JavaThread::vm_result_offset()), NULL_WORD);
-__ verify_oop(rax);
 // Inbetween activations - previous activation type unknown yet
 // compute continuation point - the continuation point expects
 // the following registers set up:
 //

Mercurial > hg > truffle

comparison src/cpu/x86/vm/templateInterpreter_x86_32.cpp @ 6725:da91efe96a93