Commit 8e489854 by Keith Seitz Committed by Keith Seitz

interpret-run.cc (NEXT_INSN): Advance PC before executing the instruction.

        * interpret-run.cc (NEXT_INSN)[DEBUG]: Advance PC before
        executing the instruction.
        * include/java-interp.h (_Jv_InterpFrame::get_pc): Subtract
        one insn from the frame's PC. _Jv_InterpMethod::run et al
        will advance the PC before executing the instruction.

From-SVN: r124313
parent 147199b4
2007-04-30 Keith Seitz <keiths@redhat.com>
* interpret-run.cc (NEXT_INSN)[DEBUG]: Advance PC before
executing the instruction.
* include/java-interp.h (_Jv_InterpFrame::get_pc): Subtract
one insn from the frame's PC. _Jv_InterpMethod::run et al
will advance the PC before executing the instruction.
2007-04-27 Keith Seitz <keiths@redhat.com> 2007-04-27 Keith Seitz <keiths@redhat.com>
* classpath/lib/gnu/classpath/jdwp/Jdwp.class: Regenerated. * classpath/lib/gnu/classpath/jdwp/Jdwp.class: Regenerated.
......
...@@ -465,7 +465,7 @@ public: ...@@ -465,7 +465,7 @@ public:
else else
pc = *pc_ptr; pc = *pc_ptr;
return pc; return pc - 1;
} }
}; };
......
...@@ -348,15 +348,16 @@ details. */ ...@@ -348,15 +348,16 @@ details. */
#define NEXT_INSN \ #define NEXT_INSN \
do \ do \
{ \ { \
pc_t insn = pc++; \
if (JVMTI_REQUESTED_EVENT (SingleStep)) \ if (JVMTI_REQUESTED_EVENT (SingleStep)) \
{ \ { \
JNIEnv *env = _Jv_GetCurrentJNIEnv (); \ JNIEnv *env = _Jv_GetCurrentJNIEnv (); \
jmethodID method = meth->self; \ jmethodID method = meth->self; \
jlocation loc = meth->insn_index (pc); \ jlocation loc = meth->insn_index (insn); \
_Jv_JVMTI_PostEvent (JVMTI_EVENT_SINGLE_STEP, thread, \ _Jv_JVMTI_PostEvent (JVMTI_EVENT_SINGLE_STEP, thread, \
env, method, loc); \ env, method, loc); \
} \ } \
goto *((pc++)->insn); \ goto *(insn->insn); \
} \ } \
while (0) while (0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment