* 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, 266 insertions, 271 deletions

diff --git a/c/src/librdbg/src/ptrace.c b/c/src/librdbg/src/ptrace.c
index bb6fc5a6b8..62a74d2135 100644
--- a/c/src/librdbg/src/ptrace.c
+++ b/c/src/librdbg/src/ptrace.c
@@ -19,52 +19,47 @@
 extern rtems_id serializeSemId;
 extern rtems_id wakeupEventSemId;
 extern rtems_id eventTaskId;
+extern rtems_id debugId;
 extern Exception_context *FirstCtx;
 extern Exception_context *LastCtx;
 extern CPU_Exception_frame SavedContext;
 extern unsigned int NbExceptCtx;
 
+/* 
+ * return a pointer to the Thread Control structure of the specified
+ * Id
+ */
 
-
-/* --------------------------------------------------------------------
-   return a pointer to the Thread Control structure of the specified
-   Id
-   -------------------------------------------------------------------- */
-
-Thread_Control *Thread_Get_RDBG (
-  Objects_Id           Id
-)
+  Thread_Control *
+Thread_Get_RDBG (Objects_Id Id)
 {
   unsigned index;
 
-  if ( Id <_Objects_Information_table[OBJECTS_RTEMS_TASKS]->maximum_id &&
-       Id >_Objects_Information_table[OBJECTS_RTEMS_TASKS]->minimum_id) {
+  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;
-    if ( _Objects_Information_table[OBJECTS_RTEMS_TASKS]->local_table[1+index] != NULL) {
-      return (Thread_Control *)(_Objects_Information_table[OBJECTS_RTEMS_TASKS]->local_table[1+index]);
+    if (_Objects_Information_table[OBJECTS_RTEMS_TASKS]->local_table[1 + index] != NULL) {
+      return (Thread_Control*) (_Objects_Information_table[OBJECTS_RTEMS_TASKS]->local_table[1 + index]);
     }
   }
-  
-  if ( Id <_Objects_Information_table[OBJECTS_POSIX_THREADS]->maximum_id &&
-       Id >_Objects_Information_table[OBJECTS_POSIX_THREADS]->minimum_id) {
+
+  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;
-    if ( _Objects_Information_table[OBJECTS_POSIX_THREADS]->local_table[1+index] != NULL)
-      return (Thread_Control *)(_Objects_Information_table[OBJECTS_POSIX_THREADS]->local_table[1+index]);
+    if (_Objects_Information_table[OBJECTS_POSIX_THREADS]->
+        local_table[1 + index] != NULL)
+      return (Thread_Control*) (_Objects_Information_table[OBJECTS_POSIX_THREADS]->local_table[1 + index]);
   }
 
   return 0;
 
 }
 
-
-/* --------------------------------------------------------------------
-   Memory read
-   -------------------------------------------------------------------- */
-
-int
-safeMemRead(void *src, void *dest, int nbBytes){
+  int
+safeMemRead (void *src, void *dest, int nbBytes)
+{
 
   /*
    * safe because if it generates an exception,
@@ -72,261 +67,261 @@ safeMemRead(void *src, void *dest, int nbBytes){
    * TBD
    */
 
-  memcpy(dest, src, nbBytes);
+  memcpy (dest, src, nbBytes);
   return 0;
 }
 
-/* --------------------------------------------------------------------
-   Memory write
-   -------------------------------------------------------------------- */
-int
-safeMemWrite(void *src, void * dest, int nbBytes){
+  int
+safeMemWrite (void *src, void *dest, int nbBytes)
+{
 
   /*
    * safe because if it generates an exception,
    * it must return normally
    * TBD
    */
-  
-  memcpy(dest, src, nbBytes);
-  return 0; 
+
+  memcpy (dest, src, nbBytes);
+  return 0;
 }
 
-/* --------------------------------------------------------------------
-   Ptrace
-   -------------------------------------------------------------------- */
-
-int
-ptrace (int request, int pid, char* addr, int data, char* addr2)
- { 
-   int diag; 
-   errno = 0 ; 
-   if (pid != 1) { 
-     errno = ESRCH; 
-     return -1; 
-   } 
-   switch (request) { 
-
-   case RPT_SINGLESTEP:{
-     Exception_context *ctx;
-
-     if (CannotRestart == 1){
-       setErrno(EIO);
-       return -1;
-     }
-     
-     if ((ctx = GetExceptCtx (currentTargetThread)) != NULL) { 
-       Single_Step(ctx->ctx);
-       rtems_semaphore_release( ctx->semaphoreId );
-       return 0;
-     }
-     break;
-   }
-
-   case RPT_PEEKTEXT: 
-   case RPT_PEEKDATA: { 
-     diag = safeMemRead(addr, &data, sizeof data); 
-     if (diag == 0) return data; 
-   mem_error: 
-     return -1; 
-   } 
-
-   case RPT_POKETEXT: {
-     diag = safeMemWrite(&data, addr, sizeof data); 
-
-     /*
-      * We must flush the INSTR and DATA cache to be sure the
-      *	opcode modification is taken into account, because
-      *	the breakpoint opcode is written via the data cache
-      *	while execution code is fetched via the instruction
-      *	cache
-      */
-     
-     if (diag == 0) {
-       copyback_data_cache_and_invalidate_instr_cache(addr, sizeof data);
-       return 0;
-     }
-     goto mem_error; 
-   } 
-   case RPT_POKEDATA: { 
-     diag = safeMemWrite(&data, addr, sizeof data); 
-     if (diag == 0) return 0; 
-     goto mem_error; 
-   } 
-   case RPT_CONT: {
-     Exception_context *ctx;
-
-     if (CannotRestart == 1){
-       setErrno (EIO);
-       return -1;
-     }
-             
-     ctx = GetExceptCtx (currentTargetThread);
-
-     if (!isRdbgException(ctx)) {
-       CannotRestart = 1;
-       setErrno (EIO);
-       return -1;
-     }
-
-     assert (data == 0);
-     assert (ExitForSingleStep == 0);
-
-     rtems_semaphore_release( serializeSemId );
-
-     if ((ctx = GetExceptCtx (currentTargetThread)) != NULL) { 
-       rtems_semaphore_release( ctx->semaphoreId );
-     }
-     return 0;
-   }
-     
-   case RPT_ATTACH: 
-     return 0; 
-     
-   case RPT_DETACH:{
-     Exception_context *ctx;
-     
-     if (NbExceptCtx || NbSerializedCtx) {
-       ctx = FirstCtx;
-       rtems_task_delete(eventTaskId);
-       rtems_semaphore_delete(serializeSemId);
-       rtems_semaphore_delete(wakeupEventSemId);
-     } 
-     return 0;
-   }
-     
-   case RPT_GETREGS:{ 
-     Exception_context *ctx;
-
-     if ((ctx = GetExceptCtx (currentTargetThread)) != NULL) { 
-       CtxToRegs (ctx->ctx, (xdr_regs*) addr); 
-       return 0; 
-     } 
-     break; 
-   }
-
-   case RPT_SETREGS:{ 
-     Exception_context *ctx;
-
-     if ((ctx = GetExceptCtx (currentTargetThread)) != NULL) { 
-       RegsToCtx ((xdr_regs*) addr, ctx->ctx); 
-       return 0;
-     }
-     break;
-   }
- 
-   case RPT_READTEXT: 
-   case RPT_READDATA: { 
-     diag = safeMemRead(addr, addr2, data); 
-     if (diag == 0) return 0; 
-     goto mem_error;
-   } 
-   case RPT_WRITETEXT: 
-   case RPT_WRITEDATA: { 
-     diag = safeMemWrite(addr2, addr, data); 
-     if (diag == 0) return 0; 
-     goto mem_error; 
-   } 
-   
-   case RPT_GETTARGETTHREAD: 
-     if (!NbExceptCtx) { 
-       errno = EBUSY; 
-       return -1; 
-     }       
-     return currentTargetThread;
-
-   case RPT_SETTARGETTHREAD: 
-     if (!NbExceptCtx) { 
-       errno = EBUSY; 
-       return -1; 
-     }
-     currentTargetThread = data;
-     return 0;
-     
-   case RPT_GETTHREADNAME: { 
-     return TgtGetThreadName (NULL, (unsigned)(data), (char *) addr); 
-   } 	
-   
-   case RPT_THREADLIST: { 
-     int count = TgtThreadList (NULL, (unsigned*) addr, UTHREAD_MAX 
-				* sizeof (unsigned)); 
-     if (count < 0) { 	
-       errno = EINVAL; 	
-       return -1; 	
-     } 	
-     return count; 
-   } 	
-
-   case RPT_SETTHREADREGS: { 
-     Exception_context *ctx;
-     CPU_Exception_frame Ectx;
-     Thread_Control *thread;
-     rtems_id id;
-          
-     rtems_task_ident(RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &id);
-     if (data == (unsigned)id)
-       break;
-     
-     if ((ctx = GetExceptCtx (data)) != NULL) { 
-       RegsToCtx ((xdr_regs*) addr, ctx->ctx); 
-       return 0; 
-     }
-     thread = Thread_Get_RDBG ((Objects_Id)(data));
-     if (thread != NULL) {
-       RegsToCtx ((xdr_regs*) addr, &Ectx); 
-       set_ctx_thread (thread, &Ectx);
-       return 0; 
-     }
-     break; 
-   }
-
-   case RPT_GETTHREADREGS: { 
-     Exception_context *ctx;
-     CPU_Exception_frame Ectx;
-     Thread_Control *thread;
-     rtems_id id;
-          
-     rtems_task_ident(RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &id);
-     if (data == (unsigned)id){
-       justSaveContext = 1;
-       enterRdbg();
-       CtxToRegs (&(SavedContext), (xdr_regs*) addr); 
-       return 0; 
-     }
-     
-     if ((ctx = GetExceptCtx (data)) != NULL) { 
-       CtxToRegs (ctx->ctx, (xdr_regs*) addr); 
-       return 0; 
-     }
-     thread = Thread_Get_RDBG ((Objects_Id)(data));
-     if (thread != NULL) {
-       get_ctx_thread (thread, &Ectx);
-       CtxToRegs (&Ectx, (xdr_regs*) addr); 
-       return 0; 
-     }       
-     break; 
-   }
-   
-   case RPT_KILL:
-     TotalReboot = 1;
-     return 0;
-
-   case RPT_TRACEME: 
-   case RPT_PEEKUSER: 
-   case RPT_POKEUSER: 
-   case RPT_GETFPREGS: 
-   case RPT_SETFPREGS:
-   case RPT_GETFPAREGS:
-   case RPT_SETFPAREGS:
-   case RPT_SYSCALL:
-   case RPT_DUMPCORE:
-   case RPT_GETUCODE:
-   case RPT_THREADSUSPEND:
-   case RPT_THREADRESUME:
-   case RPT_SETTHREADNAME:
-   default:
-     break;
-   }
-   errno = EINVAL;
-   return -1;
+  int
+ptrace (int request, int pid, char *addr, int data, char *addr2)
+{
+  int diag;
+  errno = 0;
+  if (pid != 1) {
+    errno = ESRCH;
+    return -1;
+  }
+  switch (request) {
+
+  case RPT_SINGLESTEP:{
+      Exception_context *ctx;
+
+      if (CannotRestart == 1) {
+        setErrno (EIO);
+        return -1;
+      }
+
+      if ((ctx = GetExceptCtx (currentTargetThread)) != NULL) {
+        Single_Step (ctx->ctx);
+        rtems_semaphore_release (ctx->semaphoreId);
+        return 0;
+      }
+      break;
+    }
+
+  case RPT_PEEKTEXT:
+  case RPT_PEEKDATA:{
+      diag = safeMemRead (addr, &data, sizeof data);
+      if (diag == 0)
+        return data;
+    mem_error:
+      return -1;
+    }
+
+  case RPT_POKETEXT:{
+      diag = safeMemWrite (&data, addr, sizeof data);
+
+      /*
+       * We must flush the INSTR and DATA cache to be sure the
+       * opcode modification is taken into account, because
+       * the breakpoint opcode is written via the data cache
+       * while execution code is fetched via the instruction
+       * cache
+       */
+
+      if (diag == 0) {
+        copyback_data_cache_and_invalidate_instr_cache (addr, sizeof data);
+        return 0;
+      }
+      goto mem_error;
+    }
+  case RPT_POKEDATA:{
+      diag = safeMemWrite (&data, addr, sizeof data);
+      if (diag == 0)
+        return 0;
+      goto mem_error;
+    }
+  case RPT_CONT:{
+      Exception_context *ctx;
+
+      if (CannotRestart == 1) {
+        setErrno (EIO);
+        return -1;
+      }
+
+      ctx = GetExceptCtx (currentTargetThread);
+      if (ctx == NULL)
+        ctx = GetExceptCtx (debugId);
+
+      if (ctx != NULL) {
+
+        if (!isRdbgException (ctx)) {
+          CannotRestart = 1;
+          setErrno (EIO);
+          return -1;
+        }
+
+        assert (data == 0);
+        assert (ExitForSingleStep == 0);
+
+        rtems_semaphore_release (ctx->semaphoreId);
+      }
+      rtems_semaphore_release (serializeSemId);
+      return 0;
+    }
+
+  case RPT_ATTACH:
+    return 0;
+
+  case RPT_DETACH:{
+      Exception_context *ctx;
+
+      if (NbExceptCtx || NbSerializedCtx) {
+        ctx = FirstCtx;
+        rtems_task_delete (eventTaskId);
+        rtems_semaphore_delete (serializeSemId);
+        rtems_semaphore_delete (wakeupEventSemId);
+      }
+      return 0;
+    }
+
+  case RPT_GETREGS:{
+      Exception_context *ctx;
+
+      if ((ctx = GetExceptCtx (currentTargetThread)) != NULL) {
+        CtxToRegs (ctx->ctx, (xdr_regs *) addr);
+        return 0;
+      }
+      break;
+    }
+
+  case RPT_SETREGS:{
+      Exception_context *ctx;
+
+      if ((ctx = GetExceptCtx (currentTargetThread)) != NULL) {
+        RegsToCtx ((xdr_regs *) addr, ctx->ctx);
+        return 0;
+      }
+      break;
+    }
+
+  case RPT_READTEXT:
+  case RPT_READDATA:{
+      diag = safeMemRead (addr, addr2, data);
+      if (diag == 0)
+        return 0;
+      goto mem_error;
+    }
+  case RPT_WRITETEXT:
+  case RPT_WRITEDATA:{
+      diag = safeMemWrite (addr2, addr, data);
+      if (diag == 0)
+        return 0;
+      goto mem_error;
+    }
+
+  case RPT_GETTARGETTHREAD:
+    if (!NbExceptCtx) {
+      errno = EBUSY;
+      return -1;
+    }
+    return currentTargetThread;
+
+  case RPT_SETTARGETTHREAD:
+    if (!NbExceptCtx) {
+      errno = EBUSY;
+      return -1;
+    }
+    currentTargetThread = data;
+    return 0;
+
+  case RPT_GETTHREADNAME:{
+      return TgtGetThreadName (NULL, (unsigned) (data), (char *) addr);
+    }
+
+  case RPT_THREADLIST:{
+      int count = TgtThreadList (NULL, (unsigned *) addr, UTHREAD_MAX
+                                 * sizeof (unsigned));
+      if (count < 0) {
+        errno = EINVAL;
+        return -1;
+      }
+      return count;
+    }
+
+  case RPT_SETTHREADREGS:{
+      Exception_context *ctx;
+      CPU_Exception_frame Ectx;
+      Thread_Control *thread;
+      rtems_id id;
+
+      rtems_task_ident (RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &id);
+      if (data == (unsigned) id)
+        break;
+
+      if ((ctx = GetExceptCtx (data)) != NULL) {
+        RegsToCtx ((xdr_regs *) addr, ctx->ctx);
+        return 0;
+      }
+      thread = Thread_Get_RDBG ((Objects_Id) (data));
+      if (thread != NULL) {
+        RegsToCtx ((xdr_regs *) addr, &Ectx);
+        set_ctx_thread (thread, &Ectx);
+        return 0;
+      }
+      break;
+    }
+
+  case RPT_GETTHREADREGS:{
+      Exception_context *ctx;
+      CPU_Exception_frame Ectx;
+      Thread_Control *thread;
+      rtems_id id;
+
+      rtems_task_ident (RTEMS_SELF, RTEMS_SEARCH_ALL_NODES, &id);
+      if (data == (unsigned) id) {
+        justSaveContext = 1;
+        enterRdbg ();
+        CtxToRegs (&(SavedContext), (xdr_regs *) addr);
+        return 0;
+      }
+
+      if ((ctx = GetExceptCtx (data)) != NULL) {
+        CtxToRegs (ctx->ctx, (xdr_regs *) addr);
+        return 0;
+      }
+      thread = Thread_Get_RDBG ((Objects_Id) (data));
+      if (thread != NULL) {
+        get_ctx_thread (thread, &Ectx);
+        CtxToRegs (&Ectx, (xdr_regs *) addr);
+        return 0;
+      }
+      break;
+    }
+
+  case RPT_KILL:
+    TotalReboot = 1;
+    return 0;
+
+  case RPT_TRACEME:
+  case RPT_PEEKUSER:
+  case RPT_POKEUSER:
+  case RPT_GETFPREGS:
+  case RPT_SETFPREGS:
+  case RPT_GETFPAREGS:
+  case RPT_SETFPAREGS:
+  case RPT_SYSCALL:
+  case RPT_DUMPCORE:
+  case RPT_GETUCODE:
+  case RPT_THREADSUSPEND:
+  case RPT_THREADRESUME:
+  case RPT_SETTHREADNAME:
+  default:
+    break;
+  }
+  errno = EINVAL;
+  return -1;
 }