jdk-sandbox: comparison hotspot/src/cpu/sparc/vm/templateInterpreter

equal deleted inserted replaced

-:2927072ed5fb
+:77b156916bab
 // Save space for one monitor to get into the interpreted method in case
 // the method is synchronized
 int monitor_size    = method->is_synchronized() ?
 1*frame::interpreter_frame_monitor_size() : 0;
 return size_activation_helper(method->max_locals(), method->max_stack(),
 monitor_size) + call_stub_size;
 }
-int AbstractInterpreter::layout_activation(Method* method,
+int AbstractInterpreter::size_activation(int max_stack,
-int tempcount,
+int temps,
-int popframe_extra_args,
+int extra_args,
-int moncount,
+int monitors,
-int caller_actual_parameters,
+int callee_params,
-int callee_param_count,
+int callee_locals,
-int callee_local_count,
+bool is_top_frame) {
-frame* caller,
-frame* interpreter_frame,
-bool is_top_frame,
-bool is_bottom_frame) {
 // Note: This calculation must exactly parallel the frame setup
 // in InterpreterGenerator::generate_fixed_frame.
-// If f!=NULL, set up the following variables:
-//   - Lmethod
+int monitor_size           = monitors * frame::interpreter_frame_monitor_size();
-//   - Llocals
-//   - Lmonitors (to the indicated number of monitors)
-//   - Lesp (to the indicated number of temps)
-// The frame f (if not NULL) on entry is a description of the caller of the frame
-// we are about to layout. We are guaranteed that we will be able to fill in a
-// new interpreter frame as its callee (i.e. the stack space is allocated and
-// the amount was determined by an earlier call to this method with f == NULL).
-// On return f (if not NULL) while describe the interpreter frame we just layed out.
-int monitor_size           = moncount * frame::interpreter_frame_monitor_size();
-int rounded_vm_local_words = round_to(frame::interpreter_frame_vm_local_words,WordsPerLong);
 assert(monitor_size == round_to(monitor_size, WordsPerLong), "must align");
 //
 // Note: if you look closely this appears to be doing something much different
 // than generate_fixed_frame. What is happening is this. On sparc we have to do
 // this dance with interpreter_sp_adjustment because the window save area would
 // appear just below the bottom (tos) of the caller's java expression stack. Because
 // this code aware of what the interactions are when that initial caller fram was an osr or
 // other adapter frame. deoptimization is complicated enough and  hard enough to debug that
 // there is no sense in messing working code.
 //
-int rounded_cls = round_to((callee_local_count - callee_param_count), WordsPerLong);
+int rounded_cls = round_to((callee_locals - callee_params), WordsPerLong);
 assert(rounded_cls == round_to(rounded_cls, WordsPerLong), "must align");
-int raw_frame_size = size_activation_helper(rounded_cls, method->max_stack(),
+int raw_frame_size = size_activation_helper(rounded_cls, max_stack, monitor_size);
-monitor_size);
+return raw_frame_size;
-if (interpreter_frame != NULL) {
+}
-// The skeleton frame must already look like an interpreter frame
-// even if not fully filled out.
+void AbstractInterpreter::layout_activation(Method* method,
-assert(interpreter_frame->is_interpreted_frame(), "Must be interpreted frame");
+int tempcount,
+int popframe_extra_args,
-intptr_t* fp = interpreter_frame->fp();
+int moncount,
+int caller_actual_parameters,
-JavaThread* thread = JavaThread::current();
+int callee_param_count,
-RegisterMap map(thread, false);
+int callee_local_count,
-// More verification that skeleton frame is properly walkable
+frame* caller,
-assert(fp == caller->sp(), "fp must match");
+frame* interpreter_frame,
+bool is_top_frame,
-intptr_t* montop     = fp - rounded_vm_local_words;
+bool is_bottom_frame) {
+// Set up the following variables:
-// preallocate monitors (cf. __ add_monitor_to_stack)
+//   - Lmethod
-intptr_t* monitors = montop - monitor_size;
+//   - Llocals
+//   - Lmonitors (to the indicated number of monitors)
-// preallocate stack space
+//   - Lesp (to the indicated number of temps)
-intptr_t*  esp = monitors - 1 -
+// The frame caller on entry is a description of the caller of the
-(tempcount * Interpreter::stackElementWords) -
+// frame we are about to layout. We are guaranteed that we will be
-popframe_extra_args;
+// able to fill in a new interpreter frame as its callee (i.e. the
+// stack space is allocated and the amount was determined by an
-int local_words = method->max_locals() * Interpreter::stackElementWords;
+// earlier call to the size_activation() method).  On return caller
-NEEDS_CLEANUP;
+// while describe the interpreter frame we just layed out.
-intptr_t* locals;
-if (caller->is_interpreted_frame()) {
+// The skeleton frame must already look like an interpreter frame
-// Can force the locals area to end up properly overlapping the top of the expression stack.
+// even if not fully filled out.
-intptr_t* Lesp_ptr = caller->interpreter_frame_tos_address() - 1;
+assert(interpreter_frame->is_interpreted_frame(), "Must be interpreted frame");
-// Note that this computation means we replace size_of_parameters() values from the caller
-// interpreter frame's expression stack with our argument locals
+int rounded_vm_local_words = round_to(frame::interpreter_frame_vm_local_words,WordsPerLong);
-int parm_words  = caller_actual_parameters * Interpreter::stackElementWords;
+int monitor_size           = moncount * frame::interpreter_frame_monitor_size();
-locals = Lesp_ptr + parm_words;
+assert(monitor_size == round_to(monitor_size, WordsPerLong), "must align");
-int delta = local_words - parm_words;
-int computed_sp_adjustment = (delta > 0) ? round_to(delta, WordsPerLong) : 0;
+intptr_t* fp = interpreter_frame->fp();
-*interpreter_frame->register_addr(I5_savedSP)    = (intptr_t) (fp + computed_sp_adjustment) - STACK_BIAS;
-if (!is_bottom_frame) {
+JavaThread* thread = JavaThread::current();
-// Llast_SP is set below for the current frame to SP (with the
+RegisterMap map(thread, false);
-// extra space for the callee's locals). Here we adjust
+// More verification that skeleton frame is properly walkable
-// Llast_SP for the caller's frame, removing the extra space
+assert(fp == caller->sp(), "fp must match");
-// for the current method's locals.
-*caller->register_addr(Llast_SP) = *interpreter_frame->register_addr(I5_savedSP);
+intptr_t* montop     = fp - rounded_vm_local_words;
-} else {
-assert(*caller->register_addr(Llast_SP) >= *interpreter_frame->register_addr(I5_savedSP), "strange Llast_SP");
+// preallocate monitors (cf. __ add_monitor_to_stack)
-}
+intptr_t* monitors = montop - monitor_size;
+// preallocate stack space
+intptr_t*  esp = monitors - 1 -
+(tempcount * Interpreter::stackElementWords) -
+popframe_extra_args;
+int local_words = method->max_locals() * Interpreter::stackElementWords;
+NEEDS_CLEANUP;
+intptr_t* locals;
+if (caller->is_interpreted_frame()) {
+// Can force the locals area to end up properly overlapping the top of the expression stack.
+intptr_t* Lesp_ptr = caller->interpreter_frame_tos_address() - 1;
+// Note that this computation means we replace size_of_parameters() values from the caller
+// interpreter frame's expression stack with our argument locals
+int parm_words  = caller_actual_parameters * Interpreter::stackElementWords;
+locals = Lesp_ptr + parm_words;
+int delta = local_words - parm_words;
+int computed_sp_adjustment = (delta > 0) ? round_to(delta, WordsPerLong) : 0;
+*interpreter_frame->register_addr(I5_savedSP)    = (intptr_t) (fp + computed_sp_adjustment) - STACK_BIAS;
+if (!is_bottom_frame) {
+// Llast_SP is set below for the current frame to SP (with the
+// extra space for the callee's locals). Here we adjust
+// Llast_SP for the caller's frame, removing the extra space
+// for the current method's locals.
+*caller->register_addr(Llast_SP) = *interpreter_frame->register_addr(I5_savedSP);
 } else {
-assert(caller->is_compiled_frame() || caller->is_entry_frame(), "only possible cases");
+assert(*caller->register_addr(Llast_SP) >= *interpreter_frame->register_addr(I5_savedSP), "strange Llast_SP");
-// Don't have Lesp available; lay out locals block in the caller
+}
-// adjacent to the register window save area.
+} else {
-//
+assert(caller->is_compiled_frame() || caller->is_entry_frame(), "only possible cases");
-// Compiled frames do not allocate a varargs area which is why this if
+// Don't have Lesp available; lay out locals block in the caller
-// statement is needed.
+// adjacent to the register window save area.
 //
-if (caller->is_compiled_frame()) {
+// Compiled frames do not allocate a varargs area which is why this if
-locals = fp + frame::register_save_words + local_words - 1;
+// statement is needed.
-} else {
+//
-locals = fp + frame::memory_parameter_word_sp_offset + local_words - 1;
+if (caller->is_compiled_frame()) {
-}
+locals = fp + frame::register_save_words + local_words - 1;
-if (!caller->is_entry_frame()) {
+} else {
-// Caller wants his own SP back
+locals = fp + frame::memory_parameter_word_sp_offset + local_words - 1;
-int caller_frame_size = caller->cb()->frame_size();
+}
-*interpreter_frame->register_addr(I5_savedSP) = (intptr_t)(caller->fp() - caller_frame_size) - STACK_BIAS;
+if (!caller->is_entry_frame()) {
+// Caller wants his own SP back
+int caller_frame_size = caller->cb()->frame_size();
+*interpreter_frame->register_addr(I5_savedSP) = (intptr_t)(caller->fp() - caller_frame_size) - STACK_BIAS;
+}
+}
+if (TraceDeoptimization) {
+if (caller->is_entry_frame()) {
+// make sure I5_savedSP and the entry frames notion of saved SP
+// agree.  This assertion duplicate a check in entry frame code
+// but catches the failure earlier.
+assert(*caller->register_addr(Lscratch) == *interpreter_frame->register_addr(I5_savedSP),
+"would change callers SP");
+}
+if (caller->is_entry_frame()) {
+tty->print("entry ");
+}
+if (caller->is_compiled_frame()) {
+tty->print("compiled ");
+if (caller->is_deoptimized_frame()) {
+tty->print("(deopt) ");
 }
 }
-if (TraceDeoptimization) {
+if (caller->is_interpreted_frame()) {
-if (caller->is_entry_frame()) {
+tty->print("interpreted ");
-// make sure I5_savedSP and the entry frames notion of saved SP
-// agree.  This assertion duplicate a check in entry frame code
-// but catches the failure earlier.
-assert(*caller->register_addr(Lscratch) == *interpreter_frame->register_addr(I5_savedSP),
-"would change callers SP");
-}
-if (caller->is_entry_frame()) {
-tty->print("entry ");
-}
-if (caller->is_compiled_frame()) {
-tty->print("compiled ");
-if (caller->is_deoptimized_frame()) {
-tty->print("(deopt) ");
-}
-}
-if (caller->is_interpreted_frame()) {
-tty->print("interpreted ");
-}
-tty->print_cr("caller fp=0x%x sp=0x%x", caller->fp(), caller->sp());
-tty->print_cr("save area = 0x%x, 0x%x", caller->sp(), caller->sp() + 16);
-tty->print_cr("save area = 0x%x, 0x%x", caller->fp(), caller->fp() + 16);
-tty->print_cr("interpreter fp=0x%x sp=0x%x", interpreter_frame->fp(), interpreter_frame->sp());
-tty->print_cr("save area = 0x%x, 0x%x", interpreter_frame->sp(), interpreter_frame->sp() + 16);
-tty->print_cr("save area = 0x%x, 0x%x", interpreter_frame->fp(), interpreter_frame->fp() + 16);
-tty->print_cr("Llocals = 0x%x", locals);
-tty->print_cr("Lesp = 0x%x", esp);
-tty->print_cr("Lmonitors = 0x%x", monitors);
 }
+tty->print_cr("caller fp=0x%x sp=0x%x", caller->fp(), caller->sp());
-if (method->max_locals() > 0) {
+tty->print_cr("save area = 0x%x, 0x%x", caller->sp(), caller->sp() + 16);
-assert(locals < caller->sp() || locals >= (caller->sp() + 16), "locals in save area");
+tty->print_cr("save area = 0x%x, 0x%x", caller->fp(), caller->fp() + 16);
-assert(locals < caller->fp() || locals > (caller->fp() + 16), "locals in save area");
+tty->print_cr("interpreter fp=0x%x sp=0x%x", interpreter_frame->fp(), interpreter_frame->sp());
-assert(locals < interpreter_frame->sp() || locals > (interpreter_frame->sp() + 16), "locals in save area");
+tty->print_cr("save area = 0x%x, 0x%x", interpreter_frame->sp(), interpreter_frame->sp() + 16);
-assert(locals < interpreter_frame->fp() || locals >= (interpreter_frame->fp() + 16), "locals in save area");
+tty->print_cr("save area = 0x%x, 0x%x", interpreter_frame->fp(), interpreter_frame->fp() + 16);
-}
+tty->print_cr("Llocals = 0x%x", locals);
+tty->print_cr("Lesp = 0x%x", esp);
+tty->print_cr("Lmonitors = 0x%x", monitors);
+}
+if (method->max_locals() > 0) {
+assert(locals < caller->sp() || locals >= (caller->sp() + 16), "locals in save area");
+assert(locals < caller->fp() || locals > (caller->fp() + 16), "locals in save area");
+assert(locals < interpreter_frame->sp() || locals > (interpreter_frame->sp() + 16), "locals in save area");
+assert(locals < interpreter_frame->fp() || locals >= (interpreter_frame->fp() + 16), "locals in save area");
+}
 #ifdef _LP64
 assert(*interpreter_frame->register_addr(I5_savedSP) & 1, "must be odd");
 #endif
 *interpreter_frame->register_addr(Lmethod)     = (intptr_t) method;
 *interpreter_frame->register_addr(Llocals)     = (intptr_t) locals;
 *interpreter_frame->register_addr(Lmonitors)   = (intptr_t) monitors;
 *interpreter_frame->register_addr(Lesp)        = (intptr_t) esp;
 // Llast_SP will be same as SP as there is no adapter space
 *interpreter_frame->register_addr(Llast_SP)    = (intptr_t) interpreter_frame->sp() - STACK_BIAS;
 *interpreter_frame->register_addr(LcpoolCache) = (intptr_t) method->constants()->cache();
 #ifdef FAST_DISPATCH
 *interpreter_frame->register_addr(IdispatchTables) = (intptr_t) Interpreter::dispatch_table();
 #endif
 #ifdef ASSERT
 BasicObjectLock* mp = (BasicObjectLock*)monitors;
 assert(interpreter_frame->interpreter_frame_method() == method, "method matches");
 assert(interpreter_frame->interpreter_frame_local_at(9) == (intptr_t *)((intptr_t)locals - (9 * Interpreter::stackElementSize)), "locals match");
 assert(interpreter_frame->interpreter_frame_monitor_end()   == mp, "monitor_end matches");
 assert(((intptr_t *)interpreter_frame->interpreter_frame_monitor_begin()) == ((intptr_t *)mp)+monitor_size, "monitor_begin matches");
 assert(interpreter_frame->interpreter_frame_tos_address()-1 == esp, "esp matches");
 // check bounds
 intptr_t* lo = interpreter_frame->sp() + (frame::memory_parameter_word_sp_offset - 1);
 intptr_t* hi = interpreter_frame->fp() - rounded_vm_local_words;
 assert(lo < monitors && montop <= hi, "monitors in bounds");
 assert(lo <= esp && esp < monitors, "esp in bounds");
 #endif // ASSERT
-}
-return raw_frame_size;
 }
 //----------------------------------------------------------------------------------------------------
 // Exceptions
 void TemplateInterpreterGenerator::generate_throw_exception() {

changeset 24018	77b156916bab
parent 23844	0c29a324ae14
child 24322	c2978d1578e3