From 38b19a9247234e6cfb54766cf21bfdb6a429fbb4 Mon Sep 17 00:00:00 2001 From: Ranjit Mathew Date: Fri, 14 Jul 2006 17:14:55 +0000 Subject: 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 --- libjava/sysdep/generic/backtrace.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'libjava/sysdep/generic') diff --git a/libjava/sysdep/generic/backtrace.h b/libjava/sysdep/generic/backtrace.h index fe9d68f..21138ae 100644 --- a/libjava/sysdep/generic/backtrace.h +++ b/libjava/sysdep/generic/backtrace.h @@ -1,6 +1,6 @@ // 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. @@ -13,10 +13,11 @@ details. */ #include -/* Store return addresses of the current program stack in - STATE and return the exact number of values stored. */ -void -fallback_backtrace (_Jv_UnwindState *) +/* Unwind through the call stack calling TRACE_FN with STATE for every stack + frame. Returns the reason why the unwinding was stopped. */ +_Unwind_Reason_Code +fallback_backtrace (_Unwind_Trace_Fn, _Jv_UnwindState *) { + return _URC_NO_REASON; } #endif -- cgit v1.1