yggdrasil/gcc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

re PR target/26792 (need to use autoconf when using newly-added libgcc functions)

Browse Source 
2006-09-26  Jack Howarth  <howarth@bromo.med.uc.edu>

	PR target/26792:
	* exception.cc (PERSONALITY_FUNCTION): use _Unwind_GetIP
	if HAVE_GETIPINFO not defined.
	* stacktrace.cc (_Jv_StackTrace::UnwindTraceFn): Likewise.
	(_Jv_StackTrace::getLineNumberForFrame): Likewise.
	* configure.ac: use GCC_CHECK_UNWIND_GETIPINFO.
	* aclocal.m4, configure, include/config.h.in, Makefile.in:
	Rebuilt.

From-SVN: r117259
This commit is contained in:
Jack Howarth
2006-09-27 21:24:23 +00:00
committed by Tom Tromey
parent e48d66a949
commit d4708d9dd4
11 changed files with 145 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libjava/stacktrace.cc
+12 -1
View File
@@ -131,6 +131,7 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
else
#endif
{
#ifdef HAVE_GETIPINFO
_Unwind_Ptr ip;
int ip_before_insn = 0;
ip = _Unwind_GetIPInfo (context, &ip_before_insn);
@@ -139,9 +140,13 @@ _Jv_StackTrace::UnwindTraceFn (struct _Unwind_Context *context, void *state_ptr)
// to ensure we get the correct line number for the call itself.
if (! ip_before_insn)
--ip;
#endif
state->frames[pos].type = frame_native;
#ifdef HAVE_GETIPINFO
state->frames[pos].ip = (void *) ip;
#else
state->frames[pos].ip = (void *) _Unwind_GetIP (context);
#endif
state->frames[pos].start_ip = func_addr;
}
@@ -217,6 +222,12 @@ _Jv_StackTrace::getLineNumberForFrame(_Jv_StackFrame *frame, NameFinder *finder,
else
offset = (_Unwind_Ptr) ip - (_Unwind_Ptr) info.base;
#ifndef HAVE_GETIPINFO
// The unwinder gives us the return address. In order to get the right
// line number for the stack trace, roll it back a little.
offset -= 1;
#endif
finder->lookup (binaryName, (jlong) offset);
*sourceFileName = finder->getSourceFile();
*lineNum = finder->getLineNum();