From 073c6b2b6152200cc53a5108255cb4c24b544f5c Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Thu, 22 Jul 1993 19:49:44 +0000 Subject: [PATCH] * coredep.c: If NEED_SYS_CORE_H defined, include (can't include it in nm-*.h file because it causes conflicts with a.out symbol definitions). * hp300ux-nat.c (fetch_core_registers): Commented out; obsolete. * config/m68k/hp300hpux.mh (NATDEPFILES): Added coredep.o and corelow.o. * config/m68k/nm-hp300hpux.h (NEED_SYS_CORE_H): Defined. (REGISTER_U_ADDR): Defined. * config/m68k/xm-hp300hpux.h (HAVE_TERMIOS): Define instead of HAVE_TERMIO. * config/pa/xm-hppah.h: Likewise. --- gdb/ChangeLog | 14 ++++++++++++++ gdb/config/m68k/hp300hpux.mh | 2 +- gdb/config/m68k/nm-hp300hpux.h | 18 ++++++++++++++++++ gdb/config/m68k/xm-hp300hpux.h | 2 +- gdb/config/pa/xm-hppah.h | 2 +- gdb/coredep.c | 4 ++++ gdb/hp300ux-nat.c | 7 +++++++ 7 files changed, 46 insertions(+), 3 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 9d62b788c7..3c4fb3643e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,17 @@ +Thu Jul 22 12:43:25 1993 Ian Lance Taylor (ian@cygnus.com) + + * coredep.c: If NEED_SYS_CORE_H defined, include + (can't include it in nm-*.h file because it causes conflicts with + a.out symbol definitions). + * hp300ux-nat.c (fetch_core_registers): Commented out; obsolete. + * config/m68k/hp300hpux.mh (NATDEPFILES): Added coredep.o and + corelow.o. + * config/m68k/nm-hp300hpux.h (NEED_SYS_CORE_H): Defined. + (REGISTER_U_ADDR): Defined. + * config/m68k/xm-hp300hpux.h (HAVE_TERMIOS): Define instead of + HAVE_TERMIO. + * config/pa/xm-hppah.h: Likewise. + Wed Jul 21 11:37:30 1993 Jim Kingdon (kingdon@deneb.cygnus.com) * mipsread.c (parse_symbol): when stTypedef and friends occur within diff --git a/gdb/config/m68k/hp300hpux.mh b/gdb/config/m68k/hp300hpux.mh index 71940e521a..c0dcf85a03 100644 --- a/gdb/config/m68k/hp300hpux.mh +++ b/gdb/config/m68k/hp300hpux.mh @@ -7,7 +7,7 @@ XM_FILE= xm-hp300hpux.h NAT_FILE= nm-hp300hpux.h -NATDEPFILES= infptrace.o inftarg.o fork-child.o hp300ux-nat.o +NATDEPFILES= infptrace.o inftarg.o fork-child.o hp300ux-nat.o coredep.o corelow.o SYSV_DEFINE=-DSYSV REGEX=regex.o REGEX1=regex.o diff --git a/gdb/config/m68k/nm-hp300hpux.h b/gdb/config/m68k/nm-hp300hpux.h index 060f79242c..1b6d51e830 100644 --- a/gdb/config/m68k/nm-hp300hpux.h +++ b/gdb/config/m68k/nm-hp300hpux.h @@ -24,3 +24,21 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* fetch_inferior_registers is in nat-hp300hpux.c. */ #define FETCH_INFERIOR_REGISTERS +/* Get registers from a core file. The floating point stuff is just + guesses. */ +#define NEED_SYS_CORE_H +#define REGISTER_U_ADDR(addr, blockend, regno) \ +{ \ + if (regno < PS_REGNUM) \ + addr = (int) (&((struct proc_regs *)(blockend))->d0 + regno); \ + else if (regno == PS_REGNUM) \ + addr = (int) ((char *) (&((struct proc_regs *)(blockend))->ps) - 2); \ + else if (regno == PC_REGNUM) \ + addr = (int) &((struct proc_regs *)(blockend))->pc; \ + else if (regno < FPC_REGNUM) \ + addr = (int) (((struct proc_regs *)(blockend))->mc68881 \ + + ((regno) - FP0_REGNUM) / 2); \ + else \ + addr = (int) (((struct proc_regs *)(blockend))->p_float \ + + (regno) - FPC_REGNUM); \ +} diff --git a/gdb/config/m68k/xm-hp300hpux.h b/gdb/config/m68k/xm-hp300hpux.h index 8edc0e0d34..2d06edd695 100644 --- a/gdb/config/m68k/xm-hp300hpux.h +++ b/gdb/config/m68k/xm-hp300hpux.h @@ -50,7 +50,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #undef MEM_FNS_DECLARED #define MEM_FNS_DECLARED 1 -#define HAVE_TERMIO +#define HAVE_TERMIOS /* Get rid of any system-imposed stack limit if possible. */ /* The hp9k320.h doesn't seem to have this feature. */ diff --git a/gdb/config/pa/xm-hppah.h b/gdb/config/pa/xm-hppah.h index 92092dfc3a..992a41e462 100644 --- a/gdb/config/pa/xm-hppah.h +++ b/gdb/config/pa/xm-hppah.h @@ -47,7 +47,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define HPPA_COMPILER_BUG #endif -#define HAVE_TERMIO +#define HAVE_TERMIOS #define KERNEL_U_ADDR 0 diff --git a/gdb/coredep.c b/gdb/coredep.c index 87c2228eea..d94fd9820c 100644 --- a/gdb/coredep.c +++ b/gdb/coredep.c @@ -40,6 +40,10 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #endif /* NO_PTRACE_H */ #endif +#ifdef NEED_SYS_CORE_H +#include +#endif + /* Extract the register values out of the core file and store them where `read_register' will find them. diff --git a/gdb/hp300ux-nat.c b/gdb/hp300ux-nat.c index 0f392ab0f9..d5248fc5ee 100644 --- a/gdb/hp300ux-nat.c +++ b/gdb/hp300ux-nat.c @@ -212,6 +212,11 @@ store_inferior_registers (regno) } +#if 0 + +/* This function is no longer used. The version in coredep.c is used + instead. */ + /* Take the register values out of a core file and store them where `read_register' will find them. */ @@ -256,6 +261,8 @@ fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr) } } +#endif /* 0 */ + int getpagesize () { -- 2.34.1