diff options
| -rw-r--r-- | gdb/ChangeLog | 13 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-cisco.h | 3 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-es1800.h | 3 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-linux.h | 2 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-m68k.h | 7 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-m68kv4.h | 3 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-sun3.h | 3 | ||||
| -rw-r--r-- | gdb/config/m68k/tm-vx68.h | 3 | ||||
| -rw-r--r-- | gdb/m68k-tdep.c | 4 |
9 files changed, 27 insertions, 14 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 49a6046..00e214d 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +Wed Nov 8 22:46:43 2000 Andrew Cagney <cagney@b1.cygnus.com> + + * m68k-tdep.c (m68k_get_longjmp_target): Rename function + get_longjmp_target. Remove wrapping #ifdef GET_LONGJMP_TARGET. + * config/m68k/tm-m68k.h (m68k_get_longjmp_target): Add function + declaration. + + * config/m68k/tm-vx68.h, config/m68k/tm-sun3.h, + config/m68k/tm-m68kv4.h, config/m68k/tm-linux.h, + config/m68k/tm-es1800.h, config/m68k/tm-cisco.h: Update definition + of GET_LONGJMP_TARGET. Delete get_longjmp_target function + declaratation. + Wed Nov 8 15:32:23 2000 Andrew Cagney <cagney@b1.cygnus.com> * gdbserver/configure.in (files): Don't link nm-empty.h when a diff --git a/gdb/config/m68k/tm-cisco.h b/gdb/config/m68k/tm-cisco.h index e27432d..80eee53b7 100644 --- a/gdb/config/m68k/tm-cisco.h +++ b/gdb/config/m68k/tm-cisco.h @@ -47,8 +47,7 @@ we extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. This routine returns true on success */ -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) -extern int get_longjmp_target (CORE_ADDR *); +#define GET_LONGJMP_TARGET(ADDR) m68k_get_longjmp_target(ADDR) /* BFD handles finding the registers in the core file, so they are at the start of the BFD .reg section. */ diff --git a/gdb/config/m68k/tm-es1800.h b/gdb/config/m68k/tm-es1800.h index b6f1588..602e73b 100644 --- a/gdb/config/m68k/tm-es1800.h +++ b/gdb/config/m68k/tm-es1800.h @@ -56,5 +56,4 @@ we extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. This routine returns true on success */ -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) -extern int get_longjmp_target (CORE_ADDR *); +#define GET_LONGJMP_TARGET(ADDR) m68k_get_longjmp_target(ADDR) diff --git a/gdb/config/m68k/tm-linux.h b/gdb/config/m68k/tm-linux.h index 1d47d46..fbb30a7 100644 --- a/gdb/config/m68k/tm-linux.h +++ b/gdb/config/m68k/tm-linux.h @@ -93,7 +93,7 @@ we extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. This routine returns true on success */ -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) +#define GET_LONGJMP_TARGET(ADDR) m68k_get_longjmp_target(ADDR) /* Offset to saved PC in sigcontext, from <asm/sigcontext.h>. */ #define SIGCONTEXT_PC_OFFSET 26 diff --git a/gdb/config/m68k/tm-m68k.h b/gdb/config/m68k/tm-m68k.h index 38068c6..2623446 100644 --- a/gdb/config/m68k/tm-m68k.h +++ b/gdb/config/m68k/tm-m68k.h @@ -386,3 +386,10 @@ extern void m68k_pop_frame (void); #define SP_ARG0 (1 * 4) #define TARGET_M68K + +/* Figure out where the longjmp will land. Slurp the args out of the stack. + We expect the first arg to be a pointer to the jmp_buf structure from which + we extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. + This routine returns true on success */ + +extern int m68k_get_longjmp_target (CORE_ADDR *); diff --git a/gdb/config/m68k/tm-m68kv4.h b/gdb/config/m68k/tm-m68kv4.h index 8f6f15e..6763135 100644 --- a/gdb/config/m68k/tm-m68kv4.h +++ b/gdb/config/m68k/tm-m68kv4.h @@ -64,8 +64,7 @@ we extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. This routine returns true on success */ -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) -extern int get_longjmp_target (CORE_ADDR *); +#define GET_LONGJMP_TARGET(ADDR) m68k_get_longjmp_target(ADDR) /* Convert a DWARF register number to a gdb REGNUM. */ #define DWARF_REG_TO_REGNUM(num) ((num) < 16 ? (num) : (num)+FP0_REGNUM-16) diff --git a/gdb/config/m68k/tm-sun3.h b/gdb/config/m68k/tm-sun3.h index 0c8651a..0307852 100644 --- a/gdb/config/m68k/tm-sun3.h +++ b/gdb/config/m68k/tm-sun3.h @@ -74,8 +74,7 @@ we extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. This routine returns true on success */ -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) -extern int get_longjmp_target (CORE_ADDR *); +#define GET_LONGJMP_TARGET(ADDR) m68k_get_longjmp_target(ADDR) /* If sun3 pcc says that a parameter is a short, it's a short. */ #define BELIEVE_PCC_PROMOTION_TYPE diff --git a/gdb/config/m68k/tm-vx68.h b/gdb/config/m68k/tm-vx68.h index 9ce812d..53950f1 100644 --- a/gdb/config/m68k/tm-vx68.h +++ b/gdb/config/m68k/tm-vx68.h @@ -76,8 +76,7 @@ we extract the pc (JB_PC) that we will land at. The pc is copied into ADDR. This routine returns true on success */ -#define GET_LONGJMP_TARGET(ADDR) get_longjmp_target(ADDR) -extern int get_longjmp_target (CORE_ADDR *); +#define GET_LONGJMP_TARGET(ADDR) m68k_get_longjmp_target(ADDR) /* Number of registers in a ptrace_getregs call. */ diff --git a/gdb/m68k-tdep.c b/gdb/m68k-tdep.c index 8093f8c..f9b105d 100644 --- a/gdb/m68k-tdep.c +++ b/gdb/m68k-tdep.c @@ -637,14 +637,13 @@ fill_fpregset (fpregset_t *fpregsetp, int regno) #endif /* USE_PROC_FS */ -#ifdef GET_LONGJMP_TARGET /* Figure out where the longjmp will land. Slurp the args out of the stack. We expect the first arg to be a pointer to the jmp_buf structure from which we extract the pc (JB_PC) that we will land at. The pc is copied into PC. This routine returns true on success. */ int -get_longjmp_target (CORE_ADDR *pc) +m68k_get_longjmp_target (CORE_ADDR *pc) { char *buf; CORE_ADDR sp, jb_addr; @@ -667,7 +666,6 @@ get_longjmp_target (CORE_ADDR *pc) return 1; } -#endif /* GET_LONGJMP_TARGET */ /* Immediately after a function call, return the saved pc before the frame is setup. For sun3's, we check for the common case of being inside of a |