This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[RFA] JVMTI Breakpoints
- From: Keith Seitz <keiths at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: Wed, 24 Jan 2007 12:23:20 -0800
- Subject: [RFA] JVMTI Breakpoints
Hi,
The following patch implements the breakpoint instruction in the
interpreter, including the JVMTI notification of the event.
Keith
ChangeLog
2007-01-24 Keith Seitz <keiths@redhat.com>
* interpret.cc: Include gnu/gcj/jvmti/Breakpoint.h,
gnu/gcj/jvmti/BreakpointManager.h, jvmti.h, and jvmti-int.h
* interpret-run.cc: Implement insn_breakpoint.
Index: interpret.cc
===================================================================
--- interpret.cc (revision 121081)
+++ interpret.cc (working copy)
@@ -1,6 +1,6 @@
// interpret.cc - Code for the interpreter
-/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
This file is part of libgcj.
@@ -37,7 +37,12 @@
#include <execution.h>
#include <java/lang/reflect/Modifier.h>
+#include <jvmti.h>
+#include "jvmti-int.h"
+
#include <gnu/classpath/jdwp/Jdwp.h>
+#include <gnu/gcj/jvmti/Breakpoint.h>
+#include <gnu/gcj/jvmti/BreakpointManager.h>
#ifdef INTERPRETER
Index: interpret-run.cc
===================================================================
--- interpret-run.cc (revision 121081)
+++ interpret-run.cc (working copy)
@@ -1,6 +1,6 @@
// interpret-run.cc - Code to interpret bytecode
-/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation
+/* Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation
This file is part of libgcj.
@@ -2466,7 +2466,32 @@
insn_breakpoint:
{
- // nothing just yet
+ JvAssert (JVMTI_REQUESTED_EVENT (Breakpoint));
+
+ // Send JVMTI notification
+ using namespace ::java::lang;
+ jmethodID method = meth->self;
+ jlocation location = meth->insn_index (pc - 1);
+ Thread *thread = Thread::currentThread ();
+ JNIEnv *jni_env = _Jv_GetCurrentJNIEnv ();
+
+ _Jv_JVMTI_PostEvent (JVMTI_EVENT_BREAKPOINT, thread, jni_env,
+ method, location);
+
+ // Continue execution
+ using namespace gnu::gcj::jvmti;
+ Breakpoint *bp
+ = BreakpointManager::getBreakpoint (reinterpret_cast<jlong> (method),
+ location);
+ JvAssert (bp != NULL);
+
+ pc_t opc = reinterpret_cast<pc_t> (bp->getInsn ());
+
+#ifdef DIRECT_THREADED
+ goto *(opc->insn);
+#else
+ goto *(insn_target[*opc]);
+#endif
}
}
catch (java::lang::Throwable *ex)