* config/m32r/m32r.mt (GDBSERVER_LIBS): Added ../../intl/libintl.a.

* config/mips/vr5000.mt (GDBSERVER_LIBS): Likewise.
* config/tic80/tic80.mt (GDBSERVER_LIBS): Likewise.
* gdbserver/low-sim.c (#include "defs.h"): Removed.
(mygeneric_load): Rename from generic_load.

* gdbserver/low-hppabsd.c (#include "server.h"): Added.
(#include "defs.h"): Removed.
(inferior_pid, perror_with_name): Remove declarations.
* gdbserver/low-linux.c: Likewise.
* gdbserver/low-nbsd.c: Likewise.
* gdbserver/low-sparc.c: Likewise.
* gdbserver/low-sun3.c: Likewise.

* i386-stub.c: Re-indent.
* m68k-stub.c: Re-indent.

gdb/ChangeLog

@@ -1,3 +1,22 @@
+2001-01-23  J.T. Conklin  <jtc@redback.com>
+	
+	* config/m32r/m32r.mt (GDBSERVER_LIBS): Added ../../intl/libintl.a.
+	* config/mips/vr5000.mt (GDBSERVER_LIBS): Likewise.
+	* config/tic80/tic80.mt (GDBSERVER_LIBS): Likewise.
+	* gdbserver/low-sim.c (#include "defs.h"): Removed.
+	(mygeneric_load): Rename from generic_load.
+	
+	* gdbserver/low-hppabsd.c (#include "server.h"): Added.
+	(#include "defs.h"): Removed.
+	(inferior_pid, perror_with_name): Remove declarations.
+	* gdbserver/low-linux.c: Likewise.
+	* gdbserver/low-nbsd.c: Likewise.
+	* gdbserver/low-sparc.c: Likewise.
+	* gdbserver/low-sun3.c: Likewise.
+
+	* i386-stub.c: Re-indent.
+	* m68k-stub.c: Re-indent.
+
 2001-01-22  Nicholas Duffek  <nsd@redhat.com>
 
 	* gdbarch.sh (PARM_BOUNDARY): Define.

gdb/config/m32r/m32r.mt

@@ -4,4 +4,4 @@ TM_FILE= tm-m32r.h
 SIM_OBS = remote-sim.o
 SIM = ../sim/m32r/libsim.a
 GDBSERVER_DEPFILES= low-sim.o
-GDBSERVER_LIBS = ../../sim/m32r/libsim.a ../../bfd/libbfd.a ../../libiberty/libiberty.a ../../opcodes/libopcodes.a
+GDBSERVER_LIBS = ../../sim/m32r/libsim.a ../../bfd/libbfd.a ../../libiberty/libiberty.a ../../opcodes/libopcodes.a ../../intl/libintl.a

gdb/config/mips/vr5000.mt

@@ -4,4 +4,4 @@ TM_FILE= tm-vr5000.h
 SIM_OBS = remote-sim.o
 SIM = ../sim/mips/libsim.a
 GDBSERVER_DEPFILES= low-sim.o
-GDBSERVER_LIBS = ../../sim/mips/libsim.a ../../bfd/libbfd.a ../../libiberty/libiberty.a -lm
+GDBSERVER_LIBS = ../../sim/mips/libsim.a ../../bfd/libbfd.a ../../libiberty/libiberty.a -lm ../../intl/libintl.a

gdb/config/tic80/tic80.mt

@@ -4,4 +4,4 @@ TM_FILE= tm-tic80.h
 SIM_OBS = remote-sim.o
 SIM = ../sim/tic80/libsim.a
 GDBSERVER_DEPFILES= low-sim.o
-GDBSERVER_LIBS = ../../sim/tic80/libsim.a ../../bfd/libbfd.a ../../libiberty/libiberty.a -lm
+GDBSERVER_LIBS = ../../sim/tic80/libsim.a ../../bfd/libbfd.a ../../libiberty/libiberty.a -lm ../../intl/libintl.a

gdb/gdbserver/low-hppabsd.c

@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
+#include "server.h"
 #include <sys/wait.h>
 #include "frame.h"
 #include "inferior.h"
@@ -41,8 +41,6 @@ char *registers = my_registers;
 #include <machine/reg.h>
 
 extern int errno;
-extern int inferior_pid;
-void perror_with_name ();
 
 /* Start an inferior process and returns its pid.
    ALLARGS is a vector of program-name and args. */

gdb/gdbserver/low-linux.c

@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
+#include "server.h"
 #include <sys/wait.h>
 #include "frame.h"
 #include "inferior.h"
@@ -47,8 +47,6 @@ char *registers = my_registers;
 #endif
 
 extern int errno;
-extern int inferior_pid;
-void perror_with_name ();
 
 static void initialize_arch (void);
 

gdb/gdbserver/low-nbsd.c

@@ -17,7 +17,7 @@ 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.  */
 
-#include "defs.h"
+#include "server.h"
 #include <sys/types.h>
 #include <sys/wait.h>
 #include "frame.h"
@@ -34,11 +34,6 @@ char *registers = my_registers;
 #include <sys/ptrace.h>
 #include <machine/reg.h>
 
-// extern int sys_nerr;
-// extern char **sys_errlist;
-extern int inferior_pid;
-void perror_with_name ();
-
 #define RF(dst, src) \
 	memcpy(&registers[REGISTER_BYTE(dst)], &src, sizeof(src))
 

gdb/gdbserver/low-sim.c

@@ -18,9 +18,8 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
-#include "bfd.h"
 #include "server.h"
+#include "bfd.h"
 #include "callback.h"		/* GDB simulator callback interface */
 #include "remote-sim.h"		/* GDB simulator interface */
 
@@ -41,7 +40,7 @@ static SIM_DESC gdbsim_desc = 0;
    does not support loading itself.  */
 
 static void
-generic_load (bfd *loadfile_bfd)
+mygeneric_load (bfd *loadfile_bfd)
 {
   asection *s;
 
@@ -131,7 +130,7 @@ create_inferior (char *program, char **argv)
   /* Load the program into the simulator.  */
   if (abfd)
     if (sim_load (gdbsim_desc, program, NULL, 0) == SIM_RC_FAIL)
-      generic_load (abfd);
+      mygeneric_load (abfd);
 
   /* Create an inferior process in the simulator.  This initializes SP.  */
   sim_create_inferior (gdbsim_desc, abfd, argv, /* env */ NULL);

gdb/gdbserver/low-sparc.c

@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
+#include "server.h"
 #include <sys/wait.h>
 #include "frame.h"
 #include "inferior.h"
@@ -46,8 +46,6 @@ char *registers = my_registers;
 extern int sys_nerr;
 extern char **sys_errlist;
 extern int errno;
-extern int inferior_pid;
-void perror_with_name ();
 
 /* Start an inferior process and returns its pid.
    ALLARGS is a vector of program-name and args. */

gdb/gdbserver/low-sun3.c

@@ -18,7 +18,7 @@
    Foundation, Inc., 59 Temple Place - Suite 330,
    Boston, MA 02111-1307, USA.  */
 
-#include "defs.h"
+#include "server.h"
 #include "<sys/wait.h>"
 #include "frame.h"
 #include "inferior.h"
@@ -43,8 +43,6 @@ char *registers = my_registers;
 extern int sys_nerr;
 extern char **sys_errlist;
 extern int errno;
-extern int inferior_pid;
-void perror_with_name ();
 
 /* Start an inferior process and returns its pid.
    ALLARGS is a vector of program-name and args. */

gdb/i386-stub.c

@@ -429,17 +429,22 @@ asm("		movl _stackPtr, %esp"); /* move to remcom stack area  */
 asm("		pushl %eax");	/* push exception onto stack  */
 asm("		call  _handle_exception");    /* this never returns */
 
-void _returnFromException()
+void
+_returnFromException ()
 {
   return_to_prog ();
 }
 
-int hex(ch)
+int
+hex (ch)
      char ch;
 {
-  if ((ch >= 'a') && (ch <= 'f')) return (ch-'a'+10);
+  if ((ch >= 'a') && (ch <= 'f'))
-  if ((ch >= '0') && (ch <= '9')) return (ch-'0');
+    return (ch - 'a' + 10);
-  if ((ch >= 'A') && (ch <= 'F')) return (ch-'A'+10);
+  if ((ch >= '0') && (ch <= '9'))
+    return (ch - '0');
+  if ((ch >= 'A') && (ch <= 'F'))
+    return (ch - 'A' + 10);
   return (-1);
 }
 
@@ -520,20 +525,22 @@ retry:
 
 /* send the packet in buffer.  */
 
-void putpacket(buffer)
+void
-    unsigned char *buffer;
+putpacket (unsigned char *buffer)
 {
   unsigned char checksum;
   int count;
   char ch;
 
   /*  $<packet info>#<checksum>. */
-  do {
+  do
+    {
       putDebugChar ('$');
       checksum = 0;
       count = 0;
 
-  while (ch=buffer[count]) {
+      while (ch = buffer[count])
+	{
 	  putDebugChar (ch);
 	  checksum += ch;
 	  count += 1;
@@ -543,15 +550,17 @@ void putpacket(buffer)
       putDebugChar (hexchars[checksum >> 4]);
       putDebugChar (hexchars[checksum % 16]);
 
-  } while (getDebugChar() != '+');
+    }
-
+  while (getDebugChar () != '+');
 }
 
-void debug_error(format, parm)
+void
+debug_error (format, parm)
      char *format;
      char *parm;
 {
-  if (remote_debug) fprintf (stderr,format,parm);
+  if (remote_debug)
+    fprintf (stderr, format, parm);
 }
 
 /* Address of a routine to RTE to if we get a memory fault.  */
@@ -587,7 +596,8 @@ set_char (char *addr, int val)
 /* return a pointer to the last char put in buf (null) */
 /* If MAY_FAULT is non-zero, then we should set mem_err in response to
    a fault; if zero treat a fault like any other fault in the stub.  */
-char* mem2hex(mem, buf, count, may_fault)
+char *
+mem2hex (mem, buf, count, may_fault)
      char *mem;
      char *buf;
      int count;
@@ -598,7 +608,8 @@ int may_fault;
 
   if (may_fault)
     mem_fault_routine = set_mem_err;
-      for (i=0;i<count;i++) {
+  for (i = 0; i < count; i++)
+    {
       ch = get_char (mem++);
       if (may_fault && mem_err)
 	return (buf);
@@ -613,7 +624,8 @@ int may_fault;
 
 /* convert the hex array pointed to by buf into binary to be placed in mem */
 /* return a pointer to the character AFTER the last byte written */
-char* hex2mem(buf, mem, count, may_fault)
+char *
+hex2mem (buf, mem, count, may_fault)
      char *buf;
      char *mem;
      int count;
@@ -624,7 +636,8 @@ int may_fault;
 
   if (may_fault)
     mem_fault_routine = set_mem_err;
-      for (i=0;i<count;i++) {
+  for (i = 0; i < count; i++)
+    {
       ch = hex (*buf++) << 4;
       ch = ch + hex (*buf++);
       set_char (mem++, ch);
@@ -638,26 +651,57 @@ int may_fault;
 
 /* this function takes the 386 exception vector and attempts to
    translate this number into a unix compatible signal value */
-int computeSignal( exceptionVector )
+int
-int exceptionVector;
+computeSignal (int exceptionVector)
 {
   int sigval;
-  switch (exceptionVector) {
+  switch (exceptionVector)
-    case 0 : sigval = 8; break; /* divide by zero */
+    {
-    case 1 : sigval = 5; break; /* debug exception */
+    case 0:
-    case 3 : sigval = 5; break; /* breakpoint */
+      sigval = 8;
-    case 4 : sigval = 16; break; /* into instruction (overflow) */
+      break;			/* divide by zero */
-    case 5 : sigval = 16; break; /* bound instruction */
+    case 1:
-    case 6 : sigval = 4; break; /* Invalid opcode */
+      sigval = 5;
-    case 7 : sigval = 8; break; /* coprocessor not available */
+      break;			/* debug exception */
-    case 8 : sigval = 7; break; /* double fault */
+    case 3:
-    case 9 : sigval = 11; break; /* coprocessor segment overrun */
+      sigval = 5;
-    case 10 : sigval = 11; break; /* Invalid TSS */
+      break;			/* breakpoint */
-    case 11 : sigval = 11; break; /* Segment not present */
+    case 4:
-    case 12 : sigval = 11; break; /* stack exception */
+      sigval = 16;
-    case 13 : sigval = 11; break; /* general protection */
+      break;			/* into instruction (overflow) */
-    case 14 : sigval = 11; break; /* page fault */
+    case 5:
-    case 16 : sigval = 7; break; /* coprocessor error */
+      sigval = 16;
+      break;			/* bound instruction */
+    case 6:
+      sigval = 4;
+      break;			/* Invalid opcode */
+    case 7:
+      sigval = 8;
+      break;			/* coprocessor not available */
+    case 8:
+      sigval = 7;
+      break;			/* double fault */
+    case 9:
+      sigval = 11;
+      break;			/* coprocessor segment overrun */
+    case 10:
+      sigval = 11;
+      break;			/* Invalid TSS */
+    case 11:
+      sigval = 11;
+      break;			/* Segment not present */
+    case 12:
+      sigval = 11;
+      break;			/* stack exception */
+    case 13:
+      sigval = 11;
+      break;			/* general protection */
+    case 14:
+      sigval = 11;
+      break;			/* page fault */
+    case 16:
+      sigval = 7;
+      break;			/* coprocessor error */
     default:
       sigval = 7;		/* "software generated" */
     }
@@ -668,7 +712,8 @@ int exceptionVector;
 /* WHILE WE FIND NICE HEX CHARS, BUILD AN INT */
 /* RETURN NUMBER OF CHARS PROCESSED           */
 /**********************************************/
-int hexToInt(char **ptr, int *intValue)
+int
+hexToInt (char **ptr, int *intValue)
 {
   int numChars = 0;
   int hexValue;
@@ -695,7 +740,8 @@ int hexToInt(char **ptr, int *intValue)
 /*
  * This function does all command procesing for interfacing to gdb.
  */
-void handle_exception(int exceptionVector)
+void
+handle_exception (int exceptionVector)
 {
   int sigval, stepping;
   int addr, length;
@@ -704,10 +750,11 @@ void handle_exception(int exceptionVector)
 
   gdb_i386vector = exceptionVector;
 
-  if (remote_debug) printf("vector=%d, sr=0x%x, pc=0x%x\n",
+  if (remote_debug)
-			    exceptionVector,
+    {
-			    registers[ PS ],
+      printf ("vector=%d, sr=0x%x, pc=0x%x\n",
-			    registers[ PC ]);
+	      exceptionVector, registers[PS], registers[PC]);
+    }
 
   /* reply to host that an exception has occurred */
   sigval = computeSignal (exceptionVector);
@@ -720,17 +767,21 @@ void handle_exception(int exceptionVector)
 
   stepping = 0;
 
-  while (1==1) {
+  while (1 == 1)
+    {
       remcomOutBuffer[0] = 0;
       ptr = getpacket ();
 
-    switch (*ptr++) {
+      switch (*ptr++)
-      case '?' :   remcomOutBuffer[0] = 'S';
+	{
+	case '?':
+	  remcomOutBuffer[0] = 'S';
 	  remcomOutBuffer[1] = hexchars[sigval >> 4];
 	  remcomOutBuffer[2] = hexchars[sigval % 16];
 	  remcomOutBuffer[3] = 0;
 	  break;
-      case 'd' : remote_debug = !(remote_debug);  /* toggle debug flag */
+	case 'd':
+	  remote_debug = !(remote_debug);	/* toggle debug flag */
 	  break;
 	case 'g':		/* return the value of the CPU registers */
 	  mem2hex ((char *) registers, remcomOutBuffer, NUMREGBYTES, 0);
@@ -765,7 +816,8 @@ void handle_exception(int exceptionVector)
 		  ptr = 0;
 		  mem_err = 0;
 		  mem2hex ((char *) addr, remcomOutBuffer, length, 1);
-				if (mem_err) {
+		  if (mem_err)
+		    {
 		      strcpy (remcomOutBuffer, "E03");
 		      debug_error ("memory fault");
 		    }
@@ -788,10 +840,13 @@ void handle_exception(int exceptionVector)
 		    mem_err = 0;
 		    hex2mem (ptr, (char *) addr, length, 1);
 
-				    if (mem_err) {
+		    if (mem_err)
+		      {
 			strcpy (remcomOutBuffer, "E03");
 			debug_error ("memory fault");
-				    } else {
+		      }
+		    else
+		      {
 			strcpy (remcomOutBuffer, "OK");
 		      }
 
@@ -818,7 +873,8 @@ void handle_exception(int exceptionVector)
 	  registers[PS] &= 0xfffffeff;
 
 	  /* set the trace bit if we're stepping */
-          if (stepping) registers[ PS ] |= 0x100;
+	  if (stepping)
+	    registers[PS] |= 0x100;
 
 	  _returnFromException ();	/* this is a jump */
 	  break;
@@ -840,11 +896,9 @@ void handle_exception(int exceptionVector)
 
 /* this function is used to set up exception handlers for tracing and
    breakpoints */
-void set_debug_traps()
+void
+set_debug_traps (void)
 {
-extern void remcomHandler();
-int exception;
-
   stackPtr = &remcomStack[STACKSIZE / sizeof (int) - 1];
 
   exceptionHandler (0, _catchException0);
@@ -871,7 +925,8 @@ int exception;
    otherwise as a quick means to stop program execution and "break" into
    the debugger. */
 
-void breakpoint()
+void
+breakpoint (void)
 {
   if (initialized)
     BREAKPOINT ();

gdb/m68k-stub.c

@@ -477,7 +477,8 @@ asm("		movel   d0,sp@-");	/* push exception onto stack  */
 asm("		jbsr    _handle_exception");    /* this never returns */
 asm("           rts");                  /* return */
 
-void _returnFromException( Frame *frame )
+void
+_returnFromException (Frame * frame)
 {
   /* if no passed in frame, use the last one */
   if (!frame)
@@ -513,12 +514,16 @@ void _returnFromException( Frame *frame )
     }
 }
 
-int hex(ch)
+int
+hex (ch)
      char ch;
 {
-  if ((ch >= 'a') && (ch <= 'f')) return (ch-'a'+10);
+  if ((ch >= 'a') && (ch <= 'f'))
-  if ((ch >= '0') && (ch <= '9')) return (ch-'0');
+    return (ch - 'a' + 10);
-  if ((ch >= 'A') && (ch <= 'F')) return (ch-'A'+10);
+  if ((ch >= '0') && (ch <= '9'))
+    return (ch - '0');
+  if ((ch >= 'A') && (ch <= 'F'))
+    return (ch - 'A' + 10);
   return (-1);
 }
 
@@ -599,8 +604,8 @@ retry:
 
 /* send the packet in buffer. */
 
-
+void
-void putpacket(buffer)
+putpacket (buffer)
      char *buffer;
 {
   unsigned char checksum;
@@ -608,12 +613,14 @@ char * buffer;
   char ch;
 
   /*  $<packet info>#<checksum>. */
-  do {
+  do
+    {
       putDebugChar ('$');
       checksum = 0;
       count = 0;
 
-  while (ch=buffer[count]) {
+      while (ch = buffer[count])
+	{
 	  putDebugChar (ch);
 	  checksum += ch;
 	  count += 1;
@@ -623,27 +630,32 @@ char * buffer;
       putDebugChar (hexchars[checksum >> 4]);
       putDebugChar (hexchars[checksum % 16]);
 
-  } while (getDebugChar() != '+');
+    }
+  while (getDebugChar () != '+');
 
 }
 
-void debug_error(format, parm)
+void
+debug_error (format, parm)
      char *format;
      char *parm;
 {
-  if (remote_debug) fprintf (stderr,format,parm);
+  if (remote_debug)
+    fprintf (stderr, format, parm);
 }
 
 /* convert the memory pointed to by mem into hex, placing result in buf */
 /* return a pointer to the last char put in buf (null) */
-char* mem2hex(mem, buf, count)
+char *
+mem2hex (mem, buf, count)
      char *mem;
      char *buf;
      int count;
 {
   int i;
   unsigned char ch;
-      for (i=0;i<count;i++) {
+  for (i = 0; i < count; i++)
+    {
       ch = *mem++;
       *buf++ = hexchars[ch >> 4];
       *buf++ = hexchars[ch % 16];
@@ -654,14 +666,16 @@ int   count;
 
 /* convert the hex array pointed to by buf into binary to be placed in mem */
 /* return a pointer to the character AFTER the last byte written */
-char* hex2mem(buf, mem, count)
+char *
+hex2mem (buf, mem, count)
      char *buf;
      char *mem;
      int count;
 {
   int i;
   unsigned char ch;
-      for (i=0;i<count;i++) {
+  for (i = 0; i < count; i++)
+    {
       ch = hex (*buf++) << 4;
       ch = ch + hex (*buf++);
       *mem++ = ch;
@@ -672,49 +686,94 @@ int   count;
 /* a bus error has occurred, perform a longjmp
    to return execution and allow handling of the error */
 
-void handle_buserror()
+void
+handle_buserror ()
 {
   longjmp (remcomEnv, 1);
 }
 
 /* this function takes the 68000 exception number and attempts to 
    translate this number into a unix compatible signal value */
-int computeSignal( exceptionVector )
+int
+computeSignal (exceptionVector)
      int exceptionVector;
 {
   int sigval;
-  switch (exceptionVector) {
+  switch (exceptionVector)
-    case 2 : sigval = 10; break; /* bus error           */
+    {
-    case 3 : sigval = 10; break; /* address error       */
+    case 2:
-    case 4 : sigval = 4;  break; /* illegal instruction */
+      sigval = 10;
-    case 5 : sigval = 8;  break; /* zero divide         */
+      break;			/* bus error           */
-    case 6 : sigval = 8; break; /* chk instruction     */
+    case 3:
-    case 7 : sigval = 8; break; /* trapv instruction   */
+      sigval = 10;
-    case 8 : sigval = 11; break; /* privilege violation */
+      break;			/* address error       */
-    case 9 : sigval = 5;  break; /* trace trap          */
+    case 4:
-    case 10: sigval = 4;  break; /* line 1010 emulator  */
+      sigval = 4;
-    case 11: sigval = 4;  break; /* line 1111 emulator  */
+      break;			/* illegal instruction */
+    case 5:
+      sigval = 8;
+      break;			/* zero divide         */
+    case 6:
+      sigval = 8;
+      break;			/* chk instruction     */
+    case 7:
+      sigval = 8;
+      break;			/* trapv instruction   */
+    case 8:
+      sigval = 11;
+      break;			/* privilege violation */
+    case 9:
+      sigval = 5;
+      break;			/* trace trap          */
+    case 10:
+      sigval = 4;
+      break;			/* line 1010 emulator  */
+    case 11:
+      sigval = 4;
+      break;			/* line 1111 emulator  */
 
       /* Coprocessor protocol violation.  Using a standard MMU or FPU
          this cannot be triggered by software.  Call it a SIGBUS.  */
-    case 13: sigval = 10;  break;
+    case 13:
+      sigval = 10;
+      break;
 
-    case 31: sigval = 2;  break; /* interrupt           */
+    case 31:
-    case 33: sigval = 5;  break; /* breakpoint          */
+      sigval = 2;
+      break;			/* interrupt           */
+    case 33:
+      sigval = 5;
+      break;			/* breakpoint          */
 
       /* This is a trap #8 instruction.  Apparently it is someone's software
          convention for some sort of SIGFPE condition.  Whose?  How many
          people are being screwed by having this code the way it is?
          Is there a clean solution?  */
-    case 40: sigval = 8;  break; /* floating point err  */
+    case 40:
+      sigval = 8;
+      break;			/* floating point err  */
 
-    case 48: sigval = 8;  break; /* floating point err  */
+    case 48:
-    case 49: sigval = 8;  break; /* floating point err  */
+      sigval = 8;
-    case 50: sigval = 8;  break; /* zero divide         */
+      break;			/* floating point err  */
-    case 51: sigval = 8;  break; /* underflow           */
+    case 49:
-    case 52: sigval = 8;  break; /* operand error       */
+      sigval = 8;
-    case 53: sigval = 8;  break; /* overflow            */
+      break;			/* floating point err  */
-    case 54: sigval = 8;  break; /* NAN                 */
+    case 50:
+      sigval = 8;
+      break;			/* zero divide         */
+    case 51:
+      sigval = 8;
+      break;			/* underflow           */
+    case 52:
+      sigval = 8;
+      break;			/* operand error       */
+    case 53:
+      sigval = 8;
+      break;			/* overflow            */
+    case 54:
+      sigval = 8;
+      break;			/* NAN                 */
     default:
       sigval = 7;		/* "software generated" */
     }
@@ -725,7 +784,8 @@ int exceptionVector;
 /* WHILE WE FIND NICE HEX CHARS, BUILD AN INT */
 /* RETURN NUMBER OF CHARS PROCESSED           */
 /**********************************************/
-int hexToInt(char **ptr, int *intValue)
+int
+hexToInt (char **ptr, int *intValue)
 {
   int numChars = 0;
   int hexValue;
@@ -752,7 +812,8 @@ int hexToInt(char **ptr, int *intValue)
 /*
  * This function does all command procesing for interfacing to gdb.
  */
-void handle_exception(int exceptionVector)
+void
+handle_exception (int exceptionVector)
 {
   int sigval, stepping;
   int addr, length;
@@ -760,10 +821,9 @@ void handle_exception(int exceptionVector)
   int newPC;
   Frame *frame;
 
-  if (remote_debug) printf("vector=%d, sr=0x%x, pc=0x%x\n", 
+  if (remote_debug)
-			    exceptionVector,
+    printf ("vector=%d, sr=0x%x, pc=0x%x\n",
-			    registers[ PS ], 
+	    exceptionVector, registers[PS], registers[PC]);
-			    registers[ PC ]);
 
   /* reply to host that an exception has occurred */
   sigval = computeSignal (exceptionVector);
@@ -776,16 +836,20 @@ void handle_exception(int exceptionVector)
 
   stepping = 0;
 
-  while (1==1) { 
+  while (1 == 1)
+    {
       remcomOutBuffer[0] = 0;
       ptr = getpacket ();
-    switch (*ptr++) {
+      switch (*ptr++)
-      case '?' :   remcomOutBuffer[0] = 'S';
+	{
+	case '?':
+	  remcomOutBuffer[0] = 'S';
 	  remcomOutBuffer[1] = hexchars[sigval >> 4];
 	  remcomOutBuffer[2] = hexchars[sigval % 16];
 	  remcomOutBuffer[3] = 0;
 	  break;
-      case 'd' : remote_debug = !(remote_debug);  /* toggle debug flag */
+	case 'd':
+	  remote_debug = !(remote_debug);	/* toggle debug flag */
 	  break;
 	case 'g':		/* return the value of the CPU registers */
 	  mem2hex ((char *) registers, remcomOutBuffer, NUMREGBYTES);
@@ -814,7 +878,9 @@ void handle_exception(int exceptionVector)
 		{
 		  strcpy (remcomOutBuffer, "E01");
 		}
-                } else {
+	    }
+	  else
+	    {
 	      exceptionHandler (2, _catchException);
 	      strcpy (remcomOutBuffer, "E03");
 	      debug_error ("bus error");
@@ -826,7 +892,8 @@ void handle_exception(int exceptionVector)
 
 	  /* MAA..AA,LLLL: Write LLLL bytes at address AA.AA return OK */
 	case 'M':
-	        if (setjmp(remcomEnv) == 0) {
+	  if (setjmp (remcomEnv) == 0)
+	    {
 	      exceptionHandler (2, handle_buserror);
 
 	      /* TRY TO READ '%x,%x:'.  IF SUCCEED, SET PTR = 0 */
@@ -843,7 +910,9 @@ void handle_exception(int exceptionVector)
 		{
 		  strcpy (remcomOutBuffer, "E02");
 		}
-                } else {
+	    }
+	  else
+	    {
 	      exceptionHandler (2, _catchException);
 	      strcpy (remcomOutBuffer, "E03");
 	      debug_error ("bus error");
@@ -868,29 +937,32 @@ void handle_exception(int exceptionVector)
 	  registers[PS] &= 0x7fff;
 
 	  /* set the trace bit if we're stepping */
-          if (stepping) registers[ PS ] |= 0x8000;
+	  if (stepping)
+	    registers[PS] |= 0x8000;
 
 	  /*
 	   * look for newPC in the linked list of exception frames.
 	   * if it is found, use the old frame it.  otherwise,
 	   * fake up a dummy frame in returnFromException().
 	   */
-          if (remote_debug) printf("new pc = 0x%x\n",newPC);
+	  if (remote_debug)
+	    printf ("new pc = 0x%x\n", newPC);
 	  frame = lastFrame;
 	  while (frame)
 	    {
 	      if (remote_debug)
 		printf ("frame at 0x%x has pc=0x%x, except#=%d\n",
-                         frame,frame->exceptionPC,
+			frame, frame->exceptionPC, frame->exceptionVector);
-                         frame->exceptionVector);
+	      if (frame->exceptionPC == newPC)
-              if (frame->exceptionPC == newPC) break;  /* bingo! a match */
+		break;		/* bingo! a match */
 	      /*
 	       * for a breakpoint instruction, the saved pc may
 	       * be off by two due to re-executing the instruction
 	       * replaced by the trap instruction.  Check for this.
 	       */
 	      if ((frame->exceptionVector == 33) &&
-                  (frame->exceptionPC == (newPC+2))) break;
+		  (frame->exceptionPC == (newPC + 2)))
+		break;
 	      if (frame == frame->previous)
 		{
 		  frame = 0;	/* no match found */
@@ -974,7 +1046,8 @@ initializeRemcomErrorFrame (void)
 
 /* this function is used to set up exception handlers for tracing and 
    breakpoints */
-void set_debug_traps()
+void
+set_debug_traps ()
 {
   extern void _debug_level7 ();
   extern void remcomHandler ();
@@ -1017,8 +1090,9 @@ void set_debug_traps()
    otherwise as a quick means to stop program execution and "break" into
    the debugger. */
 
-void breakpoint()
+void
+breakpoint ()
 {
-  if (initialized) BREAKPOINT();
+  if (initialized)
+    BREAKPOINT ();
 }
-