changeset in /hg/icedtea6: 2008-09-30 Gary Benson <gbenson at red...
Gary Benson
gbenson at redhat.com
Tue Sep 30 05:42:16 PDT 2008
changeset 28523a4d7bd6 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=28523a4d7bd6
description:
2008-09-30 Gary Benson <gbenson at redhat.com>
* patches/icedtea-shark.patch: Updated to latest Shark.
* ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
* ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: Likewise.
* ports/hotspot/src/share/vm/includeDB_shark: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkConstantPool.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkEntry.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkMonitor.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkMonitor.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkState.inline.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkType.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
* ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp: New file.
* ports/hotspot/src/share/vm/shark/sharkBytecodeTracer.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkBytecodeTracer.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
* ports/hotspot/src/share/vm/shark/sharkValue.inline.hpp: Likewise.
diffstat:
47 files changed, 4107 insertions(+), 1340 deletions(-)
ChangeLog | 49
patches/icedtea-shark.patch | 115
ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp | 4
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp | 184 +
ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp | 6
ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp | 49
ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp | 7
ports/hotspot/src/cpu/zero/vm/frame_zero.cpp | 26
ports/hotspot/src/cpu/zero/vm/frame_zero.hpp | 21
ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp | 11
ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp | 9
ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp | 12
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp | 54
ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp | 4
ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp | 4
ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp | 2
ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp | 126 -
ports/hotspot/src/cpu/zero/vm/stack_zero.hpp | 43
ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp | 9
ports/hotspot/src/share/vm/includeDB_shark | 57
ports/hotspot/src/share/vm/shark/sharkBlock.cpp | 1438 +++++++-----
ports/hotspot/src/share/vm/shark/sharkBlock.hpp | 319 +-
ports/hotspot/src/share/vm/shark/sharkBuilder.cpp | 2
ports/hotspot/src/share/vm/shark/sharkBuilder.hpp | 2
ports/hotspot/src/share/vm/shark/sharkBytecodeTracer.cpp | 114
ports/hotspot/src/share/vm/shark/sharkBytecodeTracer.hpp | 49
ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp | 225 +
ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp | 353 ++
ports/hotspot/src/share/vm/shark/sharkCompiler.cpp | 51
ports/hotspot/src/share/vm/shark/sharkCompiler.hpp | 8
ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp | 23
ports/hotspot/src/share/vm/shark/sharkConstantPool.hpp | 1
ports/hotspot/src/share/vm/shark/sharkEntry.cpp | 15
ports/hotspot/src/share/vm/shark/sharkFunction.cpp | 138 -
ports/hotspot/src/share/vm/shark/sharkFunction.hpp | 122 -
ports/hotspot/src/share/vm/shark/sharkMonitor.cpp | 40
ports/hotspot/src/share/vm/shark/sharkMonitor.hpp | 6
ports/hotspot/src/share/vm/shark/sharkRuntime.cpp | 437 +++
ports/hotspot/src/share/vm/shark/sharkRuntime.hpp | 89
ports/hotspot/src/share/vm/shark/sharkState.cpp | 437 ++-
ports/hotspot/src/share/vm/shark/sharkState.hpp | 127 -
ports/hotspot/src/share/vm/shark/sharkState.inline.hpp | 49
ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp | 101
ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp | 76
ports/hotspot/src/share/vm/shark/sharkType.cpp | 4
ports/hotspot/src/share/vm/shark/sharkValue.hpp | 395 ++-
ports/hotspot/src/share/vm/shark/sharkValue.inline.hpp | 34
diffs (truncated from 7231 to 500 lines):
diff -r 9ff3417e28cc -r 28523a4d7bd6 ChangeLog
--- a/ChangeLog Mon Sep 29 12:04:41 2008 -0400
+++ b/ChangeLog Tue Sep 30 08:42:10 2008 -0400
@@ -1,3 +1,52 @@ 2008-09-26 Mark Wielaard <mark at klomp.o
+2008-09-30 Gary Benson <gbenson at redhat.com>
+
+ * patches/icedtea-shark.patch: Updated to latest Shark.
+ * ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreterFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/interpreter_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/nativeInst_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/sharedRuntime_zero.cpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/sharkFrame_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stackPrinter_zero.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/stack_zero.hpp: Likewise.
+ * ports/hotspot/src/os_cpu/linux_zero/vm/os_linux_zero.cpp: Likewise.
+ * ports/hotspot/src/share/vm/includeDB_shark: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBlock.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBuilder.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCompiler.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkConstantPool.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkConstantPool.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkEntry.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkFunction.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMonitor.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkMonitor.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkRuntime.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkState.inline.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkType.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.hpp: Likewise.
+ * ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp: New file.
+ * ports/hotspot/src/share/vm/shark/sharkBytecodeTracer.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkBytecodeTracer.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkCacheDecache.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.cpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkStateScanner.hpp: Likewise.
+ * ports/hotspot/src/share/vm/shark/sharkValue.inline.hpp: Likewise.
+
2008-09-26 Mark Wielaard <mark at klomp.org>
* patches/icedtea-6712835-ifnode.patch: New patch.
diff -r 9ff3417e28cc -r 28523a4d7bd6 patches/icedtea-shark.patch
--- a/patches/icedtea-shark.patch Mon Sep 29 12:04:41 2008 -0400
+++ b/patches/icedtea-shark.patch Tue Sep 30 08:42:10 2008 -0400
@@ -303,3 +303,118 @@ diff -r ef3bb05d21d5 openjdk/hotspot/src
}
+diff -r 70711eb56d8e openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp
+--- openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp Mon Sep 29 08:47:58 2008 +0100
++++ openjdk/hotspot/src/share/vm/ci/ciTypeFlow.hpp Mon Sep 29 08:51:58 2008 +0100
+@@ -94,9 +94,17 @@ public:
+ private:
+ GrowableArray<JsrRecord*>* _set;
+
++#ifdef SHARK
++ // XXX This can be removed if it turns out we have to deal
++ // with T_ADDRESS values the same as everything else.
++ public:
++#endif // SHARK
+ JsrRecord* record_at(int i) {
+ return _set->at(i);
+ }
++#ifdef SHARK
++ private:
++#endif // SHARK
+
+ // Insert the given JsrRecord into the JsrSet, maintaining the order
+ // of the set and replacing any element with the same entry address.
+@@ -515,6 +523,13 @@ public:
+ ciType* local_type_at(int i) const { return _state->local_type_at(i); }
+ ciType* stack_type_at(int i) const { return _state->stack_type_at(i); }
+
++ // access to the JSRs
++#ifdef SHARK
++ // XXX This can be removed if it turns out we have to deal
++ // with T_ADDRESS values the same as everything else.
++ JsrSet* jsrset() const { return _jsrs; }
++#endif // SHARK
++
+ // Get the successors for this Block.
+ GrowableArray<Block*>* successors(ciBytecodeStream* str,
+ StateVector* state,
+diff -r 70711eb56d8e openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp
+--- openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp Mon Sep 29 08:47:58 2008 +0100
++++ openjdk/hotspot/src/share/vm/runtime/deoptimization.cpp Mon Sep 29 08:54:36 2008 +0100
+@@ -217,6 +217,7 @@ Deoptimization::UnrollBlock* Deoptimizat
+
+ }
+
++#ifndef SHARK
+ // Compute the caller frame based on the sender sp of stub_frame and stored frame sizes info.
+ CodeBlob* cb = stub_frame.cb();
+ // Verify we have the right vframeArray
+@@ -227,6 +228,10 @@ Deoptimization::UnrollBlock* Deoptimizat
+ assert(cb->is_deoptimization_stub() || cb->is_uncommon_trap_stub(), "just checking");
+ Events::log("fetch unroll sp " INTPTR_FORMAT, unpack_sp);
+ #endif
++#else
++ intptr_t* unpack_sp = stub_frame.sender(&dummy_map).unextended_sp();
++#endif // !SHARK
++
+ // This is a guarantee instead of an assert because if vframe doesn't match
+ // we will unpack the wrong deoptimized frame and wind up in strange places
+ // where it will be very difficult to figure out what went wrong. Better
+@@ -337,7 +342,9 @@ Deoptimization::UnrollBlock* Deoptimizat
+
+ frame_pcs[0] = deopt_sender.raw_pc();
+
++#ifndef SHARK
+ assert(CodeCache::find_blob_unsafe(frame_pcs[0]) != NULL, "bad pc");
++#endif // SHARK
+
+ UnrollBlock* info = new UnrollBlock(array->frame_size() * BytesPerWord,
+ caller_adjustment * BytesPerWord,
+@@ -832,7 +839,20 @@ vframeArray* Deoptimization::create_vfra
+ // stuff a C2I adapter we can properly fill in the callee-save
+ // register locations.
+ frame caller = fr.sender(reg_map);
++#ifdef ZERO
++ int frame_size;
++ {
++ // In zero, frame::sp() is the *end* of the frame, so
++ // caller.sp() - fr.sp() is the size of the *caller*.
++ RegisterMap dummy_map(thread, false);
++ frame frame_1 = thread->last_frame();
++ frame frame_2 = frame_1.sender(&dummy_map);
++ assert(frame_2.sp() == fr.sp(), "should be");
++ frame_size = frame_2.sp() - frame_1.sp();
++ }
++#else
+ int frame_size = caller.sp() - fr.sp();
++#endif // ZERO
+
+ frame sender = caller;
+
+diff -r 70711eb56d8e openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp
+--- openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp Mon Sep 29 08:47:58 2008 +0100
++++ openjdk/hotspot/src/share/vm/runtime/vframeArray.cpp Mon Sep 29 08:56:26 2008 +0100
+@@ -64,6 +64,11 @@ void vframeArrayElement::fill_in(compile
+ assert(monitor->owner() == NULL || (!monitor->owner()->is_unlocked() && !monitor->owner()->has_bias_pattern()), "object must be null or locked, and unbiased");
+ BasicObjectLock* dest = _monitors->at(index);
+ dest->set_obj(monitor->owner());
++#ifdef SHARK
++ // XXX This can be removed when Shark knows
++ // which monitors are in use.
++ if (monitor->owner())
++#endif // SHARK
+ monitor->lock()->move_to(monitor->owner(), dest->lock());
+ }
+ }
+@@ -262,6 +267,11 @@ void vframeArrayElement::unpack_on_stack
+ top = iframe()->previous_monitor_in_interpreter_frame(top);
+ BasicObjectLock* src = _monitors->at(index);
+ top->set_obj(src->obj());
++#ifdef SHARK
++ // XXX This can be removed when Shark knows
++ // which monitors are in use.
++ if (src->obj())
++#endif // SHARK
+ src->lock()->move_to(src->obj(), top->lock());
+ }
+ if (ProfileInterpreter) {
diff -r 9ff3417e28cc -r 28523a4d7bd6 ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp Mon Sep 29 12:04:41 2008 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/bytecodeInterpreter_zero.hpp Tue Sep 30 08:42:10 2008 -0400
@@ -42,6 +42,10 @@
inline void set_method(methodOop new_method)
{
_method = new_method;
+ }
+ inline interpreterState self_link()
+ {
+ return _self_link;
}
inline void set_self_link(interpreterState new_self_link)
{
diff -r 9ff3417e28cc -r 28523a4d7bd6 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Mon Sep 29 12:04:41 2008 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp Tue Sep 30 08:42:10 2008 -0400
@@ -56,7 +56,24 @@ void CppInterpreter::normal_entry(method
// Allocate and initialize our frame.
InterpreterFrame *frame = InterpreterFrame::build(stack, method, thread);
thread->push_zero_frame(frame);
+
+ // Execute those bytecodes!
+ main_loop(0, THREAD);
+}
+
+void CppInterpreter::main_loop(int recurse, TRAPS)
+{
+ JavaThread *thread = (JavaThread *) THREAD;
+ ZeroStack *stack = thread->zero_stack();
+
+ // If we are entering from a deopt we may need to call
+ // ourself a few times in order to get to our frame.
+ if (recurse)
+ main_loop(recurse - 1, THREAD);
+
+ InterpreterFrame *frame = thread->top_zero_frame()->as_interpreter_frame();
interpreterState istate = frame->interpreter_state();
+ methodOop method = istate->method();
intptr_t *result = NULL;
int result_slots = 0;
@@ -79,13 +96,13 @@ void CppInterpreter::normal_entry(method
// Examine the message from the interpreter to decide what to do
if (istate->msg() == BytecodeInterpreter::call_method) {
- method = istate->callee();
+ methodOop callee = istate->callee();
// Trim back the stack to put the parameters at the top
stack->set_sp(istate->stack() + 1);
// Make the call
- Interpreter::invoke_method(method, istate->callee_entry_point(), THREAD);
+ Interpreter::invoke_method(callee, istate->callee_entry_point(), THREAD);
fixup_after_potential_safepoint();
// Convert the result
@@ -95,7 +112,6 @@ void CppInterpreter::normal_entry(method
stack->set_sp(istate->stack_limit() + 1);
// Resume the interpreter
- method = istate->method();
istate->set_msg(BytecodeInterpreter::method_resume);
}
else if (istate->msg() == BytecodeInterpreter::more_monitors) {
@@ -689,6 +705,139 @@ InterpreterGenerator::InterpreterGenerat
generate_all();
}
+// Deoptimization helpers
+
+InterpreterFrame *InterpreterFrame::build(ZeroStack* stack, int size)
+{
+ int size_in_words = size >> LogBytesPerWord;
+ assert(size_in_words * wordSize == size, "unaligned");
+ assert(size_in_words >= header_words, "too small");
+
+ if (size_in_words > stack->available_words()) {
+ Unimplemented();
+ }
+
+ stack->push(0); // next_frame, filled in later
+ intptr_t *fp = stack->sp();
+ assert(fp - stack->sp() == next_frame_off, "should be");
+
+ stack->push(INTERPRETER_FRAME);
+ assert(fp - stack->sp() == frame_type_off, "should be");
+
+ interpreterState istate =
+ (interpreterState) stack->alloc(sizeof(BytecodeInterpreter));
+ assert(fp - stack->sp() == istate_off, "should be");
+ istate->set_self_link(NULL); // mark invalid
+
+ stack->alloc((size_in_words - header_words) * wordSize);
+
+ return (InterpreterFrame *) fp;
+}
+
+int AbstractInterpreter::layout_activation(methodOop method,
+ int tempcount,
+ int popframe_extra_args,
+ int moncount,
+ int callee_param_count,
+ int callee_locals,
+ frame* caller,
+ frame* interpreter_frame,
+ bool is_top_frame)
+{
+ assert(popframe_extra_args == 0, "what to do?");
+ assert(!is_top_frame || (!callee_locals && !callee_param_count),
+ "top frame should have no caller")
+
+ // This code must exactly match what InterpreterFrame::build
+ // does (the full InterpreterFrame::build, that is, not the
+ // one that creates empty frames for the deoptimizer).
+ //
+ // If interpreter_frame is not NULL then it will be filled in.
+ // It's size is determined by a previous call to this method,
+ // so it should be correct.
+ //
+ // Note that tempcount is the current size of the expression
+ // stack. For top most frames we will allocate a full sized
+ // expression stack and not the trimmed version that non-top
+ // frames have.
+
+ int header_words = InterpreterFrame::header_words;
+ int monitor_words = moncount * frame::interpreter_frame_monitor_size();
+ int stack_words = is_top_frame ? method->max_stack() : tempcount;
+ int callee_extra_locals = callee_locals - callee_param_count;
+
+ if (interpreter_frame) {
+ intptr_t *locals = interpreter_frame->sp() + method->max_locals();
+ interpreterState istate = interpreter_frame->get_interpreterState();
+ intptr_t *monitor_base = (intptr_t*) istate;
+ intptr_t *stack_base = monitor_base - monitor_words;
+ intptr_t *stack = stack_base - tempcount - 1;
+
+ BytecodeInterpreter::layout_interpreterState(istate,
+ caller,
+ NULL,
+ method,
+ locals,
+ stack,
+ stack_base,
+ monitor_base,
+ NULL,
+ is_top_frame);
+ }
+ return header_words + monitor_words + stack_words + callee_extra_locals;
+}
+
+void BytecodeInterpreter::layout_interpreterState(interpreterState istate,
+ frame* caller,
+ frame* current,
+ methodOop method,
+ intptr_t* locals,
+ intptr_t* stack,
+ intptr_t* stack_base,
+ intptr_t* monitor_base,
+ intptr_t* frame_bottom,
+ bool is_top_frame)
+{
+ istate->set_locals(locals);
+ istate->set_method(method);
+ istate->set_self_link(istate);
+ istate->set_prev_link(NULL);
+ // thread will be set by a hacky repurposing of frame::patch_pc()
+ // bcp will be set by vframeArrayElement::unpack_on_stack()
+ istate->set_constants(method->constants()->cache());
+ istate->set_msg(BytecodeInterpreter::method_resume);
+ istate->set_bcp_advance(0);
+ istate->set_oop_temp(NULL);
+ istate->set_mdx(NULL);
+ if (caller->is_interpreted_frame()) {
+ interpreterState prev = caller->get_interpreterState();
+ prev->set_callee(method);
+ if (*prev->bcp() == Bytecodes::_invokeinterface)
+ prev->set_bcp_advance(5);
+ else
+ prev->set_bcp_advance(3);
+ }
+ istate->set_callee(NULL);
+ istate->set_monitor_base((BasicObjectLock *) monitor_base);
+ istate->set_stack_base(stack_base);
+ istate->set_stack(stack);
+ istate->set_stack_limit(stack_base - method->max_stack() - 1);
+}
+
+address CppInterpreter::return_entry(TosState state, int length)
+{
+ Unimplemented();
+}
+
+address CppInterpreter::deopt_entry(TosState state, int length)
+{
+#ifdef SHARK
+ return NULL;
+#else
+ Unimplemented();
+#endif // SHARK
+}
+
// Helper for (runtime) stack overflow checks
int AbstractInterpreter::size_top_interpreter_activation(methodOop method)
@@ -696,34 +845,15 @@ int AbstractInterpreter::size_top_interp
return 0;
}
-// Deoptimization helpers for C++ interpreter
-
-int AbstractInterpreter::layout_activation(methodOop method,
- int tempcount,
- int popframe_extra_args,
- int moncount,
- int callee_param_count,
- int callee_locals,
- frame* caller,
- frame* interpreter_frame,
- bool is_top_frame)
-{
- Unimplemented();
-}
-
-address CppInterpreter::return_entry(TosState state, int length)
-{
- Unimplemented();
-}
-
-address CppInterpreter::deopt_entry(TosState state, int length)
-{
- Unimplemented();
-}
+// Helper for figuring out if frames are interpreter frames
bool CppInterpreter::contains(address pc)
{
+#ifdef PRODUCT
ShouldNotCallThis();
+#else
+ return false; // make frame::print_value_on work
+#endif // !PRODUCT
}
// Result handlers and convertors
diff -r 9ff3417e28cc -r 28523a4d7bd6 ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp
--- a/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp Mon Sep 29 12:04:41 2008 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/cppInterpreter_zero.hpp Tue Sep 30 08:42:10 2008 -0400
@@ -28,9 +28,13 @@
// Size of interpreter code
const static int InterpreterCodeSize = 6 * K;
- private:
+ public:
// Method entries
static void normal_entry(methodOop method, intptr_t UNUSED, TRAPS);
static void native_entry(methodOop method, intptr_t UNUSED, TRAPS);
static void accessor_entry(methodOop method, intptr_t UNUSED, TRAPS);
static void empty_entry(methodOop method, intptr_t UNUSED, TRAPS);
+
+ public:
+ // Main loop of normal_entry
+ static void main_loop(int recurse, TRAPS);
diff -r 9ff3417e28cc -r 28523a4d7bd6 ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/ports/hotspot/src/cpu/zero/vm/deoptimizerFrame_zero.hpp Tue Sep 30 08:42:10 2008 -0400
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2003-2007 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2008 Red Hat, Inc.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ *
+ */
+
+// | ... |
+// +--------------------+ ------------------
+// | frame_type | low addresses
+// | next_frame | high addresses
+// +--------------------+ ------------------
+// | ... |
+
+class DeoptimizerFrame : public ZeroFrame {
+ friend class ZeroStackPrinter;
+
+ private:
+ DeoptimizerFrame() : ZeroFrame()
+ {
+ ShouldNotCallThis();
+ }
+
+ protected:
+ enum Layout {
+ header_words = jf_header_words
+ };
+
+ public:
+ static DeoptimizerFrame *build(ZeroStack* stack);
+};
diff -r 9ff3417e28cc -r 28523a4d7bd6 ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp
--- a/ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp Mon Sep 29 12:04:41 2008 -0400
+++ b/ports/hotspot/src/cpu/zero/vm/disassembler_zero.cpp Tue Sep 30 08:42:10 2008 -0400
@@ -36,12 +36,7 @@ void Disassembler::decode(nmethod *nm, o
{
More information about the distro-pkg-dev
mailing list