4d5c703ec0
* gnu/gcj/runtime/NameFinder.java (remove_interpreter): New field.
(sanitizeStack): Correctly reset unknown and interpreter counters,
detect interpreter runtime frames.
(demangleInterpreterMethod): New method.
* gnu/gcj/runtime/natNameFinder.cc (lookupInterp): Use new method.
* java/lang/natVMThrowable.cc (fillInStackTrace): Change order of
filling in addrs[].
From-SVN: r56741
98 lines
2.3 KiB
C++
98 lines
2.3 KiB
C++
// natVMThrowable.cc - native helper methods for Throwable
|
|
|
|
/* Copyright (C) 2000, 2002 Free Software Foundation, Inc
|
|
|
|
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. */
|
|
|
|
/**
|
|
* @author Andrew Haley <aph@cygnus.com>
|
|
* @author Mark Wielaard <mark@klomp.org>
|
|
*
|
|
* Native helper methods for VM specific Throwable support.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include <string.h>
|
|
|
|
#include <jvm.h>
|
|
#include <gcj/cni.h>
|
|
#include <gnu/gcj/RawData.h>
|
|
#include <java/lang/Object.h>
|
|
#include <java-threads.h>
|
|
#include <java/lang/Throwable.h>
|
|
#include <java/lang/VMThrowable.h>
|
|
#include <java/lang/Thread.h>
|
|
#include <java-interp.h>
|
|
|
|
#include <sys/types.h>
|
|
|
|
#include <stdlib.h>
|
|
|
|
#include <unistd.h>
|
|
|
|
#ifdef HAVE_EXECINFO_H
|
|
#include <execinfo.h>
|
|
#endif
|
|
|
|
/* FIXME: size of the stack trace is limited to 128 elements. It's
|
|
undoubtedly sensible to limit the stack trace, but 128 is rather
|
|
arbitrary. It may be better to configure this. */
|
|
|
|
java::lang::VMThrowable *
|
|
java::lang::VMThrowable::fillInStackTrace (java::lang::Throwable* t)
|
|
{
|
|
if (! trace_enabled)
|
|
return NULL;
|
|
#if defined (HAVE_BACKTRACE)
|
|
VMThrowable* state = new VMThrowable;
|
|
void *p[128];
|
|
|
|
// We subtract 1 from the number of elements because we don't want
|
|
// to include the calls to fillInStackTrace in the trace.
|
|
int n = backtrace (p, 128) - 1;
|
|
|
|
_Jv_frame_info *addrs;
|
|
if (n > 0)
|
|
{
|
|
#ifdef INTERPRETER
|
|
extern void _Jv_StartOfInterpreter (void);
|
|
extern void _Jv_EndOfInterpreter (void);
|
|
|
|
java::lang::Thread *thread = java::lang::Thread::currentThread();
|
|
_Jv_MethodChain *interp_frame
|
|
= (thread ? reinterpret_cast<_Jv_MethodChain *> (thread->interp_frame)
|
|
: NULL);
|
|
#endif // INTERPRETER
|
|
|
|
state->length = n;
|
|
int len = n;
|
|
addrs = (_Jv_frame_info *) _Jv_Malloc (n * sizeof (_Jv_frame_info));
|
|
for (n = 0; n < len; n++)
|
|
{
|
|
addrs[n].addr = p[n];
|
|
#ifdef INTERPRETER
|
|
if (p[n] >= &_Jv_StartOfInterpreter && p[n] <= &_Jv_EndOfInterpreter)
|
|
{
|
|
addrs[n].interp = (void *) interp_frame->self;
|
|
interp_frame = interp_frame->next;
|
|
}
|
|
else
|
|
addrs[n].interp = 0;
|
|
#endif // INTERPRETER
|
|
}
|
|
}
|
|
else
|
|
addrs = NULL;
|
|
|
|
state->stackTraceAddrs = reinterpret_cast<gnu::gcj::RawData *> (addrs);
|
|
|
|
return state;
|
|
#endif
|
|
return NULL;
|
|
}
|