* 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, 113 insertions, 120 deletions

diff --git a/c/src/librdbg/src/powerpc/excep_f.c b/c/src/librdbg/src/powerpc/excep_f.c
index 13adcd1e67..b821f39c1d 100644
--- a/c/src/librdbg/src/powerpc/excep_f.c
+++ b/c/src/librdbg/src/powerpc/excep_f.c
@@ -17,32 +17,35 @@
 #include <rdbg/rdbg.h>
 #include <rdbg/servrpc.h>
 
-    int
-ExcepToSig (Exception_context *ctx)
+  int
+ExcepToSig (Exception_context * ctx)
 {
   int excep = getExcNum (ctx);
-  
+
   switch (excep) {
-	case ASM_FLOAT_VECTOR	: return SIGFPE;
-	
-        case ASM_TRACE_VECTOR	:
-	case ASM_PROG_VECTOR	:
-        case ASM_SYS_VECTOR     : return SIGTRAP;
-	
-	case ASM_ISI_VECTOR	: return SIGSEGV;
-	
-	case ASM_RESET_VECTOR	:
-	case ASM_MACH_VECTOR	:
-	case ASM_EXT_VECTOR	:
-	case ASM_ALIGN_VECTOR	: return SIGILL;
-	
-    default:
-	break;
-    }
-    return SIGKILL;
+  case ASM_FLOAT_VECTOR:
+    return SIGFPE;
+
+  case ASM_TRACE_VECTOR:
+  case ASM_PROG_VECTOR:
+  case ASM_SYS_VECTOR:
+    return SIGTRAP;
+
+  case ASM_ISI_VECTOR:
+    return SIGSEGV;
+
+  case ASM_RESET_VECTOR:
+  case ASM_MACH_VECTOR:
+  case ASM_EXT_VECTOR:
+  case ASM_ALIGN_VECTOR:
+    return SIGILL;
+
+  default:
+    break;
+  }
+  return SIGKILL;
 }
 
-  
 /*----- Breakpoint Exception management -----*/
 
     /*
@@ -51,134 +54,124 @@ ExcepToSig (Exception_context *ctx)
      */
 
 void
-BreakPointExcHdl(CPU_Exception_frame *ctx) 
+BreakPointExcHdl (CPU_Exception_frame * ctx)
 {
   rtems_status_code status;
   rtems_id continueSemId;
 
-  /* T. Straumann, 1/16/2002: we must re-enable the floating point engine
-   *                          if the interrupted thread is FP. Otherwise,
-   *                          the semaphore primitives may crash when they
-   *                          try to save FP context while switching this
-   *                          thread...
+  /*
+   * we must re-enable the floating point engine
+   * if the interrupted thread is FP. Otherwise,
+   * the semaphore primitives may crash when they
+   * try to save FP context while switching this
+   * thread... NB : deferred fp context switching
+   * would 1) avoid to have to save FP, make this code
+   * obsolete.
    */
-  if (ctx->EXC_SRR1 & 0x2000) {
-	register unsigned long msr;
-	__asm__ __volatile__("mfmsr %0":"=r"(msr));
-	__asm__ __volatile__("mtmsr %0"::"r"(msr|MSR_FP));
+  if (ctx->EXC_SRR1 & MSR_FP) {
+    register unsigned long msr;
+    __asm__ __volatile__ ("mfmsr %0":"=r" (msr));
+    __asm__ __volatile__ ("mtmsr %0"::"r" (msr | MSR_FP));
   }
 
-  if ( (justSaveContext) && (ctx->_EXC_number == ASM_SYS_VECTOR) ) {
+  if ((justSaveContext) && (ctx->_EXC_number == ASM_SYS_VECTOR)) {
     PushSavedExceptCtx (_Thread_Executing->Object.id, ctx);
     justSaveContext = 0;
-  }
-  else {
-    if (ctx->_EXC_number != ASM_TRACE_VECTOR){
+  } else {
+    if (ctx->_EXC_number != ASM_TRACE_VECTOR) {
       NbSerializedCtx++;
-      rtems_semaphore_obtain(serializeSemId, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
+      rtems_semaphore_obtain (serializeSemId, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
       NbSerializedCtx--;
     }
-      
+
     currentTargetThread = _Thread_Executing->Object.id;
 
 #ifdef DDEBUG
-    printk("----------------------------------------------------------\n");
-    printk("Exception %d caught at PC %x by thread %d\n",
-	   ctx->_EXC_number,
-	   ctx->EXC_SRR0,
-	   _Thread_Executing->Object.id);
-    printk("----------------------------------------------------------\n");
-    printk("Processor execution context at time of the fault was  :\n");
-    printk("----------------------------------------------------------\n");
-    printk("\t R0 = %x\n", ctx->GPR0);
-    printk("\t R1 = %x\n", ctx->GPR1);
-    printk("\t R2 = %x\n", ctx->GPR2);
-    printk("\t R3 = %x\n", ctx->GPR3);
-    printk("\t R4 = %x\n", ctx->GPR4);
-    printk("\t R5 = %x\n", ctx->GPR5);
-    printk("\t R6 = %x\n", ctx->GPR6);
-    printk("\t R7 = %x\n", ctx->GPR7);
-    printk("\t R8 = %x\n", ctx->GPR8);
-    printk("\t R9 = %x\n", ctx->GPR9);
-    printk("\t R10 = %x\n", ctx->GPR10);
-    printk("\t R11 = %x\n", ctx->GPR11);
-    printk("\t R12 = %x\n", ctx->GPR12);
-    printk("\t R13 = %x\n", ctx->GPR13);
-    printk("\t R14 = %x\n", ctx->GPR14);
-    printk("\t R15 = %x\n", ctx->GPR15);
-    printk("\t R16 = %x\n", ctx->GPR16);
-    printk("\t R17 = %x\n", ctx->GPR17);
-    printk("\t R18 = %x\n", ctx->GPR18);
-    printk("\t R19 = %x\n", ctx->GPR19);
-    printk("\t R20 = %x\n", ctx->GPR20);
-    printk("\t R21 = %x\n", ctx->GPR21);
-    printk("\t R22 = %x\n", ctx->GPR22);
-    printk("\t R23 = %x\n", ctx->GPR23);
-    printk("\t R24 = %x\n", ctx->GPR24);
-    printk("\t R25 = %x\n", ctx->GPR25);
-    printk("\t R26 = %x\n", ctx->GPR26);
-    printk("\t R27 = %x\n", ctx->GPR27);
-    printk("\t R28 = %x\n", ctx->GPR28);
-    printk("\t R29 = %x\n", ctx->GPR29);
-    printk("\t R30 = %x\n", ctx->GPR30);
-    printk("\t R31 = %x\n", ctx->GPR31);
-    printk("\t CR = %x\n", ctx->EXC_CR);
-    printk("\t CTR = %x\n", ctx->EXC_CTR);
-    printk("\t XER = %x\n", ctx->EXC_XER);
-    printk("\t LR = %x\n", ctx->EXC_LR);
-    printk("\t MSR = %x\n", ctx->EXC_SRR1);
+    printk ("----------------------------------------------------------\n");
+    printk ("Exception %d caught at PC %x by thread %d\n",
+            ctx->_EXC_number, ctx->EXC_SRR0, _Thread_Executing->Object.id);
+    printk ("----------------------------------------------------------\n");
+    printk ("Processor execution context at time of the fault was  :\n");
+    printk ("----------------------------------------------------------\n");
+    printk ("\t R0 = %x\n", ctx->GPR0);
+    printk ("\t R1 = %x\n", ctx->GPR1);
+    printk ("\t R2 = %x\n", ctx->GPR2);
+    printk ("\t R3 = %x\n", ctx->GPR3);
+    printk ("\t R4 = %x\n", ctx->GPR4);
+    printk ("\t R5 = %x\n", ctx->GPR5);
+    printk ("\t R6 = %x\n", ctx->GPR6);
+    printk ("\t R7 = %x\n", ctx->GPR7);
+    printk ("\t R8 = %x\n", ctx->GPR8);
+    printk ("\t R9 = %x\n", ctx->GPR9);
+    printk ("\t R10 = %x\n", ctx->GPR10);
+    printk ("\t R11 = %x\n", ctx->GPR11);
+    printk ("\t R12 = %x\n", ctx->GPR12);
+    printk ("\t R13 = %x\n", ctx->GPR13);
+    printk ("\t R14 = %x\n", ctx->GPR14);
+    printk ("\t R15 = %x\n", ctx->GPR15);
+    printk ("\t R16 = %x\n", ctx->GPR16);
+    printk ("\t R17 = %x\n", ctx->GPR17);
+    printk ("\t R18 = %x\n", ctx->GPR18);
+    printk ("\t R19 = %x\n", ctx->GPR19);
+    printk ("\t R20 = %x\n", ctx->GPR20);
+    printk ("\t R21 = %x\n", ctx->GPR21);
+    printk ("\t R22 = %x\n", ctx->GPR22);
+    printk ("\t R23 = %x\n", ctx->GPR23);
+    printk ("\t R24 = %x\n", ctx->GPR24);
+    printk ("\t R25 = %x\n", ctx->GPR25);
+    printk ("\t R26 = %x\n", ctx->GPR26);
+    printk ("\t R27 = %x\n", ctx->GPR27);
+    printk ("\t R28 = %x\n", ctx->GPR28);
+    printk ("\t R29 = %x\n", ctx->GPR29);
+    printk ("\t R30 = %x\n", ctx->GPR30);
+    printk ("\t R31 = %x\n", ctx->GPR31);
+    printk ("\t CR = %x\n", ctx->EXC_CR);
+    printk ("\t CTR = %x\n", ctx->EXC_CTR);
+    printk ("\t XER = %x\n", ctx->EXC_XER);
+    printk ("\t LR = %x\n", ctx->EXC_LR);
+    printk ("\t MSR = %x\n", ctx->EXC_SRR1);
 #endif
 
-    status = rtems_semaphore_create (rtems_build_name('D', 'B', 'G', 'c'),
-				     0,
-				     RTEMS_FIFO |
-				     RTEMS_COUNTING_SEMAPHORE |
-				     RTEMS_NO_INHERIT_PRIORITY |
-				     RTEMS_NO_PRIORITY_CEILING |
-				     RTEMS_LOCAL,
-				     0,
-				     &continueSemId);
+    status = rtems_semaphore_create (rtems_build_name ('D', 'B', 'G', 'c'),
+                                     0,
+                                     RTEMS_FIFO |
+                                     RTEMS_COUNTING_SEMAPHORE |
+                                     RTEMS_NO_INHERIT_PRIORITY |
+                                     RTEMS_NO_PRIORITY_CEILING |
+                                     RTEMS_LOCAL, 0, &continueSemId);
     if (status != RTEMS_SUCCESSFUL)
-      rtems_panic ("Can't create continue semaphore: `%s'\n",rtems_status_text(status));
+      rtems_panic ("Can't create continue semaphore: `%s'\n",
+                   rtems_status_text (status));
 
     PushExceptCtx (_Thread_Executing->Object.id, continueSemId, ctx);
-  
-    switch (ctx->_EXC_number){
-    case ASM_TRACE_VECTOR :
-      DPRINTF((" TRACE EXCEPTION !!!\n"));
+
+    switch (ctx->_EXC_number) {
+    case ASM_TRACE_VECTOR:
+      DPRINTF ((" TRACE EXCEPTION !!!\n"));
       ctx->EXC_SRR1 &= ~MSR_SE;
-      ExitForSingleStep-- ;
-      rtems_semaphore_release( wakeupEventSemId );
-    break;
+      ExitForSingleStep--;
+      rtems_semaphore_release (wakeupEventSemId);
+      break;
 
-    case ASM_PROG_VECTOR :
-      DPRINTF((" BREAKPOINT EXCEPTION !!!\n"));
-      rtems_semaphore_release( wakeupEventSemId );
-    break;
+    case ASM_PROG_VECTOR:
+      DPRINTF ((" BREAKPOINT EXCEPTION !!!\n"));
+      rtems_semaphore_release (wakeupEventSemId);
+      break;
 
-    case ASM_SYS_VECTOR :
-      DPRINTF((" ENTER RDBG !!!\n"));
-      rtems_semaphore_release( wakeupEventSemId );
+    case ASM_SYS_VECTOR:
+      DPRINTF ((" ENTER RDBG !!!\n"));
+      rtems_semaphore_release (wakeupEventSemId);
       break;
 
     default:
-      DPRINTF((" OTHER EXCEPTION !!!\n"));
-#ifdef DDEBUG
-	{ extern void BSP_printStackTrace();
-		BSP_printStackTrace(ctx);
-	}
-#endif
-      rtems_semaphore_release( wakeupEventSemId );
+      DPRINTF ((" OTHER EXCEPTION !!!\n"));
+      rtems_semaphore_release (wakeupEventSemId);
       break;
     }
 
-    rtems_semaphore_obtain(continueSemId, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
-    
+    rtems_semaphore_obtain (continueSemId, RTEMS_WAIT, RTEMS_NO_TIMEOUT);
+
     PopExceptCtx (_Thread_Executing->Object.id);
-    rtems_semaphore_delete(continueSemId);
+    rtems_semaphore_delete (continueSemId);
   }
-
 }
-
-
-