From db54fef4278fb8c9e69125e4e98314d23220517f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Sat, 14 Sep 2002 09:40:36 +0000 Subject: [PATCH] * arch-utils.c (legacy_pc_in_sigtramp): Move preprocessor expression for IN_SIGTRAMP to here. Use IN_SIGTRAMP only if it's defined. Guard usage of SIGTRAMP_START() by using SIGTRAMP_START_P. --- gdb/ChangeLog | 6 ++++++ gdb/arch-utils.c | 21 ++++++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f077dc2..0252b33 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2002-09-14 Corinna Vinschen + + * arch-utils.c (legacy_pc_in_sigtramp): Move preprocessor expression + for IN_SIGTRAMP to here. Use IN_SIGTRAMP only if it's defined. + Guard usage of SIGTRAMP_START() by using SIGTRAMP_START_P. + 2002-09-13 Christopher Faylor * win32-nat.c (child_create_inferior): Honor 'tty' command. diff --git a/gdb/arch-utils.c b/gdb/arch-utils.c index ecdecaf..3666bd5 100644 --- a/gdb/arch-utils.c +++ b/gdb/arch-utils.c @@ -438,18 +438,6 @@ generic_register_size (int regnum) return TYPE_LENGTH (REGISTER_VIRTUAL_TYPE (regnum)); } -#if !defined (IN_SIGTRAMP) -#if defined (SIGTRAMP_START) -#define IN_SIGTRAMP(pc, name) \ - ((pc) >= SIGTRAMP_START(pc) \ - && (pc) < SIGTRAMP_END(pc) \ - ) -#else -#define IN_SIGTRAMP(pc, name) \ - (name && STREQ ("_sigtramp", name)) -#endif -#endif - /* Assume all registers are adjacent. */ int @@ -470,7 +458,14 @@ generic_register_byte (int regnum) int legacy_pc_in_sigtramp (CORE_ADDR pc, char *name) { - return IN_SIGTRAMP(pc, name); +#if !defined (IN_SIGTRAMP) + if (SIGTRAMP_START_P ()) + return (pc) >= SIGTRAMP_START (pc) && (pc) < SIGTRAMP_END (pc); + else + return name && strcmp ("_sigtramp", name) == 0; +#else + return IN_SIGTRAMP (pc, name); +#endif } int -- 2.7.4