Commit 38b19a92 by Ranjit Mathew

stacktrace.cc (_Jv_StackTrace::GetStackTrace): Unconditionally use _Unwind_Backtrace().

	* stacktrace.cc (_Jv_StackTrace::GetStackTrace): Unconditionally use
	_Unwind_Backtrace().
	(_Jv_StackTrace::GetCallerInfo): Enable even for targets using SJLJ
	EH.
	(_Jv_StackTrace::GetClassContext): Unconditionally use
	_Unwind_Backtrace().
	(_Jv_StackTrace::GetFirstNonSystemClassLoader): Likewise.
	* sysdep/i386/backtrace.h (HAVE_FALLBACK_BACKTRACE): Do not define.
	(_Unwind_GetIPInfo): Define macro if SJLJ EH is in use.
	(_Unwind_GetRegionStart): Likewise.
	(_Unwind_Backtrace): Likewise.
	(fallback_backtrace): Accept additional unwind trace function
	argument.  Call it during unwinding.  Stop when any of _Jv_RunMain(),
	_Jv_ThreadStart() or main() is seen during unwinding.
	* sysdep/generic/backtrace.h (fallback_backtrace): Accept an
	additional unwind trace function argument.

From-SVN: r115449
parent 47a4949a
2006-07-14 Ranjit Mathew <rmathew@gcc.gnu.org>
* stacktrace.cc (_Jv_StackTrace::GetStackTrace): Unconditionally use
_Unwind_Backtrace().
(_Jv_StackTrace::GetCallerInfo): Enable even for targets using SJLJ
EH.
(_Jv_StackTrace::GetClassContext): Unconditionally use
_Unwind_Backtrace().
(_Jv_StackTrace::GetFirstNonSystemClassLoader): Likewise.
* sysdep/i386/backtrace.h (HAVE_FALLBACK_BACKTRACE): Do not define.
(_Unwind_GetIPInfo): Define macro if SJLJ EH is in use.
(_Unwind_GetRegionStart): Likewise.
(_Unwind_Backtrace): Likewise.
(fallback_backtrace): Accept additional unwind trace function
argument. Call it during unwinding. Stop when any of _Jv_RunMain(),
_Jv_ThreadStart() or main() is seen during unwinding.
* sysdep/generic/backtrace.h (fallback_backtrace): Accept an
additional unwind trace function argument.
2006-07-14 Gary Benson <gbenson@redhat.com> 2006-07-14 Gary Benson <gbenson@redhat.com>
* java/io/File.java (internalExists): New method. * java/io/File.java (internalExists): New method.
......
...@@ -153,13 +153,7 @@ _Jv_StackTrace::GetStackTrace(void) ...@@ -153,13 +153,7 @@ _Jv_StackTrace::GetStackTrace(void)
_Jv_UnwindState state (trace_size); _Jv_UnwindState state (trace_size);
state.frames = (_Jv_StackFrame *) &frames; state.frames = (_Jv_StackFrame *) &frames;
#ifdef SJLJ_EXCEPTIONS
// The Unwind interface doesn't work with the SJLJ exception model.
// Fall back to a platform-specific unwinder.
fallback_backtrace (&state);
#else /* SJLJ_EXCEPTIONS */
_Unwind_Backtrace (UnwindTraceFn, &state); _Unwind_Backtrace (UnwindTraceFn, &state);
#endif /* SJLJ_EXCEPTIONS */
// Copy the trace and return it. // Copy the trace and return it.
int traceSize = sizeof (_Jv_StackTrace) + int traceSize = sizeof (_Jv_StackTrace) +
...@@ -423,7 +417,6 @@ void ...@@ -423,7 +417,6 @@ void
_Jv_StackTrace::GetCallerInfo (jclass checkClass, jclass *caller_class, _Jv_StackTrace::GetCallerInfo (jclass checkClass, jclass *caller_class,
_Jv_Method **caller_meth) _Jv_Method **caller_meth)
{ {
#ifndef SJLJ_EXCEPTIONS
int trace_size = 20; int trace_size = 20;
_Jv_StackFrame frames[trace_size]; _Jv_StackFrame frames[trace_size];
_Jv_UnwindState state (trace_size); _Jv_UnwindState state (trace_size);
...@@ -447,9 +440,6 @@ _Jv_StackTrace::GetCallerInfo (jclass checkClass, jclass *caller_class, ...@@ -447,9 +440,6 @@ _Jv_StackTrace::GetCallerInfo (jclass checkClass, jclass *caller_class,
*caller_class = trace_data.foundClass; *caller_class = trace_data.foundClass;
if (caller_meth) if (caller_meth)
*caller_meth = trace_data.foundMeth; *caller_meth = trace_data.foundMeth;
#else
return;
#endif
} }
// Return a java array containing the Java classes on the stack above CHECKCLASS. // Return a java array containing the Java classes on the stack above CHECKCLASS.
...@@ -466,13 +456,7 @@ _Jv_StackTrace::GetClassContext (jclass checkClass) ...@@ -466,13 +456,7 @@ _Jv_StackTrace::GetClassContext (jclass checkClass)
//JvSynchronized (ncodeMap); //JvSynchronized (ncodeMap);
UpdateNCodeMap (); UpdateNCodeMap ();
#ifdef SJLJ_EXCEPTIONS
// The Unwind interface doesn't work with the SJLJ exception model.
// Fall back to a platform-specific unwinder.
fallback_backtrace (&state);
#else /* SJLJ_EXCEPTIONS */
_Unwind_Backtrace (UnwindTraceFn, &state); _Unwind_Backtrace (UnwindTraceFn, &state);
#endif /* SJLJ_EXCEPTIONS */
// Count the number of Java frames on the stack. // Count the number of Java frames on the stack.
int jframe_count = 0; int jframe_count = 0;
...@@ -543,13 +527,7 @@ _Jv_StackTrace::GetFirstNonSystemClassLoader () ...@@ -543,13 +527,7 @@ _Jv_StackTrace::GetFirstNonSystemClassLoader ()
//JvSynchronized (ncodeMap); //JvSynchronized (ncodeMap);
UpdateNCodeMap (); UpdateNCodeMap ();
#ifdef SJLJ_EXCEPTIONS
// The Unwind interface doesn't work with the SJLJ exception model.
// Fall back to a platform-specific unwinder.
fallback_backtrace (&state);
#else /* SJLJ_EXCEPTIONS */
_Unwind_Backtrace (UnwindTraceFn, &state); _Unwind_Backtrace (UnwindTraceFn, &state);
#endif /* SJLJ_EXCEPTIONS */
if (state.trace_data) if (state.trace_data)
return (ClassLoader *) state.trace_data; return (ClassLoader *) state.trace_data;
......
// backtrace.h - Fallback backtrace implementation. default implementation. // backtrace.h - Fallback backtrace implementation. default implementation.
/* Copyright (C) 2005 Free Software Foundation /* Copyright (C) 2005, 2006 Free Software Foundation
This file is part of libgcj. This file is part of libgcj.
...@@ -13,10 +13,11 @@ details. */ ...@@ -13,10 +13,11 @@ details. */
#include <java-stack.h> #include <java-stack.h>
/* Store return addresses of the current program stack in /* Unwind through the call stack calling TRACE_FN with STATE for every stack
STATE and return the exact number of values stored. */ frame. Returns the reason why the unwinding was stopped. */
void _Unwind_Reason_Code
fallback_backtrace (_Jv_UnwindState *) fallback_backtrace (_Unwind_Trace_Fn, _Jv_UnwindState *)
{ {
return _URC_NO_REASON;
} }
#endif #endif
...@@ -13,21 +13,46 @@ details. */ ...@@ -13,21 +13,46 @@ details. */
#include <java-stack.h> #include <java-stack.h>
#define HAVE_FALLBACK_BACKTRACE extern int main (int, char **);
/* Store return addresses of the current program stack in /* The context used to keep track of our position while unwinding through
STATE and return the exact number of values stored. */ the call stack. */
void struct _Unwind_Context
fallback_backtrace (_Jv_UnwindState *state) {
/* The starting address of the method. */
_Jv_uintptr_t meth_addr;
/* The return address in the method. */
_Jv_uintptr_t ret_addr;
};
#ifdef SJLJ_EXCEPTIONS
#undef _Unwind_GetIPInfo
#define _Unwind_GetIPInfo(ctx,ip_before_insn) \
(*(ip_before_insn) = 1, (ctx)->ret_addr)
#undef _Unwind_GetRegionStart
#define _Unwind_GetRegionStart(ctx) \
((ctx)->meth_addr)
#undef _Unwind_Backtrace
#define _Unwind_Backtrace(trace_fn,state_ptr) \
(fallback_backtrace (trace_fn, state_ptr))
#endif /* SJLJ_EXCEPTIONS */
/* Unwind through the call stack calling TRACE_FN with STATE for each stack
frame. Returns the reason why the unwinding was stopped. */
_Unwind_Reason_Code
fallback_backtrace (_Unwind_Trace_Fn trace_fn, _Jv_UnwindState *state)
{ {
register _Jv_uintptr_t *_ebp __asm__ ("ebp"); register _Jv_uintptr_t *_ebp __asm__ ("ebp");
register _Jv_uintptr_t _esp __asm__ ("esp"); register _Jv_uintptr_t _esp __asm__ ("esp");
_Jv_uintptr_t rfp; _Jv_uintptr_t rfp;
_Unwind_Context ctx;
int i = state->pos; for (rfp = *_ebp; rfp; rfp = *(_Jv_uintptr_t *)rfp)
for (rfp = *_ebp;
rfp && i < state->length;
rfp = *(_Jv_uintptr_t *)rfp)
{ {
/* Sanity checks to eliminate dubious-looking frame pointer chains. /* Sanity checks to eliminate dubious-looking frame pointer chains.
The frame pointer should be a 32-bit word-aligned stack address. The frame pointer should be a 32-bit word-aligned stack address.
...@@ -42,12 +67,7 @@ fallback_backtrace (_Jv_UnwindState *state) ...@@ -42,12 +67,7 @@ fallback_backtrace (_Jv_UnwindState *state)
/* Get the return address in the calling function. This is stored on /* Get the return address in the calling function. This is stored on
the stack just before the value of the old frame pointer. */ the stack just before the value of the old frame pointer. */
_Jv_uintptr_t ret_addr ctx.ret_addr = *(_Jv_uintptr_t *)(rfp + sizeof (_Jv_uintptr_t));
= *(_Jv_uintptr_t *)(rfp + sizeof (_Jv_uintptr_t));
state->frames[i].type = frame_native;
state->frames[i].ip = (void *)(ret_addr - 1);
state->frames[i].start_ip = NULL;
/* Try to locate a "pushl %ebp; movl %esp, %ebp" function prologue /* Try to locate a "pushl %ebp; movl %esp, %ebp" function prologue
by scanning backwards at even addresses below the return address. by scanning backwards at even addresses below the return address.
...@@ -56,7 +76,8 @@ fallback_backtrace (_Jv_UnwindState *state) ...@@ -56,7 +76,8 @@ fallback_backtrace (_Jv_UnwindState *state)
FIXME: This is not robust and will probably give us false positives, FIXME: This is not robust and will probably give us false positives,
but this is about the best we can do if we do not have DWARF-2 unwind but this is about the best we can do if we do not have DWARF-2 unwind
information based exception handling. */ information based exception handling. */
_Jv_uintptr_t scan_addr = (ret_addr & 0xFFFFFFFE) - 2; ctx.meth_addr = (_Jv_uintptr_t)NULL;
_Jv_uintptr_t scan_addr = (ctx.ret_addr & 0xFFFFFFFE) - 2;
_Jv_uintptr_t limit_addr _Jv_uintptr_t limit_addr
= (scan_addr > 1024 * 1024) ? (scan_addr - 1024 * 1024) : 2; = (scan_addr > 1024 * 1024) ? (scan_addr - 1024 * 1024) : 2;
for ( ; scan_addr >= limit_addr; scan_addr -= 2) for ( ; scan_addr >= limit_addr; scan_addr -= 2)
...@@ -65,17 +86,26 @@ fallback_backtrace (_Jv_UnwindState *state) ...@@ -65,17 +86,26 @@ fallback_backtrace (_Jv_UnwindState *state)
if (scan_bytes[0] == 0x55 && scan_bytes[1] == 0x89 if (scan_bytes[0] == 0x55 && scan_bytes[1] == 0x89
&& scan_bytes[2] == 0xE5) && scan_bytes[2] == 0xE5)
{ {
state->frames[i].start_ip = (void *)scan_addr; ctx.meth_addr = scan_addr;
break; break;
} }
} }
/* No need to unwind beyond JvRunMain(). */ /* Now call the unwinder callback function. */
if (state->frames[i].start_ip == (void *)JvRunMain) if (trace_fn != NULL)
break; (*trace_fn) (&ctx, state);
i++; /* No need to unwind beyond _Jv_RunMain(), _Jv_ThreadStart or
main(). */
void *jv_runmain
= (void *)(void (*)(JvVMInitArgs *, jclass, const char *, int,
const char **, bool))_Jv_RunMain;
if (ctx.meth_addr == (_Jv_uintptr_t)jv_runmain
|| ctx.meth_addr == (_Jv_uintptr_t)_Jv_ThreadStart
|| (ctx.meth_addr - (_Jv_uintptr_t)main) < 16)
break;
} }
state->pos = i;
return _URC_NO_REASON;
} }
#endif #endif
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