From f208ba17b9e2ab2f57d5505c237492f4dcc9e0c7 Mon Sep 17 00:00:00 2001 From: Andrew Cagney Date: Sun, 14 Apr 2002 13:38:07 +0000 Subject: [PATCH] * config/pa/tm-hppa.h (FRAME_CHAIN_COMBINE): Delete macro. * blockframe.c (FRAME_CHAIN_COMBINE): Delete macro. (get_prev_frame): Do not call FRAME_CHAIN_COMBINE. * gdbint.texinfo (Target Architecture Definition): Remove FRAME_CHAIN_COMBINE. --- gdb/ChangeLog | 6 ++++++ gdb/blockframe.c | 7 ------- gdb/config/pa/tm-hppa.h | 13 ++----------- gdb/doc/ChangeLog | 5 +++++ gdb/doc/gdbint.texinfo | 6 ------ 5 files changed, 13 insertions(+), 24 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index a65a53fccb..14d62881fe 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2002-04-14 Andrew Cagney + + * config/pa/tm-hppa.h (FRAME_CHAIN_COMBINE): Delete macro. + * blockframe.c (FRAME_CHAIN_COMBINE): Delete macro. + (get_prev_frame): Do not call FRAME_CHAIN_COMBINE. + 2002-04-12 Don Howard * cli/cli-cmds.c (init_cli_cmds): Add new user settable value: diff --git a/gdb/blockframe.c b/gdb/blockframe.c index 49bda4a255..8f43ea7d8c 100644 --- a/gdb/blockframe.c +++ b/gdb/blockframe.c @@ -303,12 +303,6 @@ frameless_look_for_prologue (struct frame_info *frame) return 0; } -/* Default a few macros that people seldom redefine. */ - -#ifndef FRAME_CHAIN_COMBINE -#define FRAME_CHAIN_COMBINE(chain, thisframe) (chain) -#endif - /* Return a structure containing various interesting information about the frame that called NEXT_FRAME. Returns NULL if there is no such frame. */ @@ -379,7 +373,6 @@ get_prev_frame (struct frame_info *next_frame) address = FRAME_CHAIN (next_frame); if (!FRAME_CHAIN_VALID (address, next_frame)) return 0; - address = FRAME_CHAIN_COMBINE (address, next_frame); } if (address == 0) return 0; diff --git a/gdb/config/pa/tm-hppa.h b/gdb/config/pa/tm-hppa.h index 36e57bd5df..227108f49e 100644 --- a/gdb/config/pa/tm-hppa.h +++ b/gdb/config/pa/tm-hppa.h @@ -376,15 +376,8 @@ extern void init_extra_frame_info (int, struct frame_info *); /* Describe the pointer in each stack frame to the previous stack frame (its caller). */ -/* FRAME_CHAIN takes a frame's nominal address - and produces the frame's chain-pointer. - - FRAME_CHAIN_COMBINE takes the chain pointer and the frame's nominal address - and produces the nominal address of the caller frame. - - However, if FRAME_CHAIN_VALID returns zero, - it means the given frame is the outermost one and has no caller. - In that case, FRAME_CHAIN_COMBINE is not used. */ +/* FRAME_CHAIN takes a frame's nominal address and produces the + frame's chain-pointer. */ /* In the case of the PA-RISC, the frame's nominal address is the address of a 4-byte word containing the calling frame's @@ -396,8 +389,6 @@ extern CORE_ADDR frame_chain (struct frame_info *); extern int hppa_frame_chain_valid (CORE_ADDR, struct frame_info *); #define FRAME_CHAIN_VALID(chain, thisframe) hppa_frame_chain_valid (chain, thisframe) -#define FRAME_CHAIN_COMBINE(chain, thisframe) (chain) - /* Define other aspects of the stack frame. */ /* A macro that tells us whether the function invocation represented diff --git a/gdb/doc/ChangeLog b/gdb/doc/ChangeLog index 2f27290667..24a6fa9ac9 100644 --- a/gdb/doc/ChangeLog +++ b/gdb/doc/ChangeLog @@ -1,3 +1,8 @@ +2002-04-14 Andrew Cagney + + * gdbint.texinfo (Target Architecture Definition): Remove + FRAME_CHAIN_COMBINE. + 2002-04-12 Michael Chastain * gdbint.texinfo (Obsolete Conditionals): Remove reference to diff --git a/gdb/doc/gdbint.texinfo b/gdb/doc/gdbint.texinfo index f3753aa8ab..42d2752373 100644 --- a/gdb/doc/gdbint.texinfo +++ b/gdb/doc/gdbint.texinfo @@ -2935,12 +2935,6 @@ See @file{stack.c}. @findex FRAME_CHAIN Given @var{frame}, return a pointer to the calling frame. -@item FRAME_CHAIN_COMBINE(@var{chain}, @var{frame}) -@findex FRAME_CHAIN_COMBINE -Define this to take the frame chain pointer and the frame's nominal -address and produce the nominal address of the caller's frame. -Presently only defined for HP PA. - @item FRAME_CHAIN_VALID(@var{chain}, @var{thisframe}) @findex FRAME_CHAIN_VALID Define this to be an expression that returns zero if the given frame is -- 2.34.1