From 92d47a66ecd842628fb9f3a8e7776d378af6ed5b Mon Sep 17 00:00:00 2001 From: Stu Grossman Date: Wed, 17 Nov 1993 07:56:28 +0000 Subject: [PATCH] * i386ly-nat.c, i386lynx-nat.c, m68kly-nat.c: Remove. Move common code into lynx-nat.c. * lynx-nat.c: New module. Contains portable code for Lynx native stuff (mostly ptrace related). * config/i386/i386lynx.mh (NATDEPFILES): i386ly-nat.o -> lynx-nat.o * config/m68k/m68klynx.mh (NATDEPFILES): i386ly-nat.o -> lynx-nat.o * config/nm-lynx.h, config/tm-lynx.h: New files to contain non-architecture specific native and target defs. * config/i386/nm-i386lynx.h, config/i386/tm-i386lynx.h, config/m68k/nm-m68klynx.h, config/m68k/tm-m68klynx.h: Move all (arch) portable stuff into ../{tm nm}-lynx.h. --- gdb/config/.Sanitize | 2 ++ gdb/config/i386/i386lynx.mh | 2 +- gdb/config/i386/nm-i386lynx.h | 46 +------------------------ gdb/config/i386/tm-i386lynx.h | 5 +-- gdb/config/m68k/m68klynx.mh | 2 +- gdb/config/m68k/nm-m68klynx.h | 42 +---------------------- gdb/config/m68k/tm-m68klynx.h | 6 ++-- gdb/config/nm-lynx.h | 64 +++++++++++++++++++++++++++++++++++ gdb/config/tm-lynx.h | 28 +++++++++++++++ 9 files changed, 101 insertions(+), 96 deletions(-) create mode 100644 gdb/config/nm-lynx.h create mode 100644 gdb/config/tm-lynx.h diff --git a/gdb/config/.Sanitize b/gdb/config/.Sanitize index 5fad46c54e2..2a29316856d 100644 --- a/gdb/config/.Sanitize +++ b/gdb/config/.Sanitize @@ -33,6 +33,7 @@ i960 m68k m88k mips +nm-lynx.h nm-m3.h nm-sysv4.h nm-trash.h @@ -45,6 +46,7 @@ rs6000 sh sparc tahoe +tm-lynx.h tm-sunos.h tm-sysv4.h vax diff --git a/gdb/config/i386/i386lynx.mh b/gdb/config/i386/i386lynx.mh index b979292bf9e..6cbade8790d 100644 --- a/gdb/config/i386/i386lynx.mh +++ b/gdb/config/i386/i386lynx.mh @@ -2,7 +2,7 @@ XM_FILE= xm-i386lynx.h XDEPFILES= NAT_FILE= nm-i386lynx.h -NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o i386ly-nat.o +NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o REGEX=regex.o REGEX1=regex.o GDBSERVER_LIBS= -lbsd diff --git a/gdb/config/i386/nm-i386lynx.h b/gdb/config/i386/nm-i386lynx.h index b4635016596..a4d9cea18c3 100644 --- a/gdb/config/i386/nm-i386lynx.h +++ b/gdb/config/i386/nm-i386lynx.h @@ -20,50 +20,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef NM_I386LYNX_H #define NM_I386LYNX_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "thread.h" - -/* This is the amount to subtract from u.u_ar0 to get the offset in - the core file of the register values. */ - -#define KERNEL_U_ADDR USRSTACK - -#undef FLOAT_INFO /* No float info yet */ - -#define REGISTER_U_ADDR(addr, blockend, regno) \ - (addr) = i386_register_u_addr ((blockend),(regno)); - -extern int -i386_register_u_addr PARAMS ((int, int)); - -#define PTRACE_ARG3_TYPE char* - -/* Override copies of {fetch,store}_inferior_registers in infptrace.c. */ -#define FETCH_INFERIOR_REGISTERS - -/* Thread ID of stopped thread */ - -#define WIFTID(x) (((union wait *)&x)->w_tid) - -#define CHILD_WAIT - -extern int child_wait PARAMS ((int pid, int *status)); - -/* Lynx needs a special definition of this so that we can - print out the pid and thread number seperatly. */ - -#undef target_pid_to_str - -#define target_pid_to_str(PID) \ - i386lynx_pid_to_str (PID) -extern char *i386lynx_pid_to_str PARAMS ((int pid)); +#include "nm-lynx.h" #endif /* NM_I386LYNX_H */ diff --git a/gdb/config/i386/tm-i386lynx.h b/gdb/config/i386/tm-i386lynx.h index 8faf9ebe8ff..9ac3e8b959a 100644 --- a/gdb/config/i386/tm-i386lynx.h +++ b/gdb/config/i386/tm-i386lynx.h @@ -20,8 +20,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef TM_I386LYNX_H #define TM_I386LYNX_H -/* Override number of expected traps from sysv. */ -#define START_INFERIOR_TRAPS_EXPECTED 2 +#include "tm-lynx.h" /* Most definitions from sysv could be used. */ #include "i386/tm-i386v.h" @@ -31,6 +30,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #define SAVED_PC_AFTER_CALL i386lynx_saved_pc_after_call CORE_ADDR i386lynx_saved_pc_after_call (); -#include "coff-solib.h" /* COFF shared library support */ - #endif /* TM_I386LYNX_H */ diff --git a/gdb/config/m68k/m68klynx.mh b/gdb/config/m68k/m68klynx.mh index 4f2922c2a64..f0c680a9828 100644 --- a/gdb/config/m68k/m68klynx.mh +++ b/gdb/config/m68k/m68klynx.mh @@ -2,7 +2,7 @@ XM_FILE= xm-m68klynx.h XDEPFILES= NAT_FILE= nm-m68klynx.h -NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o m68kly-nat.o +NATDEPFILES= fork-child.o infptrace.o inftarg.o corelow.o lynx-nat.o REGEX=regex.o REGEX1=regex.o GDBSERVER_LIBS= -lbsd diff --git a/gdb/config/m68k/nm-m68klynx.h b/gdb/config/m68k/nm-m68klynx.h index 351e02bc1f9..d337808f4ae 100644 --- a/gdb/config/m68k/nm-m68klynx.h +++ b/gdb/config/m68k/nm-m68klynx.h @@ -20,46 +20,6 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef NM_M68KLYNX_H #define NM_M68KLYNX_H -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "thread.h" - -/* This is the amount to subtract from u.u_ar0 to get the offset in - the core file of the register values. */ - -#define KERNEL_U_ADDR USRSTACK - -#undef FLOAT_INFO /* No float info yet */ - -#define PTRACE_ARG3_TYPE char* - -/* Override copies of {fetch,store}_inferior_registers in infptrace.c. */ - -#define FETCH_INFERIOR_REGISTERS - -/* Thread ID of stopped thread. */ - -#define WIFTID(x) (((union wait *)&x)->w_tid) - -#define CHILD_WAIT - -extern int child_wait PARAMS ((int pid, int *status)); - -#if 0 /* need a sparclynx-nat.c to define this */ -/* Lynx needs a special definition of this so that we can - print out the pid and thread number seperatly. */ - -#undef target_pid_to_str -#define target_pid_to_str(PID) m68klynx_pid_to_str (PID) - -extern char *m68klynx_pid_to_str PARAMS ((int pid)); -#endif +#include "nm-lynx.h" #endif /* NM_M68KLYNX_H */ diff --git a/gdb/config/m68k/tm-m68klynx.h b/gdb/config/m68k/tm-m68klynx.h index a13c4b6a453..3c439a37501 100644 --- a/gdb/config/m68k/tm-m68klynx.h +++ b/gdb/config/m68k/tm-m68klynx.h @@ -20,6 +20,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ #ifndef TM_M68KLYNX_H #define TM_M68KLYNX_H +#include "tm-lynx.h" + /* If PC-2 contains this instruction, then we know what we are in a system call stub, and the return PC is is at SP+4, instead of SP. */ @@ -33,8 +35,4 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ /* Disable dumbshit alternate breakpoint mechanism needed by 68k stub. */ #undef REMOTE_BREAKPOINT -/* Include COFF shared library support. */ - -#include "coff-solib.h" - #endif /* TM_M68KLYNX_H */ diff --git a/gdb/config/nm-lynx.h b/gdb/config/nm-lynx.h new file mode 100644 index 00000000000..e0fffde58a0 --- /dev/null +++ b/gdb/config/nm-lynx.h @@ -0,0 +1,64 @@ +/* Native-dependent definitions for LynxOS. + Copyright 1993 Free Software Foundation, Inc. + +This file is part of GDB. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef NM_LYNX_H +#define NM_LYNX_H + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "thread.h" + +/* This is the amount to subtract from u.u_ar0 to get the offset in + the core file of the register values. */ + +#define KERNEL_U_ADDR USRSTACK + +#undef FLOAT_INFO /* No float info yet */ + +#define PTRACE_ARG3_TYPE char * + +/* Override copies of {fetch,store}_inferior_registers in infptrace.c. */ + +#define FETCH_INFERIOR_REGISTERS + +/* Thread ID of stopped thread. */ + +#define WIFTID(x) (((union wait *)&x)->w_tid) + +#define CHILD_WAIT + +extern int child_wait PARAMS ((int pid, int *status)); + +/* Lynx needs a special definition of this so that we can + print out the pid and thread number seperatly. */ + +#undef target_pid_to_str + +#define target_pid_to_str(PID) lynx_pid_to_str (PID) + +extern char *lynx_pid_to_str PARAMS ((int pid)); + +#endif /* NM_LYNX_H */ diff --git a/gdb/config/tm-lynx.h b/gdb/config/tm-lynx.h new file mode 100644 index 00000000000..f040bb6698e --- /dev/null +++ b/gdb/config/tm-lynx.h @@ -0,0 +1,28 @@ +/* Macro definitions for LynxOS targets. + Copyright 1993 Free Software Foundation, Inc. + +This file is part of GDB. + +This program is free software; you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation; either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#ifndef TM_LYNX_H +#define TM_LYNX_H + +/* Override number of expected traps from sysv. */ +#define START_INFERIOR_TRAPS_EXPECTED 2 + +#include "coff-solib.h" /* COFF shared library support */ + +#endif /* TM_LYNX_H */ -- 2.30.2