mirrors/gcc
0
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-12-14 22:43:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* interpret.cc: Don't include ExceptionEvent.h.
        * gnu/gcj/jvmti/natExceptionEvent.cc: Remove.
        * Makefile.am (nat_source_files): Remove natExceptionEvent.cc.
        * Makefile.in: Regenerated.

From-SVN: r124407
This commit is contained in:
Keith Seitz 2007-05-04 02:08:07 +00:00 committed by Keith Seitz
parent befd756626
commit 136bed8f1a
5 changed files with 7 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
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):

1
libjava/Makefile.am
View File

@ -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 \

8
libjava/Makefile.in
View File

@ -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@

59
libjava/gnu/gcj/jvmti/natExceptionEvent.cc
View File

@ -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;
}
}
}

1
libjava/interpret.cc
View File

@ -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