diff --git a/gdb/ChangeLog b/gdb/ChangeLog index db9584491f..51b44a59ab 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2002-11-08 Mark Kettenis + + * config/i386/tm-i386v42mp.h: Remove file. Move its contents, + except the inclusion of "i386/tm-i386.h", to... + * config/i386/nm-i386v42mp.h: ...here. + * config/i386/i386v42mp.mt (TM_FILE): Set to tm-i386.h. + 2002-11-08 Andrew Cagney * Makefile.in (frame.o): Update dependencies. diff --git a/gdb/config/i386/i386v42mp.mt b/gdb/config/i386/i386v42mp.mt index 0b2dea8af0..1a0ac88d81 100644 --- a/gdb/config/i386/i386v42mp.mt +++ b/gdb/config/i386/i386v42mp.mt @@ -1,3 +1,3 @@ # Target: Intel 386 running SVR4.2MP TDEPFILES= i386-tdep.o i387-tdep.o -TM_FILE= tm-i386v42mp.h +TM_FILE= tm-i386.h diff --git a/gdb/config/i386/nm-i386v42mp.h b/gdb/config/i386/nm-i386v42mp.h index 7ded36148f..f6fced506e 100644 --- a/gdb/config/i386/nm-i386v42mp.h +++ b/gdb/config/i386/nm-i386v42mp.h @@ -20,4 +20,73 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef NM_I386V42MP_H +#define NM_I386V42MP_H + #include "config/nm-sysv4.h" + +/* define to select for other sysv4.2mp weirdness (see procfs.c) */ + +#define UNIXWARE + +#if 0 +/* The following macros extract process and lwp/thread ids from a + composite id. + + For consistency with UnixWare core files, allocate bits 0-15 for + process ids and bits 16 and up for lwp ids. Reserve bit 31 for + negative return values to indicate exceptions, and use bit 30 as a + flag to indicate a user-mode thread, leaving 14 bits for lwp + ids. */ + +/* Number of bits in composite id allocated to process number. */ +#define PIDBITS 16 + +/* Return the process id stored in composite PID. */ +#define PIDGET(PID) (((PID) & ((1 << PIDBITS) - 1))) + +/* Return the thread or lwp id stored in composite PID. */ +#define TIDGET(PID) (((PID) & 0x3fffffff) >> PIDBITS) +#define LIDGET(PID) TIDGET(PID) + +/* Construct a composite id from lwp LID and the process portion of + composite PID. */ +#define MERGEPID(PID, LID) (PIDGET(PID) | ((LID) << PIDBITS)) +#define MKLID(PID, LID) MERGEPID(PID, LID) + +/* Construct a composite id from thread TID and the process portion of + composite PID. */ +#define MKTID(PID, TID) (MERGEPID(PID, TID) | 0x40000000) + +/* Return whether PID contains a user-space thread id. */ +#define ISTID(PID) ((PID) & 0x40000000) +#endif + +/* New definitions of the ptid stuff. Due to the way the + code is structured in uw-thread.c, I'm overloading the thread id + and lwp id onto the lwp field. The tid field is used to indicate + whether the lwp is a tid or not. + + FIXME: Check that core file support is not broken. (See original + #if 0'd comments above.) + FIXME: Restructure uw-thread.c so that the struct ptid fields + can be used as intended. */ + +/* Return the process id stored in composite PID. */ +#define PIDGET(PID) (ptid_get_pid (PID)) + +/* Return the thread or lwp id stored in composite PID. */ +#define TIDGET(PID) (ptid_get_lwp (PID)) +#define LIDGET(PID) TIDGET(PID) + +#define MERGEPID(PID, LID) (ptid_build ((PID), (LID), 0)) +#define MKLID(PID, LID) (ptid_build ((PID), (LID), 0)) + +/* Construct a composite id from thread TID and the process portion of + composite PID. */ +#define MKTID(PID, TID) (ptid_build ((PID), (TID), 1)) + +/* Return whether PID contains a user-space thread id. */ +#define ISTID(PID) (ptid_get_tid (PID)) + +#endif /* NM_I386V42MP_H */ diff --git a/gdb/config/i386/tm-i386v42mp.h b/gdb/config/i386/tm-i386v42mp.h deleted file mode 100644 index 527fdbb122..0000000000 --- a/gdb/config/i386/tm-i386v42mp.h +++ /dev/null @@ -1,93 +0,0 @@ -/* Macro definitions for GDB on an Intel i386 running SVR4.2MP - Copyright 1991, 1994, 1997, 1999, 2000 Free Software Foundation, Inc. - Written by Fred Fish at Cygnus Support (fnf@cygnus.com) - - 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., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ - -#ifndef TM_I386V42MP_H -#define TM_I386V42MP_H 1 - -/* pick up more generic x86 sysv4 stuff */ - -#include "i386/tm-i386.h" - -/* define to select for other sysv4.2mp weirdness (see procfs.c) */ - -#define UNIXWARE - -#if 0 -/* The following macros extract process and lwp/thread ids from a - composite id. - - For consistency with UnixWare core files, allocate bits 0-15 for - process ids and bits 16 and up for lwp ids. Reserve bit 31 for - negative return values to indicate exceptions, and use bit 30 as a - flag to indicate a user-mode thread, leaving 14 bits for lwp - ids. */ - -/* Number of bits in composite id allocated to process number. */ -#define PIDBITS 16 - -/* Return the process id stored in composite PID. */ -#define PIDGET(PID) (((PID) & ((1 << PIDBITS) - 1))) - -/* Return the thread or lwp id stored in composite PID. */ -#define TIDGET(PID) (((PID) & 0x3fffffff) >> PIDBITS) -#define LIDGET(PID) TIDGET(PID) - -/* Construct a composite id from lwp LID and the process portion of - composite PID. */ -#define MERGEPID(PID, LID) (PIDGET(PID) | ((LID) << PIDBITS)) -#define MKLID(PID, LID) MERGEPID(PID, LID) - -/* Construct a composite id from thread TID and the process portion of - composite PID. */ -#define MKTID(PID, TID) (MERGEPID(PID, TID) | 0x40000000) - -/* Return whether PID contains a user-space thread id. */ -#define ISTID(PID) ((PID) & 0x40000000) -#endif - -/* New definitions of the ptid stuff. Due to the way the - code is structured in uw-thread.c, I'm overloading the thread id - and lwp id onto the lwp field. The tid field is used to indicate - whether the lwp is a tid or not. - - FIXME: Check that core file support is not broken. (See original - #if 0'd comments above.) - FIXME: Restructure uw-thread.c so that the struct ptid fields - can be used as intended. */ - -/* Return the process id stored in composite PID. */ -#define PIDGET(PID) (ptid_get_pid (PID)) - -/* Return the thread or lwp id stored in composite PID. */ -#define TIDGET(PID) (ptid_get_lwp (PID)) -#define LIDGET(PID) TIDGET(PID) - -#define MERGEPID(PID, LID) (ptid_build ((PID), (LID), 0)) -#define MKLID(PID, LID) (ptid_build ((PID), (LID), 0)) - -/* Construct a composite id from thread TID and the process portion of - composite PID. */ -#define MKTID(PID, TID) (ptid_build ((PID), (TID), 1)) - -/* Return whether PID contains a user-space thread id. */ -#define ISTID(PID) (ptid_get_tid (PID)) - -#endif /* ifndef TM_I386V42MP_H */