OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tb-gcc.c (trace_callback): Work around problem with _Unwind_GetIP on ia64 HP-UX. 

2005-11-14  Matthew Gingell  <gingell@adacore.com>
	    Olivier Hainque  <hainque@adacore.com>

	* tb-gcc.c (trace_callback): Work around problem with _Unwind_GetIP on
	ia64 HP-UX.

	* tracebak.c (ia64 configuration): Enable _Unwind_Backtrace driven
	tracebacks on ia64 HP-UX and provide explanatory comment.
	Enable backtraces on ia64 GNU/Linux.
	(x86 configuration): Bump FRAME_LEVEL to 1 to ensure we retrieve a real
	base pointer from builtin_frame_address. Adjust BASE_SKIP accordingly.

From-SVN: r106964
This commit is contained in:
Matthew Gingell 2005-11-15 14:54:25 +01:00 committed by Arnaud Charlet
parent e1ac6e5b21
commit 748d8778ed
2 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
gcc/ada/tb-gcc.c
View File

@ -6,7 +6,7 @@
* *
* C Implementation File *
* *
* Copyright (C) 2004 Ada Core Technologies, Inc *
* Copyright (C) 2004-2005, AdaCore *
* *
* GNAT is free software; you can redistribute it and/or modify it under *
* terms of the GNU General Public License as published by the Free Soft- *
@ -54,10 +54,21 @@ typedef struct {
* trace_callback *
******************/
#if defined (__ia64__) && defined (__hpux__)
#include <uwx.h>
#endif
static _Unwind_Reason_Code
trace_callback (struct _Unwind_Context * uw_context, uw_data_t * uw_data)
{
void * pc = (void *) _Unwind_GetIP (uw_context);
void * pc;
#if defined (__ia64__) && defined (__hpux__)
/* Work around problem with _Unwind_GetIP on ia64 HP-UX. */
uwx_get_reg ((struct uwx_env *) uw_context, UWX_REG_IP, (uint64_t *) &pc);
#else
pc = (void *) _Unwind_GetIP (uw_context);
#endif
if (uw_data->n_frames_skipped < uw_data->n_frames_to_skip)
{

16
gcc/ada/tracebak.c
View File

@ -6,7 +6,7 @@
* *
* C Implementation File *
* *
* Copyright (C) 2000-2005 Ada Core Technologies, Inc. *
* Copyright (C) 2000-2005, AdaCore *
* *
* GNAT is free software; you can redistribute it and/or modify it under *
* terms of the GNU General Public License as published by the Free Soft- *
@ -300,7 +300,11 @@ struct layout
};
#define LOWEST_ADDR 0
#define FRAME_LEVEL 0
#define FRAME_LEVEL 1
/* builtin_frame_address (1) is expected to work on this target, and (0) might
return the soft stack pointer, which does not designate a location where a
backchain and a return address might be found. */
#define FRAME_OFFSET 0
#define PC_ADJUST -2
#define STOP_FRAME(CURRENT, TOP_STACK) \
@ -309,7 +313,7 @@ struct layout
|| (CURRENT)->return_address == 0|| (CURRENT)->next == 0 \
|| (void *) (CURRENT) < (TOP_STACK))
#define BASE_SKIP 1
#define BASE_SKIP (1+FRAME_LEVEL)
/* On i386 architecture we check that at the call point we really have a call
insn. Possible call instructions are:
@ -349,9 +353,13 @@ struct layout
/*----------------------------- ia64 ---------------------------------*/
#elif defined (__ia64__) && !defined (USE_LIBUNWIND_EXCEPTIONS)
#elif defined (__ia64__) && (defined (linux) || defined (__hpux__))
#define USE_GCC_UNWINDER
/* Use _Unwind_Backtrace driven exceptions on ia64 HP-UX and ia64
GNU/Linux, where _Unwind_Backtrace is provided by the system unwind
library. On HP-UX 11.23 this requires patch PHSS_33352, which adds
_Unwind_Backtrace to the system unwind library. */
#define PC_ADJUST -16
/* Every call on ia64 is part of a 128 bit bundle, so an adjustment of