* interpret.cc: Don't include ExceptionEvent.h.

        * gnu/gcj/jvmti/natExceptionEvent.cc: Remove.
        * Makefile.am (nat_source_files): Remove natExceptionEvent.cc.
        * Makefile.in: Regenerated.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@124407 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index ccaf00b..c0a2a82 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,12 @@
 2007-05-03  Keith Seitz  <keiths@redhat.com>
 
+       * interpret.cc: Don't include ExceptionEvent.h.
+       * gnu/gcj/jvmti/natExceptionEvent.cc: Remove.
+       * Makefile.am (nat_source_files): Remove natExceptionEvent.cc.
+       * Makefile.in: Regenerated.
+
+2007-05-03  Keith Seitz  <keiths@redhat.com>
+
        * include/jvmti-int.h (_Jv_ReportJVMTIExceptionThrow):
        Declare.
        * interpret.cc (_Jv_ReportJVMTIExceptionThrow): New function.

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 97b38ee..3af6492 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -851,7 +851,6 @@ gnu/gcj/convert/natOutput_SJIS.cc \
 gnu/gcj/io/natSimpleSHSStream.cc \
 gnu/gcj/io/shs.cc \
 gnu/gcj/jvmti/natBreakpoint.cc \
-gnu/gcj/jvmti/natExceptionEvent.cc \
 gnu/gcj/runtime/natFinalizerThread.cc \
 gnu/gcj/runtime/natSharedLibLoader.cc \
 gnu/gcj/runtime/natSystemClassLoader.cc \

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 48ae71b..4b1086c 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -302,7 +302,6 @@ am__libgcj_la_SOURCES_DIST = prims.cc jni.cc jvmti.cc exception.cc \
        gnu/gcj/convert/natOutput_SJIS.cc \
        gnu/gcj/io/natSimpleSHSStream.cc gnu/gcj/io/shs.cc \
        gnu/gcj/jvmti/natBreakpoint.cc \
-       gnu/gcj/jvmti/natExceptionEvent.cc \
        gnu/gcj/runtime/natFinalizerThread.cc \
        gnu/gcj/runtime/natSharedLibLoader.cc \
        gnu/gcj/runtime/natSystemClassLoader.cc \
@@ -365,7 +364,6 @@ am__objects_2 = gnu/classpath/jdwp/natVMFrame.lo \
        gnu/gcj/convert/natOutput_SJIS.lo \
        gnu/gcj/io/natSimpleSHSStream.lo gnu/gcj/io/shs.lo \
        gnu/gcj/jvmti/natBreakpoint.lo \
-       gnu/gcj/jvmti/natExceptionEvent.lo \
        gnu/gcj/runtime/natFinalizerThread.lo \
        gnu/gcj/runtime/natSharedLibLoader.lo \
        gnu/gcj/runtime/natSystemClassLoader.lo \
@@ -7985,7 +7983,6 @@ gnu/gcj/convert/natOutput_SJIS.cc \
 gnu/gcj/io/natSimpleSHSStream.cc \
 gnu/gcj/io/shs.cc \
 gnu/gcj/jvmti/natBreakpoint.cc \
-gnu/gcj/jvmti/natExceptionEvent.cc \
 gnu/gcj/runtime/natFinalizerThread.cc \
 gnu/gcj/runtime/natSharedLibLoader.cc \
 gnu/gcj/runtime/natSystemClassLoader.cc \
@@ -8381,8 +8378,6 @@ gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp):
        @: > gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/jvmti/natBreakpoint.lo: gnu/gcj/jvmti/$(am__dirstamp) \
        gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp)
-gnu/gcj/jvmti/natExceptionEvent.lo: gnu/gcj/jvmti/$(am__dirstamp) \
-       gnu/gcj/jvmti/$(DEPDIR)/$(am__dirstamp)
 gnu/gcj/runtime/$(am__dirstamp):
        @$(mkdir_p) gnu/gcj/runtime
        @: > gnu/gcj/runtime/$(am__dirstamp)
@@ -8862,8 +8857,6 @@ mostlyclean-compile:
        -rm -f gnu/gcj/io/shs.lo
        -rm -f gnu/gcj/jvmti/natBreakpoint.$(OBJEXT)
        -rm -f gnu/gcj/jvmti/natBreakpoint.lo
-       -rm -f gnu/gcj/jvmti/natExceptionEvent.$(OBJEXT)
-       -rm -f gnu/gcj/jvmti/natExceptionEvent.lo
        -rm -f gnu/gcj/natCore.$(OBJEXT)
        -rm -f gnu/gcj/natCore.lo
        -rm -f gnu/gcj/runtime/natFinalizerThread.$(OBJEXT)
@@ -9082,7 +9075,6 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/io/$(DEPDIR)/natSimpleSHSStream.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/io/$(DEPDIR)/shs.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/jvmti/$(DEPDIR)/natBreakpoint.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/jvmti/$(DEPDIR)/natExceptionEvent.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natFinalizerThread.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natSharedLibLoader.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@gnu/gcj/runtime/$(DEPDIR)/natStringBuffer.Plo@am__quote@

diff --git a/libjava/gnu/gcj/jvmti/natExceptionEvent.cc b/libjava/gnu/gcj/jvmti/natExceptionEvent.cc
deleted file mode 100644 (file)
index dfc8e66..0000000
--- a/libjava/gnu/gcj/jvmti/natExceptionEvent.cc
+++ /dev/null
@@ -1,59 +0,0 @@
-// natExceptionEvent.cc - C++ code for JVMTI Exception events
-
-/* Copyright (C) 2007  Free Software Foundation
-
-   This file is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the file "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-#include <gcj/cni.h>
-#include <gcj/method.h>
-#include <java-interp.h>
-#include <java-insns.h>
-#include <java-assert.h>
-#include <jvmti.h>
-#include <jvmti-int.h>
-
-#include <gnu/gcj/jvmti/ExceptionEvent.h>
-
-void
-gnu::gcj::jvmti::ExceptionEvent::sendEvent ()
-{
-  // Check if the exception is caught somewhere in the interpreted call stack
-  if (_catchMeth == 0 || _catchLoc == 0)
-    checkCatch ();
-    
-  JNIEnv *jni = _Jv_GetCurrentJNIEnv ();
-
-  _Jv_JVMTI_PostEvent (JVMTI_EVENT_EXCEPTION, _thread, jni,
-                       reinterpret_cast<jmethodID> (_throwMeth),
-                       static_cast<jlocation> (_throwLoc), _ex,
-                       reinterpret_cast<jmethodID> (_catchMeth),
-                       static_cast<jlocation> (_catchLoc)); 
-}
-
-// This method looks up the interpreted call stack to see if the exception will
-// eventually be caught by some java method.
-void
-gnu::gcj::jvmti::ExceptionEvent::checkCatch ()
-{
-  _Jv_InterpFrame *frame 
-    = reinterpret_cast<_Jv_InterpFrame *> (_thread->interp_frame);
-  
-  while ((frame = frame->next_interp))
-    {
-         _Jv_InterpMethod *meth 
-           = reinterpret_cast<_Jv_InterpMethod *> (frame->self);
-         pc_t pc = frame->pc;
-               
-         if (meth->check_handler (&pc, meth, _ex))
-           {
-             _catchMeth = reinterpret_cast<jlong> (meth->get_method ());
-             _catchLoc = meth->insn_index (pc);
-          break;
-           }
-    }
-}

diff --git a/libjava/interpret.cc b/libjava/interpret.cc
index 9209688..edb3066 100644 (file)
--- a/libjava/interpret.cc
+++ b/libjava/interpret.cc
@@ -42,7 +42,6 @@ details.  */
 
 #include <gnu/gcj/jvmti/Breakpoint.h>
 #include <gnu/gcj/jvmti/BreakpointManager.h>
-#include <gnu/gcj/jvmti/ExceptionEvent.h>
 
 #ifdef INTERPRETER