From 110be7c974fa48040bd00ed8a7b154cca1ba8cb3 Mon Sep 17 00:00:00 2001 From: Mark Kettenis Date: Sun, 3 Sep 2000 11:51:49 +0000 Subject: [PATCH] * gdb_proc_service.h: Add copyright notice. Protect against multiple inclusion. Add fix for broken prfpregset_t here. (struct ps_prochandle): Declare here. [HAVE_PROC_SERVICE_H]: Include . [!HAVE_PROC_SERVICE_H]: Include "gregset.h", define prgregset_t and prfpregset_t in terms of gdb_gregset_t and gdb_fpregset_t if necessary. * lin-thread.c: Unconditionally include "gdb_proc_service.h". Remove fix for broken prfpregset_t here. (struct ps_prochandle): Don't declare here. --- gdb/ChangeLog | 12 ++++++ gdb/gdb_proc_service.h | 87 +++++++++++++++++++++++++++++++++--------- gdb/lin-thread.c | 18 --------- 3 files changed, 82 insertions(+), 35 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d8bbac2ca0f..9d07f4f02ce 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,17 @@ 2000-09-03 Mark Kettenis + * gdb_proc_service.h: Add copyright notice. + Protect against multiple inclusion. + Add fix for broken prfpregset_t here. + (struct ps_prochandle): Declare here. + [HAVE_PROC_SERVICE_H]: Include . + [!HAVE_PROC_SERVICE_H]: Include "gregset.h", define prgregset_t + and prfpregset_t in terms of gdb_gregset_t and gdb_fpregset_t if + necessary. + * lin-thread.c: Unconditionally include "gdb_proc_service.h". + Remove fix for broken prfpregset_t here. + (struct ps_prochandle): Don't declare here. + * MAINTAINERS: Add myself as threads co-maintainer. 2000-09-01 David Anderson diff --git a/gdb/gdb_proc_service.h b/gdb/gdb_proc_service.h index 1f1ff9e6f05..e77cdf6cd80 100644 --- a/gdb/gdb_proc_service.h +++ b/gdb/gdb_proc_service.h @@ -1,19 +1,51 @@ -typedef enum { - PS_OK, /* generic "call succeeded" */ - PS_ERR, /* generic. */ - PS_BADPID, /* bad process handle */ - PS_BADLID, /* bad lwp identifier */ - PS_BADADDR, /* bad address */ - PS_NOSYM, /* p_lookup() could not find given symbol */ - PS_NOFREGS - /* - * FPU register set not available for given - * lwp - */ -} ps_err_e; +/* replacement for systems that don't have it. + Copyright 2000 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef GDB_PROC_SERVICE_H +#define GDB_PROC_SERVICE_H + +#include + +#ifdef HAVE_PROC_SERVICE_H +#include +#else + +#ifdef HAVE_SYS_PROCFS_H +#include +#endif + +#include "gregset.h" + +typedef enum +{ + PS_OK, /* Success. */ + PS_ERR, /* Generic error. */ + PS_BADPID, /* Bad process handle. */ + PS_BADLID, /* Bad LWP id. */ + PS_BADADDR, /* Bad address. */ + PS_NOSYM, /* Symbol not found. */ + PS_NOFREGS /* FPU register set not available. */ +} ps_err_e; #ifndef HAVE_LWPID_T -typedef unsigned int lwpid_t; +typedef unsigned int lwpid_t; #endif typedef unsigned long paddr_t; @@ -23,11 +55,32 @@ typedef unsigned long psaddr_t; #endif #ifndef HAVE_PRGREGSET_T -typedef gregset_t prgregset_t; /* BOGUS BOGUS BOGUS */ +typedef gdb_gregset_t prgregset_t; #endif #ifndef HAVE_PRFPREGSET_T -typedef fpregset_t prfpregset_t; /* BOGUS BOGUS BOGUS */ +typedef gdb_fpregset_t prfpregset_t; +#endif + +#endif /* HAVE_PROC_SERVICE_H */ + +/* Fix-up some broken systems. */ + +/* Unfortunately glibc 2.1.3 was released with a broken prfpregset_t + type. We let configure check for this lossage, and make + appropriate typedefs here. */ + +#ifdef PRFPREGSET_T_BROKEN +typedef gdb_fpregset_t gdb_prfpregset_t; +#else +typedef prfpregset_t gdb_prfpregset_t; #endif -struct ps_prochandle; /* user defined. */ +/* Structure that identifies the target process. */ +struct ps_prochandle +{ + /* The process id is all we need. */ + pid_t pid; +}; + +#endif /* gdb_proc_service.h */ diff --git a/gdb/lin-thread.c b/gdb/lin-thread.c index dd06e5d2189..37d8ef40da4 100644 --- a/gdb/lin-thread.c +++ b/gdb/lin-thread.c @@ -110,11 +110,7 @@ #include #endif -#if defined (HAVE_PROC_SERVICE_H) -#include /* defines incoming API (ps_* callbacks) */ -#else #include "gdb_proc_service.h" -#endif #if defined HAVE_STDINT_H /* Pre-5.2 systems don't have this header */ #if defined (HAVE_THREAD_DB_H) @@ -173,16 +169,6 @@ typedef const void *gdb_ps_write_buf_t; typedef size_t gdb_ps_size_t; #endif -/* Unfortunately glibc 2.1.3 was released with a broken prfpregset_t - type. We let configure check for this lossage, and make - appropriate typedefs here. */ - -#ifdef PRFPREGSET_T_BROKEN -typedef elf_fpregset_t gdb_prfpregset_t; -#else -typedef prfpregset_t gdb_prfpregset_t; -#endif - /* * proc_service callback functions, called by thread_db. */ @@ -321,10 +307,6 @@ static void restore_inferior_pid (void *saved_pid); static char *thr_err_string (td_err_e); static char *thr_state_string (td_thr_state_e); -struct ps_prochandle { - int pid; -}; - struct ps_prochandle main_prochandle; td_thragent_t * main_threadagent; -- 2.30.2