* So many patches have been posted recently on the mailing list and

	because we were unable to find correct solution to compile on various
	linux distros (due to rpcgen incompatibilities), and because the coding
	style of rdbg was rather inconsistant among various pieces of code, I
	decided to:
	    1) make some cleaning regarding global coding style (using
	       indent + manual edits),
	    2) incorporate/review the paches send by various people
	       (S. Holford, T. Strauman),
	    3) Fix the bug due to varying rpcgen code generation
	       in remdeb_svc.c,
	    4) Remove some dead code,
	    5) Apply a patches enabling to call enterRdbg imediately
	       after rdbg initialization is done,

	NB : the paches is huge but it is mainly due to coding styke chnages.
	Only few lines of codes have been really changed and they do not impact
	rdbg functionnality (AFAIKT).

	* include/rdbg/servrpc.h, include/rdbg/i386/rdbg_f.h,
	include/rdbg/m68k/rdbg_f.h, include/rdbg/powerpc/rdbg_f.h,
	src/_servtgt.c, src/awk.svc, src/excep.c, src/ptrace.c, src/rdbg.c,
	src/remdeb.x, src/servbkpt.c, src/servcon.c, src/servrpc.c,
	src/servtgt.c, src/servtsp.c, src/servutil.c, src/i386/excep_f.c,
	src/i386/rdbg_f.c, src/i386/any/Makefile.am, src/i386/any/remdeb.h,
	src/i386/any/remdeb_svc.c, src/i386/any/remdeb_xdr.c,
	src/m68k/excep_f.c, src/m68k/rdbg_f.c, src/m68k/any/Makefile.am,
	src/m68k/any/remdeb.h, src/m68k/any/remdeb_svc.c,
	src/m68k/any/remdeb_xdr.c, src/powerpc/excep_f.c, src/powerpc/rdbg_f.c,
	src/powerpc/new_exception_processing/Makefile.am,
	src/powerpc/new_exception_processing/remdeb.h,
	src/powerpc/new_exception_processing/remdeb_svc.c,
	src/powerpc/new_exception_processing/remdeb_xdr.c: Modified.

1 files changed, 173 insertions, 161 deletions

diff --git a/c/src/librdbg/src/_servtgt.c b/c/src/librdbg/src/_servtgt.c
index 02e14a0ff2..1ae011542b 100644
--- a/c/src/librdbg/src/_servtgt.c
+++ b/c/src/librdbg/src/_servtgt.c
@@ -5,16 +5,15 @@
  ============================================================================
 */
 
-
-#include <string.h>		
+#include <string.h>
 #include <rtems.h>
 #include <rtems/error.h>
 
 #include <rdbg/rdbg.h>
 #include <rdbg/rdbg_f.h>
-#include <rdbg/servrpc.h>	
+#include <rdbg/servrpc.h>
 #include <errno.h>
-#include <sys/socket.h>		
+#include <sys/socket.h>
 #include <assert.h>
 #include <rtems/score/cpu.h>
 
@@ -29,6 +28,7 @@ extern int errno;
 rtems_id eventTaskId;
 rtems_id serializeSemId;
 rtems_id wakeupEventSemId;
+rtems_id debugId;
 
 CPU_Exception_frame Idle_frame;
 
@@ -36,59 +36,56 @@ CPU_Exception_frame Idle_frame;
    TgtRealPtrace - lowest level ptrace() wrapper
    ----------------------------------------------------------------- */
 
-    int
-TgtRealPtrace(int req, PID aid, char* addr, int d, void* addr2)
+  int
+TgtRealPtrace (int req, PID aid, char *addr, int d, void *addr2)
 {
-    return ptrace(req, aid, addr, d, addr2);
+  return ptrace (req, aid, addr, d, addr2);
 }
 
-
-
 /* -----------------------------------------------------------------------
    TgtChange() is called when the system stops.
    It informs the generic layers must be informed of
    that fact. 
    ----------------------------------------------------------------------- */
 
-    static int
-TgtChange (PID pid, CPU_Exception_frame* ctx, int status)
+  static int
+TgtChange (PID pid, CPU_Exception_frame * ctx, int status)
 {
 
-    if (TgtHandleChildChange (pid, &status, NULL, ctx)) {
-      TgtNotifyWaitChange (pid, status, -1);
-    }
+  if (TgtHandleChildChange (pid, &status, NULL, ctx)) {
+    TgtNotifyWaitChange (pid, status, -1);
+  }
 
-    return 0;
+  return 0;
 }
 
 /* -----------------------------------------------------------------------
    eventTask
    ----------------------------------------------------------------------- */
 
-rtems_task eventTask( rtems_task_argument pid)
+  rtems_task
+eventTask (rtems_task_argument pid)
 {
   Exception_context *ctx;
 
   DPRINTF (("event task: pid %d\n", pid));
 
-  
   /*
    * we spend all our time waiting for a semaphore.
    * If wait change, we send info
    */
-  
-  for (;;){	
+
+  for (;;) {
     DPRINTF (("Event Task: wait event\n"));
-    rtems_semaphore_obtain(wakeupEventSemId, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
+    rtems_semaphore_obtain (wakeupEventSemId, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
     DPRINTF (("Event Task: wake up !!!!!!!!!!!!!\n"));
-    
+
     errno = 0;
-    ctx = GetExceptCtx(currentTargetThread);
+    ctx = GetExceptCtx (currentTargetThread);
 
-    CheckForSingleStep(ctx->ctx);
+    CheckForSingleStep (ctx->ctx);
 
-    TgtChange(pid, ctx->ctx,STS_MAKESIG(ExcepToSig(ctx)));
-      
+    TgtChange (pid, ctx->ctx, STS_MAKESIG (ExcepToSig (ctx)));
   }
 }
 
@@ -100,10 +97,11 @@ rtems_task eventTask( rtems_task_argument pid)
    only to push a first valid context in the list
    ---------------------------------------------------------------------*/
 
-rtems_task MyThreadIdle(rtems_task_argument argument)
+  rtems_task
+MyThreadIdle (rtems_task_argument argument)
 {
-  enterRdbg();
-  rtems_task_delete( RTEMS_SELF );
+  enterRdbg ();
+  rtems_task_delete (RTEMS_SELF);
 }
 
 /* -----------------------------------------------------------------------
@@ -114,192 +112,206 @@ rtems_task MyThreadIdle(rtems_task_argument argument)
 	process that we do not control now).
    ----------------------------------------------------------------------- */
 
-Boolean TgtAttach(
-  int		conn_idx,	/* client that is requesting */
-  PID		pid)		/* process to attach to */
-{
+  Boolean
+TgtAttach (int conn_idx,        /* client that is requesting */
+           PID pid)
+{                               /* process to attach to */
   rtems_name task_name;
   rtems_status_code status;
-  rtems_id debugId;
-  
+
   errno = 0;
 
-  DPRINTF (("TgtAttach pid=%d\n",pid));
-  
-  Ptrace(RPT_ATTACH, pid, NULL, 0, NULL);
+  DPRINTF (("TgtAttach pid=%d\n", pid));
+
+  Ptrace (RPT_ATTACH, pid, NULL, 0, NULL);
   if (errno)
-    return(False);		/* failed */
+    return (False);             /* failed */
 
-  TgtCreateNew(pid, conn_idx, 0, NULL, False);
+  TgtCreateNew (pid, conn_idx, 0, NULL, False);
 
+  connect_rdbg_exception ();
 
-  connect_rdbg_exception();
-  
   /*
-   * Create the attach debuger task
+   * Search for and remove debugging tasks / semaphores left over from
+   * a previous attach without a detach.
    */
-  task_name = rtems_build_name( 'E', 'v', 'n', 't' );
-  if ((status = rtems_task_create( task_name, 10, 24576,
-				   RTEMS_INTERRUPT_LEVEL(0),
-				   RTEMS_DEFAULT_ATTRIBUTES | RTEMS_SYSTEM_TASK,
-				   &eventTaskId ))
-      != RTEMS_SUCCESSFUL){
-    printf("status = %d\n",status);
+
+  if (rtems_task_ident (rtems_build_name ('E', 'v', 'n', 't'),
+                        RTEMS_SEARCH_ALL_NODES,
+                        &eventTaskId) == RTEMS_SUCCESSFUL)
+    rtems_task_delete (eventTaskId);
+
+  if (rtems_semaphore_ident (rtems_build_name ('D', 'B', 'G', 's'),
+                             RTEMS_SEARCH_ALL_NODES,
+                             &serializeSemId) == RTEMS_SUCCESSFUL)
+    rtems_semaphore_delete (serializeSemId);
+
+  if (rtems_semaphore_ident (rtems_build_name ('D', 'B', 'G', 'w'),
+                             RTEMS_SEARCH_ALL_NODES,
+                             &wakeupEventSemId) == RTEMS_SUCCESSFUL)
+    rtems_semaphore_delete (wakeupEventSemId);
+
+  /*
+   * Create the attach debugger task
+   */
+  task_name = rtems_build_name ('E', 'v', 'n', 't');
+  if ((status = rtems_task_create (task_name, 10, 24576,
+                                   RTEMS_INTERRUPT_LEVEL (0),
+                                   RTEMS_DEFAULT_ATTRIBUTES |
+                                   RTEMS_SYSTEM_TASK, &eventTaskId))
+      != RTEMS_SUCCESSFUL) {
+    printf ("status = %d\n", status);
     rtems_panic ("Can't create task.\n");
   }
-  
-  status = rtems_task_start(eventTaskId, eventTask, pid);
-
-  status = rtems_semaphore_create (rtems_build_name('D', 'B', 'G', 's'),
-				   1,
-				   RTEMS_FIFO |
-				   RTEMS_COUNTING_SEMAPHORE |
-				   RTEMS_NO_INHERIT_PRIORITY |
-				   RTEMS_NO_PRIORITY_CEILING |
-				   RTEMS_LOCAL,
-				   0,
-				   &serializeSemId);
+
+  status = rtems_task_start (eventTaskId, eventTask, pid);
+
+  status = rtems_semaphore_create (rtems_build_name ('D', 'B', 'G', 's'),
+                                   1,
+                                   RTEMS_FIFO |
+                                   RTEMS_COUNTING_SEMAPHORE |
+                                   RTEMS_NO_INHERIT_PRIORITY |
+                                   RTEMS_NO_PRIORITY_CEILING |
+                                   RTEMS_LOCAL, 0, &serializeSemId);
   if (status != RTEMS_SUCCESSFUL)
-    rtems_panic ("Can't create serialize semaphore: `%s'\n",rtems_status_text(status));
-
-  status = rtems_semaphore_create (rtems_build_name('D', 'B', 'G', 'w'),
-				   0,
-				   RTEMS_FIFO |
-				   RTEMS_COUNTING_SEMAPHORE |
-				   RTEMS_NO_INHERIT_PRIORITY |
-				   RTEMS_NO_PRIORITY_CEILING |
-				   RTEMS_LOCAL,
-				   0,
-				   &wakeupEventSemId);
+    rtems_panic ("Can't create serialize semaphore: `%s'\n",
+                 rtems_status_text (status));
+
+  status = rtems_semaphore_create (rtems_build_name ('D', 'B', 'G', 'w'),
+                                   0,
+                                   RTEMS_FIFO |
+                                   RTEMS_COUNTING_SEMAPHORE |
+                                   RTEMS_NO_INHERIT_PRIORITY |
+                                   RTEMS_NO_PRIORITY_CEILING |
+                                   RTEMS_LOCAL, 0, &wakeupEventSemId);
   if (status != RTEMS_SUCCESSFUL)
-    rtems_panic ("Can't create wakeup semaphore: `%s'\n",rtems_status_text(status));
+    rtems_panic ("Can't create wakeup semaphore: `%s'\n",
+                 rtems_status_text (status));
 
   /*
    * Create the MyThreadIdle task to init Exception mechanism 
    */
-  task_name = rtems_build_name( 'R', 'i', 'n', 'i' );
-  if ((status = rtems_task_create( task_name, 10, 24576,
-				   RTEMS_INTERRUPT_LEVEL(0),
-				   RTEMS_DEFAULT_ATTRIBUTES,
-				   &debugId ))
-      != RTEMS_SUCCESSFUL){
-    printf("status = %d (%s)\n",status,rtems_status_text(status));
+  task_name = rtems_build_name ('R', 'i', 'n', 'i');
+  if ((status = rtems_task_create (task_name, 10, 24576,
+                                   RTEMS_INTERRUPT_LEVEL (0),
+                                   RTEMS_DEFAULT_ATTRIBUTES, &debugId))
+      != RTEMS_SUCCESSFUL) {
+    printf ("status = %d (%s)\n", status, rtems_status_text (status));
     rtems_panic ("Can't create task.\n");
   }
 
-  status = rtems_task_start(debugId, MyThreadIdle, pid);
+  status = rtems_task_start (debugId, MyThreadIdle, pid);
 
-  return(True);
+  return (True);
 }
 
 /* -----------------------------------------------------------------------
    TgtPtrace - handle ptrace requests for server.
    ----------------------------------------------------------------------- */
 
-int TgtPtrace(		
-  int		req,
-  PID		pid,
-  char		*addr,
-  int		data,
-  void		*addr2)
+int
+TgtPtrace (int req, PID pid, char *addr, int data, void *addr2)
 {
   if ((req == RPT_SINGLESTEP || req == RPT_CONT)
-  &&  addr2)			/* clear then step */
-  {				/* addr2 is the old value */
-    int		ret;
+      && addr2) {               /* clear then step *//* addr2 is the old value */
+
+    int ret;
 
     errno = 0;
     TgtBreakRestoreOrig (pid, addr, addr2);
-    ret = Ptrace(RPT_SINGLESTEP, pid, addr, data, NULL); /* step over */
-    if (ret)		/* error, cannot single-step */
-    {
+    ret = Ptrace (RPT_SINGLESTEP, pid, addr, data, NULL);   /* step over */
+    if (ret) {                  /* error, cannot single-step */
       int pid_idx = FindPidEntry (pid);
-      TgtBreakCancelStep (&pid_list [pid_idx]);
+      TgtBreakCancelStep (&pid_list[pid_idx]);
     }
-    return(ret);		/* failed or done */
-  }
-  else
-    return(Ptrace(req, pid, addr, data, addr2)); /* normal call */
+    return (ret);               /* failed or done */
+  } else
+      return (Ptrace (req, pid, addr, data, addr2));  /* normal call */
 }
 
 /* -----------------------------------------------------------------
    TgtGetThreadName - get thread name
    --------------------------------------------------------------- */
 
-int TgtGetThreadName (
-   PID_LIST     *plst,		/* Process entry */
-   unsigned     Id,             /* Thread ID */
-   char    	*ThrName)		/* Thread name */
-{
-    int index;
-    unsigned name;
-    
-    if ( Id <_Objects_Information_table[OBJECTS_RTEMS_TASKS]->maximum_id &&
-	 Id >_Objects_Information_table[OBJECTS_RTEMS_TASKS]->minimum_id) {
-
-      index = Id - _Objects_Information_table[OBJECTS_RTEMS_TASKS]->minimum_id;
-      name = *(unsigned*)(_Objects_Information_table[OBJECTS_RTEMS_TASKS]->local_table[1+index]->name);
-      ThrName[0] = (char)((name >> 24) & 0xFF );
-      ThrName[1] = (char)((name >> 16) & 0xFF );
-      ThrName[2] = (char)((name >> 8)  & 0xFF );
-      ThrName[3] = (char)( name        & 0xFF );
-      ThrName[4] = 0x0;
-      return 0;
-    }
-      
-    if ( Id <_Objects_Information_table[OBJECTS_POSIX_THREADS]->maximum_id &&
-	 Id >_Objects_Information_table[OBJECTS_POSIX_THREADS]->minimum_id) {
-
-      index = Id - _Objects_Information_table[OBJECTS_POSIX_THREADS]->minimum_id;
-      name = *(unsigned*)(_Objects_Information_table[OBJECTS_POSIX_THREADS]->local_table[1+index]->name);
-      ThrName[0] = (char)((name >> 24) & 0xFF );
-      ThrName[1] = (char)((name >> 16) & 0xFF );
-      ThrName[2] = (char)((name >> 8)  & 0xFF );
-      ThrName[3] = (char)( name        & 0xFF );
-      ThrName[4] = 0x0;
-      return 0;
-    }
-      
-	
-    return -1;
+  int
+TgtGetThreadName (PID_LIST * plst,  /* Process entry */
+                  unsigned Id,  /* Thread ID */
+                  char *ThrName)
+{                               /* Thread name */
+  int index;
+  unsigned name;
+
+  if (Id < _Objects_Information_table[OBJECTS_RTEMS_TASKS]->maximum_id &&
+      Id > _Objects_Information_table[OBJECTS_RTEMS_TASKS]->minimum_id) {
+
+    index = Id - _Objects_Information_table[OBJECTS_RTEMS_TASKS]->minimum_id;
+    name =
+      *(unsigned *) (_Objects_Information_table[OBJECTS_RTEMS_TASKS]->
+                     local_table[1 + index]->name);
+    ThrName[0] = (char) ((name >> 24) & 0xFF);
+    ThrName[1] = (char) ((name >> 16) & 0xFF);
+    ThrName[2] = (char) ((name >> 8) & 0xFF);
+    ThrName[3] = (char) (name & 0xFF);
+    ThrName[4] = 0x0;
+    return 0;
+  }
+
+  if (Id < _Objects_Information_table[OBJECTS_POSIX_THREADS]->maximum_id &&
+      Id > _Objects_Information_table[OBJECTS_POSIX_THREADS]->minimum_id) {
+
+    index =
+      Id - _Objects_Information_table[OBJECTS_POSIX_THREADS]->minimum_id;
+    name =
+      *(unsigned *) (_Objects_Information_table[OBJECTS_POSIX_THREADS]->
+                     local_table[1 + index]->name);
+    ThrName[0] = (char) ((name >> 24) & 0xFF);
+    ThrName[1] = (char) ((name >> 16) & 0xFF);
+    ThrName[2] = (char) ((name >> 8) & 0xFF);
+    ThrName[3] = (char) (name & 0xFF);
+    ThrName[4] = 0x0;
+    return 0;
+  }
 
+  return -1;
 }
 
 /* -----------------------------------------------------------------
    TgtThreadList - return all the threads in the system
    ----------------------------------------------------------------- */
 
-    int
-TgtThreadList (
-  PID_LIST* plst,		/* Process entry */
-  unsigned* threads,		/* Output buffer */
-  unsigned size)		/* Output buffer size */
-{
-    int curr = 0;
-    Objects_Id  id;     
-    unsigned index;
-
-    id = _Objects_Information_table[OBJECTS_RTEMS_TASKS]->minimum_id;
-
-    while (id < _Objects_Information_table[OBJECTS_RTEMS_TASKS]->maximum_id){
-      index = id - _Objects_Information_table[OBJECTS_RTEMS_TASKS]->minimum_id;
-      if ( _Objects_Information_table[OBJECTS_RTEMS_TASKS]->local_table[1+index] != NULL){
+  int
+TgtThreadList (PID_LIST * plst, /* Process entry */
+               unsigned *threads,   /* Output buffer */
+               unsigned size)
+{                               /* Output buffer size */
+  int curr = 0;
+  Objects_Id id;
+  unsigned index;
+
+  id = _Objects_Information_table[OBJECTS_RTEMS_TASKS]->minimum_id;
+
+  while (id < _Objects_Information_table[OBJECTS_RTEMS_TASKS]->maximum_id) {
+    index = id - _Objects_Information_table[OBJECTS_RTEMS_TASKS]->minimum_id;
+    if (_Objects_Information_table[OBJECTS_RTEMS_TASKS]->
+        local_table[1 + index] != NULL) {
       threads[curr] = (unsigned) id;
       curr++;
-      }
-      id ++;
     }
-	
-    id = _Objects_Information_table[OBJECTS_POSIX_THREADS]->minimum_id;
+    id++;
+  }
+
+  id = _Objects_Information_table[OBJECTS_POSIX_THREADS]->minimum_id;
 
-    while (id < _Objects_Information_table[OBJECTS_POSIX_THREADS]->maximum_id){
-      index = id - _Objects_Information_table[OBJECTS_POSIX_THREADS]->minimum_id;
-      if ( _Objects_Information_table[OBJECTS_POSIX_THREADS]->local_table[1+index] != NULL){
+  while (id < _Objects_Information_table[OBJECTS_POSIX_THREADS]->maximum_id) {
+    index =
+      id - _Objects_Information_table[OBJECTS_POSIX_THREADS]->minimum_id;
+    if (_Objects_Information_table[OBJECTS_POSIX_THREADS]->
+        local_table[1 + index] != NULL) {
       threads[curr] = (unsigned) id;
       curr++;
-      }
-      id ++;
     }
-	
-    return curr;
+    id++;
+  }
+
+  return curr;
 }