import gdb-1999-07-07 post reformat

1 files changed, 249 insertions, 231 deletions

diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index afc8d0c..a613549 100644
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -1,21 +1,22 @@
 /* Low level interface for debugging Solaris threads for GDB, the GNU debugger.
    Copyright 1996, 1997, 1998 Free Software Foundation, Inc.
 
-This file is part of GDB.
+   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 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.
+   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.  */
+   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.  */
 
 /* This module implements a sort of half target that sits between the
    machine-independent parts of GDB and the /proc interface (procfs.c) to
@@ -58,8 +59,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include <dlfcn.h>
 #include "gdbcmd.h"
 
-extern struct target_ops sol_thread_ops; /* Forward declaration */
-extern struct target_ops sol_core_ops; /* Forward declaration */
+extern struct target_ops sol_thread_ops;	/* Forward declaration */
+extern struct target_ops sol_core_ops;	/* Forward declaration */
 
 /* place to store core_ops before we overwrite it */
 static struct target_ops orig_core_ops;
@@ -68,8 +69,8 @@ struct target_ops sol_thread_ops;
 struct target_ops sol_core_ops;
 
 extern int procfs_suppress_run;
-extern struct target_ops procfs_ops; /* target vector for procfs.c */
-extern struct target_ops core_ops; /* target vector for corelow.c */
+extern struct target_ops procfs_ops;	/* target vector for procfs.c */
+extern struct target_ops core_ops;	/* target vector for corelow.c */
 extern char *procfs_pid_to_str PARAMS ((int pid));
 
 /* Note that these prototypes differ slightly from those used in procfs.c
@@ -91,25 +92,25 @@ extern void fill_fpregset PARAMS ((prfpregset_t *, int));
    for memory accesses.  */
 
 struct ps_prochandle
-{
-  pid_t pid;
-};
+  {
+    pid_t pid;
+  };
 
 struct string_map
-{
-  int num;
-  char *str;
-};
+  {
+    int num;
+    char *str;
+  };
 
 static struct ps_prochandle main_ph;
 static td_thragent_t *main_ta;
 static int sol_thread_active = 0;
 
-static struct cleanup * save_inferior_pid PARAMS ((void));
+static struct cleanup *save_inferior_pid PARAMS ((void));
 static void restore_inferior_pid PARAMS ((void *pid));
 static char *td_err_string PARAMS ((td_err_e errcode));
 static char *td_state_string PARAMS ((td_thr_state_e statecode));
-static int  thread_to_lwp PARAMS ((int thread_id, int default_lwp));
+static int thread_to_lwp PARAMS ((int thread_id, int default_lwp));
 static void sol_thread_resume PARAMS ((int pid, int step,
 				       enum target_signal signo));
 static int lwp_to_thread PARAMS ((int lwp));
@@ -132,65 +133,65 @@ static void init_sol_core_ops PARAMS ((void));
 static void
   (*p_td_log) (const int on_off);
 static td_err_e
-  (*p_td_ta_new) (const struct ps_prochandle *ph_p, td_thragent_t **ta_pp);
+  (*p_td_ta_new) (const struct ps_prochandle * ph_p, td_thragent_t ** ta_pp);
 static td_err_e
-  (*p_td_ta_delete) (td_thragent_t *ta_p);
+  (*p_td_ta_delete) (td_thragent_t * ta_p);
 static td_err_e
   (*p_td_init) (void);
 static td_err_e
-  (*p_td_ta_get_ph) (const td_thragent_t *ta_p, struct ps_prochandle **ph_pp);
+  (*p_td_ta_get_ph) (const td_thragent_t * ta_p, struct ps_prochandle ** ph_pp);
 static td_err_e
-  (*p_td_ta_get_nthreads) (const td_thragent_t *ta_p, int *nthread_p);
+  (*p_td_ta_get_nthreads) (const td_thragent_t * ta_p, int *nthread_p);
 static td_err_e
-  (*p_td_ta_tsd_iter) (const td_thragent_t *ta_p, td_key_iter_f *cb, void *cbdata_p);
+  (*p_td_ta_tsd_iter) (const td_thragent_t * ta_p, td_key_iter_f * cb, void *cbdata_p);
 static td_err_e
-  (*p_td_ta_thr_iter) (const td_thragent_t *ta_p, td_thr_iter_f *cb, void *cbdata_p, td_thr_state_e state,
-		       int ti_pri, sigset_t *ti_sigmask_p, unsigned ti_user_flags);
+  (*p_td_ta_thr_iter) (const td_thragent_t * ta_p, td_thr_iter_f * cb, void *cbdata_p, td_thr_state_e state,
+	       int ti_pri, sigset_t * ti_sigmask_p, unsigned ti_user_flags);
 static td_err_e
-  (*p_td_thr_validate) (const td_thrhandle_t *th_p);
+  (*p_td_thr_validate) (const td_thrhandle_t * th_p);
 static td_err_e
-  (*p_td_thr_tsd) (const td_thrhandle_t *th_p, const thread_key_t key, void **data_pp);
+  (*p_td_thr_tsd) (const td_thrhandle_t * th_p, const thread_key_t key, void **data_pp);
 static td_err_e
-  (*p_td_thr_get_info) (const td_thrhandle_t *th_p, td_thrinfo_t *ti_p);
+  (*p_td_thr_get_info) (const td_thrhandle_t * th_p, td_thrinfo_t * ti_p);
 static td_err_e
-  (*p_td_thr_getfpregs) (const td_thrhandle_t *th_p, prfpregset_t *fpregset);
+  (*p_td_thr_getfpregs) (const td_thrhandle_t * th_p, prfpregset_t * fpregset);
 static td_err_e
-  (*p_td_thr_getxregsize) (const td_thrhandle_t *th_p, int *xregsize);
+  (*p_td_thr_getxregsize) (const td_thrhandle_t * th_p, int *xregsize);
 static td_err_e
-  (*p_td_thr_getxregs) (const td_thrhandle_t *th_p, const caddr_t xregset);
+  (*p_td_thr_getxregs) (const td_thrhandle_t * th_p, const caddr_t xregset);
 static td_err_e
-  (*p_td_thr_sigsetmask) (const td_thrhandle_t *th_p, const sigset_t ti_sigmask);
+  (*p_td_thr_sigsetmask) (const td_thrhandle_t * th_p, const sigset_t ti_sigmask);
 static td_err_e
-  (*p_td_thr_setprio) (const td_thrhandle_t *th_p, const int ti_pri);
+  (*p_td_thr_setprio) (const td_thrhandle_t * th_p, const int ti_pri);
 static td_err_e
-  (*p_td_thr_setsigpending) (const td_thrhandle_t *th_p, const uchar_t ti_pending_flag, const sigset_t ti_pending);
+  (*p_td_thr_setsigpending) (const td_thrhandle_t * th_p, const uchar_t ti_pending_flag, const sigset_t ti_pending);
 static td_err_e
-  (*p_td_thr_setfpregs) (const td_thrhandle_t *th_p, const prfpregset_t *fpregset);
+  (*p_td_thr_setfpregs) (const td_thrhandle_t * th_p, const prfpregset_t * fpregset);
 static td_err_e
-  (*p_td_thr_setxregs) (const td_thrhandle_t *th_p, const caddr_t xregset);
+  (*p_td_thr_setxregs) (const td_thrhandle_t * th_p, const caddr_t xregset);
 static td_err_e
-  (*p_td_ta_map_id2thr) (const td_thragent_t *ta_p, thread_t tid, td_thrhandle_t *th_p);
+  (*p_td_ta_map_id2thr) (const td_thragent_t * ta_p, thread_t tid, td_thrhandle_t * th_p);
 static td_err_e
-  (*p_td_ta_map_lwp2thr) (const td_thragent_t *ta_p, lwpid_t lwpid, td_thrhandle_t *th_p);
+  (*p_td_ta_map_lwp2thr) (const td_thragent_t * ta_p, lwpid_t lwpid, td_thrhandle_t * th_p);
 static td_err_e
-  (*p_td_thr_getgregs) (const td_thrhandle_t *th_p, prgregset_t regset);
+  (*p_td_thr_getgregs) (const td_thrhandle_t * th_p, prgregset_t regset);
 static td_err_e
-  (*p_td_thr_setgregs) (const td_thrhandle_t *th_p, const prgregset_t regset);
+  (*p_td_thr_setgregs) (const td_thrhandle_t * th_p, const prgregset_t regset);
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	td_err_string - Convert a thread_db error code to a string
+   td_err_string - Convert a thread_db error code to a string
 
-SYNOPSIS
+   SYNOPSIS
 
-	char * td_err_string (errcode)
+   char * td_err_string (errcode)
 
-DESCRIPTION
+   DESCRIPTION
 
-	Return the thread_db error string associated with errcode.  If errcode
-	is unknown, then return a message.
+   Return the thread_db error string associated with errcode.  If errcode
+   is unknown, then return a message.
 
  */
 
@@ -199,29 +200,30 @@ td_err_string (errcode)
      td_err_e errcode;
 {
   static struct string_map
-    td_err_table[] = {
-      {TD_OK,		"generic \"call succeeded\""},
-      {TD_ERR,		"generic error."},
-      {TD_NOTHR,	"no thread can be found to satisfy query"},
-      {TD_NOSV,		"no synch. variable can be found to satisfy query"},
-      {TD_NOLWP,	"no lwp can be found to satisfy query"},
-      {TD_BADPH,	"invalid process handle"},
-      {TD_BADTH,	"invalid thread handle"},
-      {TD_BADSH,	"invalid synchronization handle"},
-      {TD_BADTA,	"invalid thread agent"},
-      {TD_BADKEY,	"invalid key"},
-      {TD_NOMSG,	"td_thr_event_getmsg() called when there was no message"},
-      {TD_NOFPREGS,	"FPU register set not available for given thread"},
-      {TD_NOLIBTHREAD,	"application not linked with libthread"},
-      {TD_NOEVENT,	"requested event is not supported"},
-      {TD_NOCAPAB,	"capability not available"},
-      {TD_DBERR,	"Debugger service failed"},
-      {TD_NOAPLIC,	"Operation not applicable to"},
-      {TD_NOTSD,	"No thread specific data for this thread"},
-      {TD_MALLOC,	"Malloc failed"},
-      {TD_PARTIALREG,	"Only part of register set was writen/read"},
-      {TD_NOXREGS,	"X register set not available for given thread"}
-    };
+    td_err_table[] =
+  {
+    {TD_OK, "generic \"call succeeded\""},
+    {TD_ERR, "generic error."},
+    {TD_NOTHR, "no thread can be found to satisfy query"},
+    {TD_NOSV, "no synch. variable can be found to satisfy query"},
+    {TD_NOLWP, "no lwp can be found to satisfy query"},
+    {TD_BADPH, "invalid process handle"},
+    {TD_BADTH, "invalid thread handle"},
+    {TD_BADSH, "invalid synchronization handle"},
+    {TD_BADTA, "invalid thread agent"},
+    {TD_BADKEY, "invalid key"},
+    {TD_NOMSG, "td_thr_event_getmsg() called when there was no message"},
+    {TD_NOFPREGS, "FPU register set not available for given thread"},
+    {TD_NOLIBTHREAD, "application not linked with libthread"},
+    {TD_NOEVENT, "requested event is not supported"},
+    {TD_NOCAPAB, "capability not available"},
+    {TD_DBERR, "Debugger service failed"},
+    {TD_NOAPLIC, "Operation not applicable to"},
+    {TD_NOTSD, "No thread specific data for this thread"},
+    {TD_MALLOC, "Malloc failed"},
+    {TD_PARTIALREG, "Only part of register set was writen/read"},
+    {TD_NOXREGS, "X register set not available for given thread"}
+  };
   const int td_err_size = sizeof td_err_table / sizeof (struct string_map);
   int i;
   static char buf[50];
@@ -229,7 +231,7 @@ td_err_string (errcode)
   for (i = 0; i < td_err_size; i++)
     if (td_err_table[i].num == errcode)
       return td_err_table[i].str;
-		  
+
   sprintf (buf, "Unknown thread_db error code: %d", errcode);
 
   return buf;
@@ -237,18 +239,18 @@ td_err_string (errcode)
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	td_state_string - Convert a thread_db state code to a string
+   td_state_string - Convert a thread_db state code to a string
 
-SYNOPSIS
+   SYNOPSIS
 
-	char * td_state_string (statecode)
+   char * td_state_string (statecode)
 
-DESCRIPTION
+   DESCRIPTION
 
-	Return the thread_db state string associated with statecode.  If
-	statecode is unknown, then return a message.
+   Return the thread_db state string associated with statecode.  If
+   statecode is unknown, then return a message.
 
  */
 
@@ -257,16 +259,17 @@ td_state_string (statecode)
      td_thr_state_e statecode;
 {
   static struct string_map
-    td_thr_state_table[] = {
-      {TD_THR_ANY_STATE, "any state"},
-      {TD_THR_UNKNOWN,	"unknown"},
-      {TD_THR_STOPPED,	"stopped"},
-      {TD_THR_RUN,	"run"},
-      {TD_THR_ACTIVE,	"active"},
-      {TD_THR_ZOMBIE,	"zombie"},
-      {TD_THR_SLEEP,	"sleep"},
-      {TD_THR_STOPPED_ASLEEP, "stopped asleep"}
-    };
+    td_thr_state_table[] =
+  {
+    {TD_THR_ANY_STATE, "any state"},
+    {TD_THR_UNKNOWN, "unknown"},
+    {TD_THR_STOPPED, "stopped"},
+    {TD_THR_RUN, "run"},
+    {TD_THR_ACTIVE, "active"},
+    {TD_THR_ZOMBIE, "zombie"},
+    {TD_THR_SLEEP, "sleep"},
+    {TD_THR_STOPPED_ASLEEP, "stopped asleep"}
+  };
   const int td_thr_state_table_size = sizeof td_thr_state_table / sizeof (struct string_map);
   int i;
   static char buf[50];
@@ -274,7 +277,7 @@ td_state_string (statecode)
   for (i = 0; i < td_thr_state_table_size; i++)
     if (td_thr_state_table[i].num == statecode)
       return td_thr_state_table[i].str;
-		  
+
   sprintf (buf, "Unknown thread_db state code: %d", statecode);
 
   return buf;
@@ -282,23 +285,23 @@ td_state_string (statecode)
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	thread_to_lwp - Convert a Posix or Solaris thread id to a LWP id.
+   thread_to_lwp - Convert a Posix or Solaris thread id to a LWP id.
 
-SYNOPSIS
+   SYNOPSIS
 
-	int thread_to_lwp (thread_id, default_lwp)
+   int thread_to_lwp (thread_id, default_lwp)
 
-DESCRIPTION
+   DESCRIPTION
 
-	This function converts a Posix or Solaris thread id to a lightweight
-	process id.  If thread_id is non-existent, that's an error.  If it's
-	an inactive thread, then we return default_lwp.
+   This function converts a Posix or Solaris thread id to a lightweight
+   process id.  If thread_id is non-existent, that's an error.  If it's
+   an inactive thread, then we return default_lwp.
 
-NOTES
+   NOTES
 
-	This function probably shouldn't call error()...
+   This function probably shouldn't call error()...
 
  */
 
@@ -312,19 +315,19 @@ thread_to_lwp (thread_id, default_lwp)
   td_err_e val;
 
   if (is_lwp (thread_id))
-    return thread_id;			/* It's already an LWP id */
+    return thread_id;		/* It's already an LWP id */
 
   /* It's a thread.  Convert to lwp */
 
   val = p_td_ta_map_id2thr (main_ta, GET_THREAD (thread_id), &th);
   if (val == TD_NOTHR)
-    return -1;		/* thread must have terminated */
+    return -1;			/* thread must have terminated */
   else if (val != TD_OK)
     error ("thread_to_lwp: td_ta_map_id2thr %s", td_err_string (val));
 
   val = p_td_thr_get_info (&th, &ti);
   if (val == TD_NOTHR)
-    return -1;		/* thread must have terminated */
+    return -1;			/* thread must have terminated */
   else if (val != TD_OK)
     error ("thread_to_lwp: td_thr_get_info: %s", td_err_string (val));
 
@@ -341,22 +344,22 @@ thread_to_lwp (thread_id, default_lwp)
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	lwp_to_thread - Convert a LWP id to a Posix or Solaris thread id.
+   lwp_to_thread - Convert a LWP id to a Posix or Solaris thread id.
 
-SYNOPSIS
+   SYNOPSIS
 
-	int lwp_to_thread (lwp_id)
+   int lwp_to_thread (lwp_id)
 
-DESCRIPTION
+   DESCRIPTION
 
-	This function converts a lightweight process id to a Posix or Solaris
-	thread id.  If thread_id is non-existent, that's an error.
+   This function converts a lightweight process id to a Posix or Solaris
+   thread id.  If thread_id is non-existent, that's an error.
 
-NOTES
+   NOTES
 
-	This function probably shouldn't call error()...
+   This function probably shouldn't call error()...
 
  */
 
@@ -378,7 +381,7 @@ lwp_to_thread (lwp)
 
   val = p_td_ta_map_lwp2thr (main_ta, GET_LWP (lwp), &th);
   if (val == TD_NOTHR)
-    return -1;		/* thread must have terminated */
+    return -1;			/* thread must have terminated */
   else if (val != TD_OK)
     error ("lwp_to_thread: td_ta_map_lwp2thr: %s.", td_err_string (val));
 
@@ -390,7 +393,7 @@ lwp_to_thread (lwp)
 
   val = p_td_thr_get_info (&th, &ti);
   if (val == TD_NOTHR)
-    return -1;		/* thread must have terminated */
+    return -1;			/* thread must have terminated */
   else if (val != TD_OK)
     error ("lwp_to_thread: td_thr_get_info: %s.", td_err_string (val));
 
@@ -399,28 +402,28 @@ lwp_to_thread (lwp)
 
 /*
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	save_inferior_pid - Save inferior_pid on the cleanup list
-	restore_inferior_pid - Restore inferior_pid from the cleanup list
+   save_inferior_pid - Save inferior_pid on the cleanup list
+   restore_inferior_pid - Restore inferior_pid from the cleanup list
 
-SYNOPSIS
+   SYNOPSIS
 
-	struct cleanup *save_inferior_pid ()
-	void restore_inferior_pid (int pid)
+   struct cleanup *save_inferior_pid ()
+   void restore_inferior_pid (int pid)
 
-DESCRIPTION
+   DESCRIPTION
 
-	These two functions act in unison to restore inferior_pid in
-	case of an error.
+   These two functions act in unison to restore inferior_pid in
+   case of an error.
 
-NOTES
+   NOTES
 
-	inferior_pid is a global variable that needs to be changed by many of
-	these routines before calling functions in procfs.c.  In order to
-	guarantee that inferior_pid gets restored (in case of errors), you
-	need to call save_inferior_pid before changing it.  At the end of the
-	function, you should invoke do_cleanups to restore it.
+   inferior_pid is a global variable that needs to be changed by many of
+   these routines before calling functions in procfs.c.  In order to
+   guarantee that inferior_pid gets restored (in case of errors), you
+   need to call save_inferior_pid before changing it.  At the end of the
+   function, you should invoke do_cleanups to restore it.
 
  */
 
@@ -428,7 +431,7 @@ NOTES
 static struct cleanup *
 save_inferior_pid ()
 {
-  return make_cleanup (restore_inferior_pid, (void*) inferior_pid);
+  return make_cleanup (restore_inferior_pid, (void *) inferior_pid);
 }
 
 static void
@@ -462,11 +465,11 @@ sol_thread_attach (args, from_tty)
 {
   procfs_ops.to_attach (args, from_tty);
   /* Must get symbols from solibs before libthread_db can run! */
-  SOLIB_ADD ((char *)0, from_tty, (struct target_ops *)0);
+  SOLIB_ADD ((char *) 0, from_tty, (struct target_ops *) 0);
   if (sol_thread_active)
     {
       printf_filtered ("sol-thread active.\n");
-      main_ph.pid = inferior_pid; /* Save for xfer_memory */
+      main_ph.pid = inferior_pid;	/* Save for xfer_memory */
       push_target (&sol_thread_ops);
       inferior_pid = lwp_to_thread (inferior_pid);
       if (inferior_pid == -1)
@@ -521,7 +524,7 @@ sol_thread_resume (pid, step, signo)
       if (pid == -2)		/* Inactive thread */
 	error ("This version of Solaris can't start inactive threads.");
       if (info_verbose && pid == -1)
-	warning ("Specified thread %d seems to have terminated", 
+	warning ("Specified thread %d seems to have terminated",
 		 GET_THREAD (save_pid));
     }
 
@@ -557,7 +560,7 @@ sol_thread_wait (pid, ourstatus)
       if (pid == -2)		/* Inactive thread */
 	error ("This version of Solaris can't start inactive threads.");
       if (info_verbose && pid == -1)
-	warning ("Specified thread %d seems to have terminated", 
+	warning ("Specified thread %d seems to have terminated",
 		 GET_THREAD (save_pid));
     }
 
@@ -604,7 +607,7 @@ sol_thread_fetch_registers (regno)
 #endif
 
   if (!is_thread (inferior_pid))
-    { /* LWP: pass the request on to procfs.c */
+    {				/* LWP: pass the request on to procfs.c */
       if (target_has_execution)
 	procfs_ops.to_fetch_registers (regno);
       else
@@ -683,7 +686,7 @@ sol_thread_store_registers (regno)
 #endif
 
   if (!is_thread (inferior_pid))
-    { /* LWP: pass the request on to procfs.c */
+    {				/* LWP: pass the request on to procfs.c */
       procfs_ops.to_store_registers (regno);
       return;
     }
@@ -701,7 +704,7 @@ sol_thread_store_registers (regno)
     {				/* Not writing all the regs */
       /* save new register value */
       char old_value[REGISTER_SIZE];
-      memcpy(old_value, & registers[REGISTER_BYTE(regno)], REGISTER_SIZE);
+      memcpy (old_value, &registers[REGISTER_BYTE (regno)], REGISTER_SIZE);
 
       val = p_td_thr_getgregs (&thandle, regset);
       if (val != TD_OK)
@@ -713,7 +716,7 @@ sol_thread_store_registers (regno)
 	       td_err_string (val));
 
       /* restore new register value */
-      memcpy(& registers[REGISTER_BYTE(regno)], old_value, REGISTER_SIZE);
+      memcpy (&registers[REGISTER_BYTE (regno)], old_value, REGISTER_SIZE);
 
 #if 0
 /* thread_db doesn't seem to handle this right */
@@ -775,14 +778,14 @@ sol_thread_xfer_memory (memaddr, myaddr, len, dowrite, target)
      char *myaddr;
      int len;
      int dowrite;
-     struct target_ops *target; /* ignored */
+     struct target_ops *target;	/* ignored */
 {
   int retval;
   struct cleanup *old_chain;
 
   old_chain = save_inferior_pid ();
 
-  if (is_thread (inferior_pid) ||		/* A thread */
+  if (is_thread (inferior_pid) ||	/* A thread */
       !target_thread_alive (inferior_pid))	/* An lwp, but not alive */
     inferior_pid = procfs_first_available ();	/* Find any live lwp.  */
   /* Note: don't need to call switch_to_thread; we're just reading memory.  */
@@ -832,7 +835,7 @@ sol_thread_create_inferior (exec_file, allargs, env)
 
   if (sol_thread_active && inferior_pid != 0)
     {
-      main_ph.pid = inferior_pid; /* Save for xfer_memory */
+      main_ph.pid = inferior_pid;	/* Save for xfer_memory */
 
       push_target (&sol_thread_ops);
 
@@ -903,17 +906,17 @@ sol_thread_can_run ()
 
 /* 
 
-LOCAL FUNCTION
+   LOCAL FUNCTION
 
-	sol_thread_alive     - test thread for "aliveness"
+   sol_thread_alive     - test thread for "aliveness"
 
-SYNOPSIS
+   SYNOPSIS
 
-	static bool sol_thread_alive (int pid);
+   static bool sol_thread_alive (int pid);
 
-DESCRIPTION
+   DESCRIPTION
 
-	returns true if thread still active in inferior.
+   returns true if thread still active in inferior.
 
  */
 
@@ -928,12 +931,13 @@ sol_thread_alive (pid)
 
       pid = GET_THREAD (pid);
       if ((val = p_td_ta_map_id2thr (main_ta, pid, &th)) != TD_OK)
-	return 0;	/* thread not found */
+	return 0;		/* thread not found */
       if ((val = p_td_thr_validate (&th)) != TD_OK)
-	return 0;	/* thread not valid */
-      return 1;		/* known thread: return true */
+	return 0;		/* thread not valid */
+      return 1;			/* known thread: return true */
     }
-  else			/* kernel thread (LWP): let procfs test it */
+  else
+    /* kernel thread (LWP): let procfs test it */
     {
       if (target_has_execution)
 	return procfs_ops.to_thread_alive (pid);
@@ -954,11 +958,11 @@ sol_thread_stop ()
 /* Various versions of <proc_service.h> have slightly
    different function prototypes.  In particular, we have
 
-      NEWER		    	OLDER
-      struct ps_prochandle *  	const struct ps_prochandle *
-      void*			char*
-      const void*		char*
-      int			size_t
+   NEWER                        OLDER
+   struct ps_prochandle *       const struct ps_prochandle *
+   void*                        char*
+   const void*          char*
+   int                  size_t
 
    Which one you have depends on solaris version and what
    patches you've applied.  On the theory that there are
@@ -967,14 +971,14 @@ sol_thread_stop ()
    appropriate typedefs here. */
 
 #ifdef PROC_SERVICE_IS_OLD
-typedef const struct ps_prochandle * gdb_ps_prochandle_t;
-typedef char * gdb_ps_read_buf_t;
-typedef char * gdb_ps_write_buf_t;
+typedef const struct ps_prochandle *gdb_ps_prochandle_t;
+typedef char *gdb_ps_read_buf_t;
+typedef char *gdb_ps_write_buf_t;
 typedef int gdb_ps_size_t;
 #else
-typedef struct ps_prochandle * gdb_ps_prochandle_t;
-typedef void * gdb_ps_read_buf_t;
-typedef const void * gdb_ps_write_buf_t;
+typedef struct ps_prochandle *gdb_ps_prochandle_t;
+typedef void *gdb_ps_read_buf_t;
+typedef const void *gdb_ps_write_buf_t;
 typedef size_t gdb_ps_size_t;
 #endif
 
@@ -1010,7 +1014,7 @@ ps_lcontinue (gdb_ps_prochandle_t ph, lwpid_t lwpid)
 
 ps_err_e
 ps_pglobal_lookup (gdb_ps_prochandle_t ph, const char *ld_object_name,
-		   const char *ld_symbol_name, paddr_t *ld_symbol_addr)
+		   const char *ld_symbol_name, paddr_t * ld_symbol_addr)
 {
   struct minimal_symbol *ms;
 
@@ -1034,7 +1038,7 @@ rw_common (int dowrite, const struct ps_prochandle *ph, paddr_t addr,
 
   old_chain = save_inferior_pid ();
 
-  if (is_thread (inferior_pid) ||		/* A thread */
+  if (is_thread (inferior_pid) ||	/* A thread */
       !target_thread_alive (inferior_pid))	/* An lwp, but not alive */
     inferior_pid = procfs_first_available ();	/* Find any live lwp.  */
   /* Note: don't need to call switch_to_thread; we're just reading memory.  */
@@ -1079,7 +1083,7 @@ ps_err_e
 ps_pdwrite (gdb_ps_prochandle_t ph, paddr_t addr,
 	    gdb_ps_write_buf_t buf, gdb_ps_size_t size)
 {
-  return rw_common (1, ph, addr, (char*) buf, size);
+  return rw_common (1, ph, addr, (char *) buf, size);
 }
 
 ps_err_e
@@ -1093,7 +1097,7 @@ ps_err_e
 ps_ptwrite (gdb_ps_prochandle_t ph, paddr_t addr,
 	    gdb_ps_write_buf_t buf, gdb_ps_size_t size)
 {
-  return rw_common (1, ph, addr, (char*) buf, size);
+  return rw_common (1, ph, addr, (char *) buf, size);
 }
 
 /* Get integer regs */
@@ -1107,7 +1111,7 @@ ps_lgetregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
   old_chain = save_inferior_pid ();
 
   inferior_pid = BUILD_LWP (lwpid, PIDGET (inferior_pid));
-  
+
   if (target_has_execution)
     procfs_ops.to_fetch_registers (-1);
   else
@@ -1130,7 +1134,7 @@ ps_lsetregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
   old_chain = save_inferior_pid ();
 
   inferior_pid = BUILD_LWP (lwpid, PIDGET (inferior_pid));
-  
+
   supply_gregset (gregset);
   if (target_has_execution)
     procfs_ops.to_store_registers (-1);
@@ -1143,7 +1147,7 @@ ps_lsetregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
 }
 
 void
-ps_plog (const char *fmt, ...)
+ps_plog (const char *fmt,...)
 {
   va_list args;
 
@@ -1230,7 +1234,7 @@ ps_lsetxregs (gdb_ps_prochandle_t ph, lwpid_t lwpid, caddr_t xregset)
 
 ps_err_e
 ps_lgetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
-	       prfpregset_t *fpregset)
+	       prfpregset_t * fpregset)
 {
   struct cleanup *old_chain;
 
@@ -1253,14 +1257,14 @@ ps_lgetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
 
 ps_err_e
 ps_lsetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
-	       const prfpregset_t *fpregset)
+	       const prfpregset_t * fpregset)
 {
   struct cleanup *old_chain;
 
   old_chain = save_inferior_pid ();
 
   inferior_pid = BUILD_LWP (lwpid, PIDGET (inferior_pid));
-  
+
   supply_fpregset (fpregset);
   if (target_has_execution)
     procfs_ops.to_store_registers (-1);
@@ -1327,7 +1331,7 @@ ps_lgetLDT (gdb_ps_prochandle_t ph, lwpid_t lwpid,
 
   /* LDT not found.  */
   return PS_ERR;
-}        
+}
 #endif /* TM_I386SOL2_H */
 
 /* Convert a pid to printable form. */
@@ -1369,7 +1373,7 @@ solaris_pid_to_str (pid)
    kernel) thread. */
 
 static int
-sol_find_new_threads_callback(th, ignored)
+sol_find_new_threads_callback (th, ignored)
      const td_thrhandle_t *th;
      void *ignored;
 {
@@ -1377,13 +1381,13 @@ sol_find_new_threads_callback(th, ignored)
   td_thrinfo_t ti;
   int pid;
 
-  if ((retval = p_td_thr_get_info(th, &ti)) != TD_OK)
+  if ((retval = p_td_thr_get_info (th, &ti)) != TD_OK)
     {
       return -1;
     }
-  pid = BUILD_THREAD(ti.ti_tid, PIDGET(inferior_pid));
-  if (!in_thread_list(pid))
-    add_thread(pid);
+  pid = BUILD_THREAD (ti.ti_tid, PIDGET (inferior_pid));
+  if (!in_thread_list (pid))
+    add_thread (pid);
 
   return 0;
 }
@@ -1397,10 +1401,10 @@ sol_find_new_threads ()
 
   if (inferior_pid == -1)
     {
-      printf_filtered("No process.\n");
+      printf_filtered ("No process.\n");
       return;
     }
-  p_td_ta_thr_iter (main_ta, sol_find_new_threads_callback, (void *)0,
+  p_td_ta_thr_iter (main_ta, sol_find_new_threads_callback, (void *) 0,
 		    TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY,
 		    TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS);
 }
@@ -1440,7 +1444,7 @@ sol_core_files_info (t)
    gets called once for each Solaris thread (ie. not kernel thread) in the 
    inferior.  Print anything interesting that we can think of.  */
 
-static int 
+static int
 info_cb (th, s)
      const td_thrhandle_t *th;
      void *s;
@@ -1451,20 +1455,34 @@ info_cb (th, s)
 
   if ((ret = p_td_thr_get_info (th, &ti)) == TD_OK)
     {
-      printf_filtered ("%s thread #%d, lwp %d, ", 
-		       ti.ti_type == TD_THR_SYSTEM ? "system" : "user  ", 
+      printf_filtered ("%s thread #%d, lwp %d, ",
+		       ti.ti_type == TD_THR_SYSTEM ? "system" : "user  ",
 		       ti.ti_tid, ti.ti_lid);
-      switch (ti.ti_state) {
+      switch (ti.ti_state)
+	{
 	default:
-	case TD_THR_UNKNOWN: printf_filtered ("<unknown state>");	break;
-	case TD_THR_STOPPED: printf_filtered ("(stopped)");	break;
-	case TD_THR_RUN:     printf_filtered ("(run)    ");	break;
-	case TD_THR_ACTIVE:  printf_filtered ("(active) ");	break;
-	case TD_THR_ZOMBIE:  printf_filtered ("(zombie) ");	break;
-	case TD_THR_SLEEP:   printf_filtered ("(asleep) ");	break;
-	case TD_THR_STOPPED_ASLEEP: 
-	  printf_filtered ("(stopped asleep)");			break;
-      }
+	case TD_THR_UNKNOWN:
+	  printf_filtered ("<unknown state>");
+	  break;
+	case TD_THR_STOPPED:
+	  printf_filtered ("(stopped)");
+	  break;
+	case TD_THR_RUN:
+	  printf_filtered ("(run)    ");
+	  break;
+	case TD_THR_ACTIVE:
+	  printf_filtered ("(active) ");
+	  break;
+	case TD_THR_ZOMBIE:
+	  printf_filtered ("(zombie) ");
+	  break;
+	case TD_THR_SLEEP:
+	  printf_filtered ("(asleep) ");
+	  break;
+	case TD_THR_STOPPED_ASLEEP:
+	  printf_filtered ("(stopped asleep)");
+	  break;
+	}
       /* Print thr_create start function: */
       if (ti.ti_startfunc != 0)
 	if (msym = lookup_minimal_symbol_by_pc (ti.ti_startfunc))
@@ -1486,7 +1504,7 @@ info_cb (th, s)
   else
     warning ("info sol-thread: failed to get info for thread.");
 
-  return 0;    
+  return 0;
 }
 
 /* List some state about each Solaris user thread in the inferior.  */
@@ -1496,7 +1514,7 @@ info_solthreads (args, from_tty)
      char *args;
      int from_tty;
 {
-  p_td_ta_thr_iter (main_ta, info_cb, args, 
+  p_td_ta_thr_iter (main_ta, info_cb, args,
 		    TD_THR_ANY_STATE, TD_THR_LOWEST_PRIORITY,
 		    TD_SIGNO_MASK, TD_THR_ANY_USER_FLAGS);
 }
@@ -1560,22 +1578,22 @@ init_sol_thread_ops ()
 static void
 init_sol_core_ops ()
 {
-  sol_core_ops.to_shortname  = "solaris-core";
-  sol_core_ops.to_longname  = "Solaris core threads and pthread.";
-  sol_core_ops.to_doc  = "Solaris threads and pthread support for core files.";
-  sol_core_ops.to_open  = sol_core_open;
-  sol_core_ops.to_close  = sol_core_close;
-  sol_core_ops.to_attach  = sol_thread_attach;
-  sol_core_ops.to_detach  = sol_core_detach;
+  sol_core_ops.to_shortname = "solaris-core";
+  sol_core_ops.to_longname = "Solaris core threads and pthread.";
+  sol_core_ops.to_doc = "Solaris threads and pthread support for core files.";
+  sol_core_ops.to_open = sol_core_open;
+  sol_core_ops.to_close = sol_core_close;
+  sol_core_ops.to_attach = sol_thread_attach;
+  sol_core_ops.to_detach = sol_core_detach;
   /* sol_core_ops.to_resume  = 0; */
-  /* sol_core_ops.to_wait  = 0;	 */
-  sol_core_ops.to_fetch_registers  = sol_thread_fetch_registers;
+  /* sol_core_ops.to_wait  = 0;  */
+  sol_core_ops.to_fetch_registers = sol_thread_fetch_registers;
   /* sol_core_ops.to_store_registers  = 0; */
   /* sol_core_ops.to_prepare_to_store  = 0; */
-  sol_core_ops.to_xfer_memory  = sol_thread_xfer_memory;
-  sol_core_ops.to_files_info  = sol_core_files_info;
-  sol_core_ops.to_insert_breakpoint  = ignore;
-  sol_core_ops.to_remove_breakpoint  = ignore;
+  sol_core_ops.to_xfer_memory = sol_thread_xfer_memory;
+  sol_core_ops.to_files_info = sol_core_files_info;
+  sol_core_ops.to_insert_breakpoint = ignore;
+  sol_core_ops.to_remove_breakpoint = ignore;
   /* sol_core_ops.to_terminal_init  = 0; */
   /* sol_core_ops.to_terminal_inferior  = 0; */
   /* sol_core_ops.to_terminal_ours_for_output  = 0; */
@@ -1584,17 +1602,17 @@ init_sol_core_ops ()
   /* sol_core_ops.to_kill  = 0; */
   /* sol_core_ops.to_load  = 0; */
   /* sol_core_ops.to_lookup_symbol  = 0; */
-  sol_core_ops.to_create_inferior  = sol_thread_create_inferior;
-  sol_core_ops.to_stratum  = core_stratum;
-  sol_core_ops.to_has_all_memory  = 0;
-  sol_core_ops.to_has_memory  = 1;
-  sol_core_ops.to_has_stack  = 1;
-  sol_core_ops.to_has_registers  = 1;
-  sol_core_ops.to_has_execution  = 0;
-  sol_core_ops.to_has_thread_control  = tc_none;
-  sol_core_ops.to_sections  = 0;
-  sol_core_ops.to_sections_end  = 0;
-  sol_core_ops.to_magic  = OPS_MAGIC;
+  sol_core_ops.to_create_inferior = sol_thread_create_inferior;
+  sol_core_ops.to_stratum = core_stratum;
+  sol_core_ops.to_has_all_memory = 0;
+  sol_core_ops.to_has_memory = 1;
+  sol_core_ops.to_has_stack = 1;
+  sol_core_ops.to_has_registers = 1;
+  sol_core_ops.to_has_execution = 0;
+  sol_core_ops.to_has_thread_control = tc_none;
+  sol_core_ops.to_sections = 0;
+  sol_core_ops.to_sections_end = 0;
+  sol_core_ops.to_magic = OPS_MAGIC;
 }
 
 /* we suppress the call to add_target of core_ops in corelow because
@@ -1647,16 +1665,16 @@ _initialize_sol_thread ()
 
   procfs_suppress_run = 1;
 
-  add_cmd ("sol-threads", class_maintenance, info_solthreads, 
-	    "Show info on Solaris user threads.\n", &maintenanceinfolist);
+  add_cmd ("sol-threads", class_maintenance, info_solthreads,
+	   "Show info on Solaris user threads.\n", &maintenanceinfolist);
 
-  memcpy(&orig_core_ops, &core_ops, sizeof (struct target_ops));
-  memcpy(&core_ops, &sol_core_ops, sizeof (struct target_ops));
+  memcpy (&orig_core_ops, &core_ops, sizeof (struct target_ops));
+  memcpy (&core_ops, &sol_core_ops, sizeof (struct target_ops));
   add_target (&core_ops);
 
   return;
 
- die:
+die:
 
   fprintf_unfiltered (gdb_stderr, "[GDB will not be able to debug user-mode threads: %s]\n", dlerror ());
 
@@ -1664,7 +1682,7 @@ _initialize_sol_thread ()
     dlclose (dlhandle);
 
   /* allow the user to debug non-threaded core files */
-  add_target(&core_ops);
+  add_target (&core_ops);
 
   return;
 }