These files are for an arch we don't care about.

8 files changed, 0 insertions, 5171 deletions

diff --git a/contrib/gdb/gdb/abug-rom.c b/contrib/gdb/gdb/abug-rom.c
deleted file mode 100644
index 97ff0f8..0000000
--- a/contrib/gdb/gdb/abug-rom.c
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Remote debugging interface for ABug Rom monitor for GDB, the GNU debugger.
-   Copyright 1995, 1996, 1998 Free Software Foundation, Inc.
-
-   Written by Rob Savoye of Cygnus Support
-
-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 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.  */
-
-#include "defs.h"
-#include "gdbcore.h"
-#include "target.h"
-#include "monitor.h"
-#include "serial.h"
-
-/* Prototypes for local functions. */
-
-static void abug_open PARAMS ((char *args, int from_tty));
-
-static void
-abug_supply_register (regname, regnamelen, val, vallen)
-     char *regname;
-     int regnamelen;
-     char *val;
-     int vallen;
-{
-  int regno;
-
-  if (regnamelen != 2)
-    return;
-
-  switch (regname[0])
-    {
-    case 'S':
-      if (regname[1] != 'R')
-	return;
-      regno = PS_REGNUM;
-      break;
-    case 'P':
-      if (regname[1] != 'C')
-	return;
-      regno = PC_REGNUM;
-      break;
-    case 'D':
-      if (regname[1] < '0' || regname[1] > '7')
-	return;
-      regno = regname[1] - '0' + D0_REGNUM;
-      break;
-    case 'A':
-      if (regname[1] < '0' || regname[1] > '7')
-	return;
-      regno = regname[1] - '0' + A0_REGNUM;
-      break;
-    default:
-      return;
-    }
-
-  monitor_supply_register (regno, val);
-}
-
-/*
- * This array of registers needs to match the indexes used by GDB. The
- * whole reason this exists is because the various ROM monitors use
- * different names than GDB does, and don't support all the
- * registers either. So, typing "info reg sp" becomes an "A7".
- */
-
-static char *abug_regnames[NUM_REGS] =
-{
-  "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7",
-  "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7",
-  "PC",
-};
-
-/*
- * Define the monitor command strings. Since these are passed directly
- * through to a printf style function, we need can include formatting
- * strings. We also need a CR or LF on the end.
- */
-
-static struct target_ops abug_ops;
-
-static char *abug_inits[] = {"\r", NULL};
-
-static struct monitor_ops abug_cmds ;
-
-static void 
-init_abug_cmds(void)
-{
-  abug_cmds.flags =   MO_CLR_BREAK_USES_ADDR;
-  abug_cmds.init =   abug_inits;			/* Init strings */
-  abug_cmds.cont =   "g\r";			/* continue command */
-  abug_cmds.step =   "t\r";			/* single step */
-  abug_cmds.stop =   NULL;				/* interrupt command */
-  abug_cmds.set_break =   "br %x\r";			/* set a breakpoint */
-  abug_cmds.clr_break =   "nobr %x\r";			/* clear a breakpoint */
-  abug_cmds.clr_all_break =   "nobr\r";			/* clear all breakpoints */
-  abug_cmds.fill =   "bf %x:%x %x;b\r";		/* fill (start count val) */
-  abug_cmds.setmem.cmdb =     "ms %x %02x\r";		/* setmem.cmdb (addr, value) */
-  abug_cmds.setmem.cmdw =     "ms %x %04x\r";		/* setmem.cmdw (addr, value) */
-  abug_cmds.setmem.cmdl =     "ms %x %08x\r";		/* setmem.cmdl (addr, value) */
-  abug_cmds.setmem.cmdll =     NULL;			/* setmem.cmdll (addr, value) */
-  abug_cmds.setmem.resp_delim =     NULL;			/* setreg.resp_delim */
-  abug_cmds.setmem.term =     NULL;			/* setreg.term */
-  abug_cmds.setmem.term_cmd =     NULL;			/* setreg.term_cmd */
-  abug_cmds.getmem.cmdb =     "md %x:%x;b\r";		/* getmem.cmdb (addr, len) */
-  abug_cmds.getmem.cmdw =     "md %x:%x;b\r";		/* getmem.cmdw (addr, len) */
-  abug_cmds.getmem.cmdl =     "md %x:%x;b\r";		/* getmem.cmdl (addr, len) */
-  abug_cmds.getmem.cmdll =     NULL;			/* getmem.cmdll (addr, len) */
-  abug_cmds.getmem.resp_delim =     " ";			/* getmem.resp_delim */
-  abug_cmds.getmem.term =     NULL;			/* getmem.term */
-  abug_cmds.getmem.term_cmd =     NULL;			/* getmem.term_cmd */
-  abug_cmds.setreg.cmd =     "rm %s %x\r";		/* setreg.cmd (name, value) */
-  abug_cmds.setreg.resp_delim =     "=";			/* setreg.resp_delim */
-  abug_cmds.setreg.term =     "? ";			/* setreg.term */
-  abug_cmds.setreg.term_cmd =     ".\r"	;		/* setreg.term_cmd */
-  abug_cmds.getreg.cmd =     "rm %s\r";			/* getreg.cmd (name) */
-  abug_cmds.getreg.resp_delim =     "=";			/* getreg.resp_delim */
-  abug_cmds.getreg.term =     "? ";			/* getreg.term */
-  abug_cmds.getreg.term_cmd =     ".\r"	;		/* getreg.term_cmd */
-    abug_cmds.dump_registers =   "rd\r";			/* dump_registers */
-  abug_cmds.register_pattern =   "\\(\\w+\\) +=\\([0-9a-fA-F]+\\b\\)"; /* register_pattern */
-  abug_cmds.supply_register =   abug_supply_register;	/* supply_register */
-  abug_cmds.load_routine =   NULL;				/* load_routine (defaults to SRECs) */
-  abug_cmds.load =   "lo 0\r";			/* download command */
-  abug_cmds.loadresp =   "\n";				/* load response */
-  abug_cmds.prompt =   "135Bug>";			/* monitor command prompt */
-  abug_cmds.line_term =   "\r";				/* end-of-line terminator */
-  abug_cmds.cmd_end =   NULL;				/* optional command terminator */
-  abug_cmds.target =   &abug_ops;			/* target operations */
-  abug_cmds.stopbits =   SERIAL_1_STOPBITS;		/* number of stop bits */
-  abug_cmds.regnames =   abug_regnames;		/* registers names */
-  abug_cmds.magic =   MONITOR_OPS_MAGIC	;	/* magic */
-}; 
-
-static void
-abug_open(args, from_tty)
-     char *args;
-     int from_tty;
-{
-  monitor_open (args, &abug_cmds, from_tty);
-}
-
-void
-_initialize_abug_rom ()
-{
-  init_abug_cmds() ;
-  init_monitor_ops (&abug_ops);
-
-  abug_ops.to_shortname = "abug";
-  abug_ops.to_longname = "ABug monitor";
-  abug_ops.to_doc = "Debug via the ABug monitor.\n\
-Specify the serial device it is connected to (e.g. /dev/ttya).";
-  abug_ops.to_open = abug_open;
-
-  add_target (&abug_ops);
-}
diff --git a/contrib/gdb/gdb/fr30-tdep.c b/contrib/gdb/gdb/fr30-tdep.c
deleted file mode 100644
index 0d442da..0000000
--- a/contrib/gdb/gdb/fr30-tdep.c
+++ /dev/null
@@ -1,552 +0,0 @@
-/* Target-dependent code for the Fujitsu FR30.
-   Copyright 1999, Free Software Foundation, Inc.
-
-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 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.  */
-
-#include "defs.h"
-#include "frame.h"
-#include "inferior.h"
-#include "obstack.h"
-#include "target.h"
-#include "value.h"
-#include "bfd.h"
-#include "gdb_string.h"
-#include "gdbcore.h"
-#include "symfile.h"
-
-/* Function: pop_frame
-   This routine gets called when either the user uses the `return'
-   command, or the call dummy breakpoint gets hit.  */
-
-void
-fr30_pop_frame ()
-{
-  struct frame_info *frame = get_current_frame();
-  int regnum;
-  CORE_ADDR sp = read_register(SP_REGNUM);
-
-  if (PC_IN_CALL_DUMMY(frame->pc, frame->frame, frame->frame))
-    generic_pop_dummy_frame ();
-  else
-    {
-      write_register (PC_REGNUM, FRAME_SAVED_PC (frame));
-
-      for (regnum = 0; regnum < NUM_REGS; regnum++)
-	if (frame->fsr.regs[regnum] != 0) {
-	  write_register (regnum,
-		  read_memory_unsigned_integer (frame->fsr.regs[regnum],
-			REGISTER_RAW_SIZE(regnum)));
-	}
-      write_register (SP_REGNUM, sp + frame->framesize);
-    }
-  flush_cached_frames ();
-}
-
-/* Function: skip_prologue
-   Return the address of the first code past the prologue of the function.  */
-
-CORE_ADDR
-fr30_skip_prologue(CORE_ADDR pc)
-{
-  CORE_ADDR func_addr, func_end;
-
-  /* See what the symbol table says */
-
-  if (find_pc_partial_function (pc, NULL, &func_addr, &func_end))
-    {
-      struct symtab_and_line sal;
-
-      sal = find_pc_line (func_addr, 0);
-
-      if (sal.line != 0 && sal.end < func_end) {
-	return sal.end;
-	}
-    }
-
-/* Either we didn't find the start of this function (nothing we can do),
-   or there's no line info, or the line after the prologue is after
-   the end of the function (there probably isn't a prologue). */
-
-  return pc;
-}
-
-
-/* Function: push_arguments
-   Setup arguments and RP for a call to the target.  First four args
-   go in FIRST_ARGREG -> LAST_ARGREG, subsequent args go on stack...
-   Structs are passed by reference.  XXX not right now Z.R.
-   64 bit quantities (doubles and long longs) may be split between
-   the regs and the stack.
-   When calling a function that returns a struct, a pointer to the struct
-   is passed in as a secret first argument (always in FIRST_ARGREG).
-
-   Stack space for the args has NOT been allocated: that job is up to us.
-*/
-
-CORE_ADDR
-fr30_push_arguments(nargs, args, sp, struct_return, struct_addr)
-     int         nargs;
-     value_ptr * args;
-     CORE_ADDR   sp;
-     int         struct_return;
-     CORE_ADDR   struct_addr;
-{
-  int argreg;
-  int argnum;
-  int stack_offset;
-  struct stack_arg {
-      char *val;
-      int len;
-      int offset;
-    };
-  struct stack_arg *stack_args =
-      (struct stack_arg*)alloca (nargs * sizeof (struct stack_arg));
-  int nstack_args = 0;
-
-  argreg = FIRST_ARGREG;
-
-  /* the struct_return pointer occupies the first parameter-passing reg */
-  if (struct_return)
-      write_register (argreg++, struct_addr);
-
-  stack_offset = 0;
-
-  /* Process args from left to right.  Store as many as allowed in
-	registers, save the rest to be pushed on the stack */
-  for(argnum = 0; argnum < nargs; argnum++)
-    {
-      char *         val;
-      value_ptr      arg = args[argnum];
-      struct type *  arg_type = check_typedef (VALUE_TYPE (arg));
-      struct type *  target_type = TYPE_TARGET_TYPE (arg_type);
-      int            len = TYPE_LENGTH (arg_type);
-      enum type_code typecode = TYPE_CODE (arg_type);
-      CORE_ADDR      regval;
-      int newarg;
-
-      val = (char *) VALUE_CONTENTS (arg);
-
-	{
-	  /* Copy the argument to general registers or the stack in
-	     register-sized pieces.  Large arguments are split between
-	     registers and stack.  */
-	  while (len > 0)
-	    {
-	      if (argreg <= LAST_ARGREG)
-		{
-	          int partial_len = len < REGISTER_SIZE ? len : REGISTER_SIZE;
-		  regval = extract_address (val, partial_len);
-
-		  /* It's a simple argument being passed in a general
-		     register.  */
-		  write_register (argreg, regval);
-		  argreg++;
-	          len -= partial_len;
-	          val += partial_len;
-		}
-	      else
-		{
-		  /* keep for later pushing */
-		  stack_args[nstack_args].val = val;
-		  stack_args[nstack_args++].len = len;
-		  break;
-		}
-	    }
-	}
-    }
-    /* now do the real stack pushing, process args right to left */
-    while(nstack_args--)
-      {
-	sp -= stack_args[nstack_args].len;
-	write_memory(sp, stack_args[nstack_args].val,
-		stack_args[nstack_args].len);
-      }
-
-  /* Return adjusted stack pointer.  */
-  return sp;
-}
-
-_initialize_fr30_tdep()
-{
-	extern int print_insn_fr30(bfd_vma, disassemble_info *);
-
-	tm_print_insn = print_insn_fr30;
-}
-
-/* Function: check_prologue_cache
-   Check if prologue for this frame's PC has already been scanned.
-   If it has, copy the relevant information about that prologue and
-   return non-zero.  Otherwise do not copy anything and return zero.
-
-   The information saved in the cache includes:
-     * the frame register number;
-     * the size of the stack frame;
-     * the offsets of saved regs (relative to the old SP); and
-     * the offset from the stack pointer to the frame pointer
-
-   The cache contains only one entry, since this is adequate
-   for the typical sequence of prologue scan requests we get.
-   When performing a backtrace, GDB will usually ask to scan
-   the same function twice in a row (once to get the frame chain,
-   and once to fill in the extra frame information).
-*/
-
-static struct frame_info prologue_cache;
-
-static int
-check_prologue_cache (fi)
-     struct frame_info * fi;
-{
-  int i;
-
-  if (fi->pc == prologue_cache.pc)
-    {
-      fi->framereg = prologue_cache.framereg;
-      fi->framesize = prologue_cache.framesize;
-      fi->frameoffset = prologue_cache.frameoffset;
-      for (i = 0; i <= NUM_REGS; i++)
-	fi->fsr.regs[i] = prologue_cache.fsr.regs[i];
-      return 1;
-    }
-  else
-    return 0;
-}
-
-
-/* Function: save_prologue_cache
-   Copy the prologue information from fi to the prologue cache.
-*/
-
-static void
-save_prologue_cache (fi)
-     struct frame_info * fi;
-{
-  int i;
-
-  prologue_cache.pc          = fi->pc;
-  prologue_cache.framereg    = fi->framereg;
-  prologue_cache.framesize   = fi->framesize;
-  prologue_cache.frameoffset = fi->frameoffset;
-  
-  for (i = 0; i <= NUM_REGS; i++) {
-    prologue_cache.fsr.regs[i] = fi->fsr.regs[i];
-  }
-}
-
-
-/* Function: scan_prologue
-   Scan the prologue of the function that contains PC, and record what
-   we find in PI.  PI->fsr must be zeroed by the called.  Returns the
-   pc after the prologue.  Note that the addresses saved in pi->fsr
-   are actually just frame relative (negative offsets from the frame
-   pointer).  This is because we don't know the actual value of the
-   frame pointer yet.  In some circumstances, the frame pointer can't
-   be determined till after we have scanned the prologue.  */
-
-static void
-fr30_scan_prologue (fi)
-     struct frame_info * fi;
-{
-  int sp_offset, fp_offset;
-  CORE_ADDR prologue_start, prologue_end, current_pc;
-
-  /* Check if this function is already in the cache of frame information. */
-  if (check_prologue_cache (fi))
-    return;
-
-  /* Assume there is no frame until proven otherwise.  */
-  fi->framereg    = SP_REGNUM;
-  fi->framesize   = 0;
-  fi->frameoffset = 0;
-
-  /* Find the function prologue.  If we can't find the function in
-     the symbol table, peek in the stack frame to find the PC.  */
-  if (find_pc_partial_function (fi->pc, NULL, &prologue_start, &prologue_end))
-    {
-      /* Assume the prologue is everything between the first instruction
-         in the function and the first source line.  */
-      struct symtab_and_line sal = find_pc_line (prologue_start, 0);
-
-      if (sal.line == 0)		/* no line info, use current PC */
-	prologue_end = fi->pc;
-      else if (sal.end < prologue_end)	/* next line begins after fn end */
-	prologue_end = sal.end;		/* (probably means no prologue)  */
-    }
-  else
-    {
-      /* XXX Z.R. What now??? The following is entirely bogus */
-      prologue_start = (read_memory_integer (fi->frame, 4) & 0x03fffffc) - 12;
-      prologue_end = prologue_start + 40;
-    }
-
-  /* Now search the prologue looking for instructions that set up the
-     frame pointer, adjust the stack pointer, and save registers.  */
-
-  sp_offset = fp_offset = 0;
-  for (current_pc = prologue_start; current_pc < prologue_end; current_pc += 2)
-    {
-      unsigned int insn;
-
-      insn = read_memory_unsigned_integer (current_pc, 2);
-
-      if ((insn & 0xfe00) == 0x8e00)			/* stm0 or stm1 */
-	{
-	  int reg, mask = insn & 0xff;
-
-	  /* scan in one sweep - create virtual 16-bit mask from either insn's mask */
-          if((insn & 0x0100) == 0)
-	    {
-	      mask <<= 8;  /* stm0 - move to upper byte in virtual mask */
-	    }
-
-	  /* Calculate offsets of saved registers (to be turned later into addresses). */
-	  for (reg = R4_REGNUM; reg <= R11_REGNUM; reg++)
-	    if (mask & (1 << (15 - reg)))
-	      {
-		sp_offset -= 4;
-		fi->fsr.regs[reg] = sp_offset;
-	      }
-	}
-      else if((insn & 0xfff0) == 0x1700)		/* st rx,@-r15 */
-        {
-	  int reg = insn & 0xf;
-
-	  sp_offset -= 4;
-	  fi->fsr.regs[reg] = sp_offset;
-	}
-      else if((insn & 0xff00) == 0x0f00)		/* enter */
-        {
-	  fp_offset = fi->fsr.regs[FP_REGNUM] = sp_offset - 4;
-	  sp_offset -= 4 * (insn & 0xff);
-	  fi->framereg = FP_REGNUM;
-	}
-      else if(insn == 0x1781)				/* st rp,@-sp */
-	{
-		sp_offset -= 4;
-		fi->fsr.regs[RP_REGNUM] = sp_offset;
-	}
-      else if(insn == 0x170e)				/* st fp,@-sp */
-	{
-		sp_offset -= 4;
-		fi->fsr.regs[FP_REGNUM] = sp_offset;
-	}
-      else if(insn == 0x8bfe)				/* mov sp,fp */
-	{
-	  fi->framereg = FP_REGNUM;
-	}
-      else if((insn & 0xff00) == 0xa300)		/* addsp xx */
-	{
-	  sp_offset += 4 * (signed char)(insn & 0xff);
-	}
-      else if((insn & 0xff0f) == 0x9b00 &&		/* ldi:20 xx,r0 */
-	read_memory_unsigned_integer(current_pc+4, 2)
-	  == 0xac0f)					/* sub r0,sp */
-	{
-	  /* large stack adjustment */
-	  sp_offset -= (((insn & 0xf0) << 12) | read_memory_unsigned_integer(current_pc+2, 2));
-	  current_pc += 4;
-	}
-      else if(insn == 0x9f80 &&				/* ldi:32 xx,r0 */
-	read_memory_unsigned_integer(current_pc+6, 2)
-	  == 0xac0f)					/* sub r0,sp */
-	{
-	  /* large stack adjustment */
-	  sp_offset -=
-		(read_memory_unsigned_integer(current_pc+2, 2) << 16 |
-			read_memory_unsigned_integer(current_pc+4, 2));
-	  current_pc += 6;
-	}
-    }
-
-  /* The frame size is just the negative of the offset (from the original SP)
-     of the last thing thing we pushed on the stack.  The frame offset is
-     [new FP] - [new SP].  */
-  fi->framesize = -sp_offset;
-  fi->frameoffset = fp_offset - sp_offset;
-  
-  save_prologue_cache (fi);
-}
-
-/* Function: init_extra_frame_info
-   Setup the frame's frame pointer, pc, and frame addresses for saved
-   registers.  Most of the work is done in scan_prologue().
-
-   Note that when we are called for the last frame (currently active frame),
-   that fi->pc and fi->frame will already be setup.  However, fi->frame will
-   be valid only if this routine uses FP.  For previous frames, fi-frame will
-   always be correct (since that is derived from fr30_frame_chain ()).
-
-   We can be called with the PC in the call dummy under two circumstances.
-   First, during normal backtracing, second, while figuring out the frame
-   pointer just prior to calling the target function (see run_stack_dummy).  */
-
-void
-fr30_init_extra_frame_info (fi)
-     struct frame_info * fi;
-{
-  int reg;
-
-  if (fi->next)
-    fi->pc = FRAME_SAVED_PC (fi->next);
-
-  memset (fi->fsr.regs, '\000', sizeof fi->fsr.regs);
-
-  if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-    {
-      /* We need to setup fi->frame here because run_stack_dummy gets it wrong
-	 by assuming it's always FP.  */
-      fi->frame       = generic_read_register_dummy (fi->pc, fi->frame, SP_REGNUM);
-      fi->framesize   = 0;
-      fi->frameoffset = 0;
-      return;
-    }
-      fr30_scan_prologue (fi);
-
-      if (!fi->next)			/* this is the innermost frame? */
-	fi->frame = read_register (fi->framereg);
-      else			 	/* not the innermost frame */
-	/* If we have an FP,  the callee saved it. */
-	if (fi->framereg == FP_REGNUM)
-	  if (fi->next->fsr.regs[fi->framereg] != 0)
-	    fi->frame = read_memory_integer (fi->next->fsr.regs[fi->framereg],
-					     4);
-      /* Calculate actual addresses of saved registers using offsets determined
-         by fr30_scan_prologue.  */
-      for (reg = 0; reg < NUM_REGS; reg++)
-	if (fi->fsr.regs[reg] != 0) {
-	  fi->fsr.regs[reg] += fi->frame + fi->framesize - fi->frameoffset;
-	}
-}
-
-/* Function: find_callers_reg
-   Find REGNUM on the stack.  Otherwise, it's in an active register.
-   One thing we might want to do here is to check REGNUM against the
-   clobber mask, and somehow flag it as invalid if it isn't saved on
-   the stack somewhere.  This would provide a graceful failure mode
-   when trying to get the value of caller-saves registers for an inner
-   frame.  */
-
-CORE_ADDR
-fr30_find_callers_reg (fi, regnum)
-     struct frame_info *fi;
-     int regnum;
-{
-  for (; fi; fi = fi->next)
-    if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-      return generic_read_register_dummy (fi->pc, fi->frame, regnum);
-    else if (fi->fsr.regs[regnum] != 0)
-      return read_memory_unsigned_integer (fi->fsr.regs[regnum], 
-					   REGISTER_RAW_SIZE(regnum));
-
-  return read_register (regnum);
-}
-
-
-/* Function: frame_chain
-   Figure out the frame prior to FI.  Unfortunately, this involves
-   scanning the prologue of the caller, which will also be done
-   shortly by fr30_init_extra_frame_info.  For the dummy frame, we
-   just return the stack pointer that was in use at the time the
-   function call was made.  */
-
-
-CORE_ADDR
-fr30_frame_chain (fi)
-     struct frame_info * fi;
-{
-  CORE_ADDR fn_start, callers_pc, fp;
-  struct frame_info caller_fi;
-  int framereg;
-
-  /* is this a dummy frame? */
-  if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-    return fi->frame;	/* dummy frame same as caller's frame */
-
-  /* is caller-of-this a dummy frame? */
-  callers_pc = FRAME_SAVED_PC(fi);  /* find out who called us: */
-  fp = fr30_find_callers_reg (fi, FP_REGNUM);
-  if (PC_IN_CALL_DUMMY (callers_pc, fp, fp))	
-    return fp;		/* dummy frame's frame may bear no relation to ours */
-
-  if (find_pc_partial_function (fi->pc, 0, &fn_start, 0))
-    if (fn_start == entry_point_address ())
-      return 0;		/* in _start fn, don't chain further */
-
-  framereg = fi->framereg;
-
-  /* If the caller is the startup code, we're at the end of the chain.  */
-  if (find_pc_partial_function (callers_pc, 0, &fn_start, 0))
-    if (fn_start == entry_point_address ())
-      return 0;
-
-  memset (& caller_fi, 0, sizeof (caller_fi));
-  caller_fi.pc = callers_pc;
-  fr30_scan_prologue (& caller_fi);
-  framereg = caller_fi.framereg;
-
-  /* If the caller used a frame register, return its value.
-     Otherwise, return the caller's stack pointer.  */
-  if (framereg == FP_REGNUM)
-    return fr30_find_callers_reg (fi, framereg);
-  else
-    return fi->frame + fi->framesize;
-}
-
-/* Function: frame_saved_pc 
-   Find the caller of this frame.  We do this by seeing if RP_REGNUM
-   is saved in the stack anywhere, otherwise we get it from the
-   registers.  If the inner frame is a dummy frame, return its PC
-   instead of RP, because that's where "caller" of the dummy-frame
-   will be found.  */
-
-CORE_ADDR
-fr30_frame_saved_pc (fi)
-     struct frame_info *fi;
-{
-  if (PC_IN_CALL_DUMMY(fi->pc, fi->frame, fi->frame))
-    return generic_read_register_dummy(fi->pc, fi->frame, PC_REGNUM);
-  else
-    return fr30_find_callers_reg (fi, RP_REGNUM);
-}
-
-/* Function: fix_call_dummy
-   Pokes the callee function's address into the CALL_DUMMY assembly stub.
-   Assumes that the CALL_DUMMY looks like this:
-	jarl <offset24>, r31
-	trap
-   */
-
-int
-fr30_fix_call_dummy (dummy, sp, fun, nargs, args, type, gcc_p)
-     char *dummy;
-     CORE_ADDR sp;
-     CORE_ADDR fun;
-     int nargs;
-     value_ptr *args;
-     struct type *type;
-     int gcc_p;
-{
-  long offset24;
-
-  offset24 = (long) fun - (long) entry_point_address ();
-  offset24 &= 0x3fffff;
-  offset24 |= 0xff800000;	/* jarl <offset24>, r31 */
-
-  store_unsigned_integer ((unsigned int *)&dummy[2], 2, offset24 & 0xffff);
-  store_unsigned_integer ((unsigned int *)&dummy[0], 2, offset24 >> 16);
-  return 0;
-}
diff --git a/contrib/gdb/gdb/m68klinux-nat.c b/contrib/gdb/gdb/m68klinux-nat.c
deleted file mode 100644
index 8367b24..0000000
--- a/contrib/gdb/gdb/m68klinux-nat.c
+++ /dev/null
@@ -1,155 +0,0 @@
-/* Motorola m68k native support for Linux
-   Copyright (C) 1996,1998 Free Software Foundation, Inc.
-
-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 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.  */
-
-#include "defs.h"
-#include "frame.h"
-#include "inferior.h"
-#include "language.h"
-#include "gdbcore.h"
-
-#ifdef USG
-#include <sys/types.h>
-#endif
-
-#include <sys/param.h>
-#include <sys/dir.h>
-#include <signal.h>
-#include <sys/user.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <sys/procfs.h>
-
-#include <sys/file.h>
-#include "gdb_stat.h"
-
-#include "floatformat.h"
-
-#include "target.h"
-
-
-/* This table must line up with REGISTER_NAMES in tm-m68k.h */
-static const int regmap[] = 
-{
-  PT_D0, PT_D1, PT_D2, PT_D3, PT_D4, PT_D5, PT_D6, PT_D7,
-  PT_A0, PT_A1, PT_A2, PT_A3, PT_A4, PT_A5, PT_A6, PT_USP,
-  PT_SR, PT_PC,
-  /* PT_FP0, ..., PT_FP7 */
-  21, 24, 27, 30, 33, 36, 39, 42,
-  /* PT_FPCR, PT_FPSR, PT_FPIAR */
-  45, 46, 47
-};
-
-/* BLOCKEND is the value of u.u_ar0, and points to the place where GS
-   is stored.  */
-
-int
-m68k_linux_register_u_addr (blockend, regnum)
-     int blockend;
-     int regnum;
-{
-    return (blockend + 4 * regmap[regnum]);
-}
-
-/*  Given a pointer to a general register set in /proc format (gregset_t *),
-    unpack the register contents and supply them as gdb's idea of the current
-    register values. */
-
-
-/* Note both m68k-tdep.c and m68klinux-nat.c contain definitions
-   for supply_gregset and supply_fpregset. The definitions
-   in m68k-tdep.c are valid if USE_PROC_FS is defined. Otherwise,
-   the definitions in m68klinux-nat.c will be used. This is a 
-   bit of a hack. The supply_* routines do not belong in 
-   *_tdep.c files. But, there are several lynx ports that currently 
-   depend on these definitions. */ 
-
-#ifndef USE_PROC_FS
-
-void
-supply_gregset (gregsetp)
-     gregset_t *gregsetp;
-{
-  int regi;
-
-  for (regi = D0_REGNUM ; regi <= SP_REGNUM ; regi++)
-    supply_register (regi, (char *) (*gregsetp + regmap[regi]));
-  supply_register (PS_REGNUM, (char *) (*gregsetp + PT_SR));
-  supply_register (PC_REGNUM, (char *) (*gregsetp + PT_PC));
-}
-
-/*  Given a pointer to a floating point register set in /proc format
-    (fpregset_t *), unpack the register contents and supply them as gdb's
-    idea of the current floating point register values. */
-
-void 
-supply_fpregset (fpregsetp)
-     fpregset_t *fpregsetp;
-{
-  int regi;
-
-  for (regi = FP0_REGNUM ; regi < FPC_REGNUM ; regi++)
-    supply_register (regi, (char *) &fpregsetp->fpregs[(regi - FP0_REGNUM) * 3]);
-  supply_register (FPC_REGNUM, (char *) &fpregsetp->fpcntl[0]);
-  supply_register (FPS_REGNUM, (char *) &fpregsetp->fpcntl[1]);
-  supply_register (FPI_REGNUM, (char *) &fpregsetp->fpcntl[2]);
-}
-
-#endif
-
-
-int
-kernel_u_size ()
-{
-  return (sizeof (struct user));
-}
-
-/* Return non-zero if PC points into the signal trampoline.  */
-
-int
-in_sigtramp (pc)
-     CORE_ADDR pc;
-{
-  CORE_ADDR sp;
-  char buf[TARGET_SHORT_BIT / TARGET_CHAR_BIT];
-  int insn;
-
-  sp = read_register (SP_REGNUM);
-  if (pc - 2 < sp)
-    return 0;
-
-  if (read_memory_nobpt (pc, buf, sizeof (buf)))
-    return 0;
-  insn = extract_unsigned_integer (buf, sizeof (buf));
-  if (insn == 0xdefc /* addaw #,sp */
-      || insn == 0x7077 /* moveq #119,d0 */
-      || insn == 0x4e40 /* trap #0 */
-      || insn == 0x203c /* movel #,d0 */)
-    return 1;
-
-  if (read_memory_nobpt (pc - 2, buf, sizeof (buf)))
-    return 0;
-  insn = extract_unsigned_integer (buf, sizeof (buf));
-  if (insn == 0xdefc /* addaw #,sp */
-      || insn == 0x7077 /* moveq #119,d0 */
-      || insn == 0x4e40 /* trap #0 */
-      || insn == 0x203c /* movel #,d0 */)
-    return 1;
-
-  return 0;
-}
diff --git a/contrib/gdb/gdb/ns32knbsd-nat.c b/contrib/gdb/gdb/ns32knbsd-nat.c
deleted file mode 100644
index c9f75ca..0000000
--- a/contrib/gdb/gdb/ns32knbsd-nat.c
+++ /dev/null
@@ -1,353 +0,0 @@
-/* Functions specific to running gdb native on an ns32k running NetBSD
-   Copyright 1989, 1992, 1993, 1994, 1996 Free Software Foundation, Inc.
-
-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 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.  */
-
-#include <sys/types.h>
-#include <sys/ptrace.h>
-#include <machine/reg.h>
-#include <machine/frame.h>
-#include <machine/pcb.h>
-
-#include "defs.h"
-#include "inferior.h"
-#include "target.h"
-#include "gdbcore.h"
-
-#define RF(dst, src) \
-	memcpy(&registers[REGISTER_BYTE(dst)], &src, sizeof(src))
-
-#define RS(src, dst) \
-	memcpy(&dst, &registers[REGISTER_BYTE(src)], sizeof(dst))
-
-void
-fetch_inferior_registers (regno)
-     int regno;
-{
-  struct reg inferior_registers;
-  struct fpreg inferior_fpregisters;
-
-  ptrace (PT_GETREGS, inferior_pid,
-	  (PTRACE_ARG3_TYPE) &inferior_registers, 0);
-  ptrace (PT_GETFPREGS, inferior_pid,
-	  (PTRACE_ARG3_TYPE) &inferior_fpregisters, 0);
-
-  RF(R0_REGNUM + 0, inferior_registers.r_r0);
-  RF(R0_REGNUM + 1, inferior_registers.r_r1);
-  RF(R0_REGNUM + 2, inferior_registers.r_r2);
-  RF(R0_REGNUM + 3, inferior_registers.r_r3);
-  RF(R0_REGNUM + 4, inferior_registers.r_r4);
-  RF(R0_REGNUM + 5, inferior_registers.r_r5);
-  RF(R0_REGNUM + 6, inferior_registers.r_r6);
-  RF(R0_REGNUM + 7, inferior_registers.r_r7);
-
-  RF(SP_REGNUM	  , inferior_registers.r_sp);
-  RF(FP_REGNUM	  , inferior_registers.r_fp);
-  RF(PC_REGNUM	  , inferior_registers.r_pc);
-  RF(PS_REGNUM	  , inferior_registers.r_psr);
-
-  RF(FPS_REGNUM   , inferior_fpregisters.r_fsr);
-  RF(FP0_REGNUM +0, inferior_fpregisters.r_freg[0]);
-  RF(FP0_REGNUM +2, inferior_fpregisters.r_freg[2]);
-  RF(FP0_REGNUM +4, inferior_fpregisters.r_freg[4]);
-  RF(FP0_REGNUM +6, inferior_fpregisters.r_freg[6]);
-  RF(LP0_REGNUM + 1, inferior_fpregisters.r_freg[1]);
-  RF(LP0_REGNUM + 3, inferior_fpregisters.r_freg[3]);
-  RF(LP0_REGNUM + 5, inferior_fpregisters.r_freg[5]);
-  RF(LP0_REGNUM + 7, inferior_fpregisters.r_freg[7]);
-   registers_fetched ();
-}
-
-void
-store_inferior_registers (regno)
-     int regno;
-{
-  struct reg inferior_registers;
-  struct fpreg inferior_fpregisters;
-
-  RS(R0_REGNUM + 0, inferior_registers.r_r0);
-  RS(R0_REGNUM + 1, inferior_registers.r_r1);
-  RS(R0_REGNUM + 2, inferior_registers.r_r2);
-  RS(R0_REGNUM + 3, inferior_registers.r_r3);
-  RS(R0_REGNUM + 4, inferior_registers.r_r4);
-  RS(R0_REGNUM + 5, inferior_registers.r_r5);
-  RS(R0_REGNUM + 6, inferior_registers.r_r6);
-  RS(R0_REGNUM + 7, inferior_registers.r_r7);
-
-  RS(SP_REGNUM	  , inferior_registers.r_sp);
-  RS(FP_REGNUM	  , inferior_registers.r_fp);
-  RS(PC_REGNUM	  , inferior_registers.r_pc);
-  RS(PS_REGNUM	  , inferior_registers.r_psr);
-
-  RS(FPS_REGNUM   , inferior_fpregisters.r_fsr);
-  RS(FP0_REGNUM +0, inferior_fpregisters.r_freg[0]);
-  RS(FP0_REGNUM +2, inferior_fpregisters.r_freg[2]);
-  RS(FP0_REGNUM +4, inferior_fpregisters.r_freg[4]);
-  RS(FP0_REGNUM +6, inferior_fpregisters.r_freg[6]);
-  RS(LP0_REGNUM + 1, inferior_fpregisters.r_freg[1]);
-  RS(LP0_REGNUM + 3, inferior_fpregisters.r_freg[3]);
-  RS(LP0_REGNUM + 5, inferior_fpregisters.r_freg[5]);
-  RS(LP0_REGNUM + 7, inferior_fpregisters.r_freg[7]);
-
-  ptrace (PT_SETREGS, inferior_pid,
-	  (PTRACE_ARG3_TYPE) &inferior_registers, 0);
-  ptrace (PT_SETFPREGS, inferior_pid,
-	  (PTRACE_ARG3_TYPE) &inferior_fpregisters, 0);
-}
-
-
-/* XXX - Add this to machine/regs.h instead? */
-struct coreregs {
-  struct reg intreg;
-  struct fpreg freg;
-};
-
-/* Get registers from a core file. */
-static void
-fetch_core_registers (core_reg_sect, core_reg_size, which, reg_addr)
-     char *core_reg_sect;
-     unsigned core_reg_size;
-     int which;
-     unsigned int reg_addr;	/* Unused in this version */
-{
-  struct coreregs *core_reg;
-
-  core_reg = (struct coreregs *)core_reg_sect;
-
-  /*
-   * We have *all* registers
-   * in the first core section.
-   * Ignore which.
-   */
-
-  if (core_reg_size < sizeof(*core_reg)) {
-    fprintf_unfiltered (gdb_stderr, "Couldn't read regs from core file\n");
-    return;
-  }
-
-  /* Integer registers */
-  RF(R0_REGNUM + 0, core_reg->intreg.r_r0);
-  RF(R0_REGNUM + 1, core_reg->intreg.r_r1);
-  RF(R0_REGNUM + 2, core_reg->intreg.r_r2);
-  RF(R0_REGNUM + 3, core_reg->intreg.r_r3);
-  RF(R0_REGNUM + 4, core_reg->intreg.r_r4);
-  RF(R0_REGNUM + 5, core_reg->intreg.r_r5);
-  RF(R0_REGNUM + 6, core_reg->intreg.r_r6);
-  RF(R0_REGNUM + 7, core_reg->intreg.r_r7);
-
-  RF(SP_REGNUM	  , core_reg->intreg.r_sp);
-  RF(FP_REGNUM	  , core_reg->intreg.r_fp);
-  RF(PC_REGNUM	  , core_reg->intreg.r_pc);
-  RF(PS_REGNUM	  , core_reg->intreg.r_psr);
-
-  /* Floating point registers */
-  RF(FPS_REGNUM   , core_reg->freg.r_fsr);
-  RF(FP0_REGNUM +0, core_reg->freg.r_freg[0]);
-  RF(FP0_REGNUM +2, core_reg->freg.r_freg[2]);
-  RF(FP0_REGNUM +4, core_reg->freg.r_freg[4]);
-  RF(FP0_REGNUM +6, core_reg->freg.r_freg[6]);
-  RF(LP0_REGNUM + 1, core_reg->freg.r_freg[1]);
-  RF(LP0_REGNUM + 3, core_reg->freg.r_freg[3]);
-  RF(LP0_REGNUM + 5, core_reg->freg.r_freg[5]);
-  RF(LP0_REGNUM + 7, core_reg->freg.r_freg[7]);
-  registers_fetched ();
-}
-
-/* Register that we are able to handle ns32knbsd core file formats.
-   FIXME: is this really bfd_target_unknown_flavour? */
-
-static struct core_fns nat_core_fns =
-{
-  bfd_target_unknown_flavour,
-  fetch_core_registers,
-  NULL
-};
-
-void
-_initialize_ns32knbsd_nat ()
-{
-  add_core_fns (&nat_core_fns);
-}
-
-
-/*
- * kernel_u_size() is not helpful on NetBSD because
- * the "u" struct is NOT in the core dump file.
- */
-
-#ifdef	FETCH_KCORE_REGISTERS
-/*
- * Get registers from a kernel crash dump or live kernel.
- * Called by kcore-nbsd.c:get_kcore_registers().
- */
-void
-fetch_kcore_registers (pcb)
-     struct pcb *pcb;
-{
-  struct switchframe sf;
-  struct reg intreg;
-  int dummy;
-
-  /* Integer registers */
-  if (target_read_memory((CORE_ADDR)pcb->pcb_ksp, (char *)&sf, sizeof sf))
-     error("Cannot read integer registers.");
-
-  /* We use the psr at kernel entry */
-  if (target_read_memory((CORE_ADDR)pcb->pcb_onstack, (char *)&intreg, sizeof intreg))
-     error("Cannot read processor status register.");
-
-  dummy = 0;
-  RF(R0_REGNUM + 0, dummy);
-  RF(R0_REGNUM + 1, dummy);
-  RF(R0_REGNUM + 2, dummy);
-  RF(R0_REGNUM + 3, sf.sf_r3);
-  RF(R0_REGNUM + 4, sf.sf_r4);
-  RF(R0_REGNUM + 5, sf.sf_r5);
-  RF(R0_REGNUM + 6, sf.sf_r6);
-  RF(R0_REGNUM + 7, sf.sf_r7);
-
-  dummy = pcb->pcb_kfp + 8;
-  RF(SP_REGNUM	  , dummy);
-  RF(FP_REGNUM	  , sf.sf_fp);
-  RF(PC_REGNUM	  , sf.sf_pc);
-  RF(PS_REGNUM	  , intreg.r_psr);
-
-  /* Floating point registers */
-  RF(FPS_REGNUM   , pcb->pcb_fsr);
-  RF(FP0_REGNUM +0, pcb->pcb_freg[0]);
-  RF(FP0_REGNUM +2, pcb->pcb_freg[2]);
-  RF(FP0_REGNUM +4, pcb->pcb_freg[4]);
-  RF(FP0_REGNUM +6, pcb->pcb_freg[6]);
-  RF(LP0_REGNUM + 1, pcb->pcb_freg[1]);
-  RF(LP0_REGNUM + 3, pcb->pcb_freg[3]);
-  RF(LP0_REGNUM + 5, pcb->pcb_freg[5]);
-  RF(LP0_REGNUM + 7, pcb->pcb_freg[7]);
-  registers_fetched ();
-}
-#endif	/* FETCH_KCORE_REGISTERS */
-
-void
-clear_regs()
-{
-  double zero = 0.0;
-  int null = 0;
-  
-  /* Integer registers */
-  RF(R0_REGNUM + 0, null);
-  RF(R0_REGNUM + 1, null);
-  RF(R0_REGNUM + 2, null);
-  RF(R0_REGNUM + 3, null);
-  RF(R0_REGNUM + 4, null);
-  RF(R0_REGNUM + 5, null);
-  RF(R0_REGNUM + 6, null);
-  RF(R0_REGNUM + 7, null);
-
-  RF(SP_REGNUM	  , null);
-  RF(FP_REGNUM	  , null);
-  RF(PC_REGNUM	  , null);
-  RF(PS_REGNUM	  , null);
-
-  /* Floating point registers */
-  RF(FPS_REGNUM   , zero);
-  RF(FP0_REGNUM +0, zero);
-  RF(FP0_REGNUM +2, zero);
-  RF(FP0_REGNUM +4, zero);
-  RF(FP0_REGNUM +6, zero);
-  RF(LP0_REGNUM + 0, zero);
-  RF(LP0_REGNUM + 1, zero);
-  RF(LP0_REGNUM + 2, zero);
-  RF(LP0_REGNUM + 3, zero);
-  return;
-}
-
-/* Return number of args passed to a frame.
-   Can return -1, meaning no way to tell. */
-
-int
-frame_num_args(fi)
-struct frame_info *fi;
-{
-	CORE_ADDR	enter_addr;
-	CORE_ADDR	argp;
-	int		inst;
-	int		args;
-	int		i;
-
-	if (read_memory_integer (fi->frame, 4) == 0 && fi->pc < 0x10000) {
-		/* main is always called with three args */
-		return(3);
-	}
-	enter_addr = ns32k_get_enter_addr(fi->pc);
-	if (enter_addr = 0)
-		return(-1);
-	argp = enter_addr == 1 ? SAVED_PC_AFTER_CALL(fi) : FRAME_SAVED_PC(fi);
-	for (i = 0; i < 16; i++) {
-		/*
-		 * After a bsr gcc may emit the following instructions
-		 * to remove the arguments from the stack:
-		 *   cmpqd 0,tos 	- to remove 4 bytes from the stack
-		 *   cmpd tos,tos	- to remove 8 bytes from the stack
-		 *   adjsp[bwd] -n	- to remove n bytes from the stack
-		 * Gcc sometimes delays emitting these instructions and
-		 * may even throw a branch between our feet.
-		 */		 
-		inst = read_memory_integer(argp    , 4);
-		args = read_memory_integer(argp + 2, 4);
-		if ((inst & 0xff) == 0xea) {		/* br */
-			args = ((inst >> 8) & 0xffffff) | (args << 24);
-			if (args & 0x80) {
-				if (args & 0x40) {
-					args = ntohl(args);
-				} else {
-					args = ntohs(args & 0xffff);
-					if (args & 0x2000)
-						args |= 0xc000;
-				}
-			} else {
-				args = args & 0xff;
-				if (args & 0x40)
-					args |= 0x80;
-			}
-			argp += args;
-			continue;
-		}
-		if ((inst & 0xffff) == 0xb81f)		/* cmpqd 0,tos */
-			return(1);
-		else if ((inst & 0xffff) == 0xbdc7)	/* cmpd tos,tos */
-			return(2);
-		else if ((inst & 0xfffc) == 0xa57c) {	/* adjsp[bwd] */
-			switch (inst & 3) {
-			case 0:
-				args = ((args & 0xff) + 0x80);
-				break;
-			case 1:
-				args = ((ntohs(args) & 0xffff) + 0x8000);
-				break;
-			case 3:
-				args = -ntohl(args);
-				break;
-			default:
-				return(-1);
-			}
-			if (args / 4 > 10 || (args & 3) != 0)
-				continue;
-			return(args / 4);
-		}
-		argp += 1;
-	}
-	return(-1);
-}
diff --git a/contrib/gdb/gdb/os9kread.c b/contrib/gdb/gdb/os9kread.c
deleted file mode 100644
index 673d415..0000000
--- a/contrib/gdb/gdb/os9kread.c
+++ /dev/null
@@ -1,1624 +0,0 @@
-/* Read os9/os9k symbol tables and convert to internal format, for GDB.
-   Copyright 1986, 87, 88, 89, 90, 91, 92, 93, 94, 96, 1998
-   Free Software Foundation, Inc.
-
-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 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.  */
-
-/* This module provides three functions: os9k_symfile_init,
-   which initializes to read a symbol file; os9k_new_init, which 
-   discards existing cached information when all symbols are being
-   discarded; and os9k_symfile_read, which reads a symbol table
-   from a file.
-
-   os9k_symfile_read only does the minimum work necessary for letting the
-   user "name" things symbolically; it does not read the entire symtab.
-   Instead, it reads the external and static symbols and puts them in partial
-   symbol tables.  When more extensive information is requested of a
-   file, the corresponding partial symbol table is mutated into a full
-   fledged symbol table by going back and reading the symbols
-   for real.  os9k_psymtab_to_symtab() is the function that does this */
-
-#include "defs.h"
-#include "gdb_string.h"
-#include <stdio.h>
-
-#if defined(USG) || defined(__CYGNUSCLIB__)
-#include <sys/types.h>
-#include <fcntl.h>
-#endif
-
-#include "obstack.h"
-#include "gdb_stat.h"
-#include <ctype.h>
-#include "symtab.h"
-#include "breakpoint.h"
-#include "command.h"
-#include "target.h"
-#include "gdbcore.h"		/* for bfd stuff */
-#include "libaout.h"	 	/* FIXME Secret internal BFD stuff for a.out */
-#include "symfile.h"
-#include "objfiles.h"
-#include "buildsym.h"
-#include "gdb-stabs.h"
-#include "demangle.h"
-#include "language.h"		/* Needed inside partial-stab.h */
-#include "complaints.h"
-#include "os9k.h"
-#include "stabsread.h"
-
-/* Each partial symbol table entry contains a pointer to private data for the
-   read_symtab() function to use when expanding a partial symbol table entry
-   to a full symbol table entry.
-
-   For dbxread this structure contains the offset within the file symbol table
-   of first local symbol for this file, and count of the section
-   of the symbol table devoted to this file's symbols (actually, the section
-   bracketed may contain more than just this file's symbols).  It also contains
-   further information needed to locate the symbols if they are in an ELF file.
-
-   If ldsymcnt is 0, the only reason for this thing's existence is the
-   dependency list.  Nothing else will happen when it is read in.  */
-
-#define LDSYMOFF(p) (((struct symloc *)((p)->read_symtab_private))->ldsymoff)
-#define LDSYMCNT(p) (((struct symloc *)((p)->read_symtab_private))->ldsymnum)
-
-struct symloc {
-  int ldsymoff;
-  int ldsymnum;
-};
-
-/* Remember what we deduced to be the source language of this psymtab. */
-static enum language psymtab_language = language_unknown;
-
-/* keep partial symbol table file nested depth */
-static int psymfile_depth = 0;
-
-/* keep symbol table file nested depth */
-static int symfile_depth = 0;
-
-/* Nonzero means give verbose info on gdb action.  From main.c.  */
-extern int info_verbose;
-
-extern int previous_stab_code;
-
-/* Name of last function encountered.  Used in Solaris to approximate
-   object file boundaries.  */
-static char *last_function_name;
-
-/* Complaints about the symbols we have encountered.  */
-extern struct complaint lbrac_complaint;
-
-extern struct complaint unknown_symtype_complaint;
-
-extern struct complaint unknown_symchar_complaint;
-
-extern struct complaint lbrac_rbrac_complaint;
-
-extern struct complaint repeated_header_complaint;
-
-extern struct complaint repeated_header_name_complaint;
-
-#if 0
-static struct complaint lbrac_unmatched_complaint =
-  {"unmatched Increment Block Entry before symtab pos %d", 0, 0};
-
-static struct complaint lbrac_mismatch_complaint =
-  {"IBE/IDE symbol mismatch at symtab pos %d", 0, 0};
-#endif
-
-/* Local function prototypes */
-
-static void
-read_minimal_symbols PARAMS ((struct objfile *, struct section_offsets *));
-
-static void
-os9k_read_ofile_symtab PARAMS ((struct partial_symtab *));
-
-static void
-os9k_psymtab_to_symtab PARAMS ((struct partial_symtab *));
-
-static void
-os9k_psymtab_to_symtab_1 PARAMS ((struct partial_symtab *));
-
-static void
-read_os9k_psymtab PARAMS ((struct section_offsets *, struct objfile *,
-                         CORE_ADDR, int));
-
-static int
-fill_sym PARAMS ((FILE *, bfd *));
-
-static void
-os9k_symfile_init PARAMS ((struct objfile *));
-
-static void
-os9k_new_init PARAMS ((struct objfile *));
-
-static void
-os9k_symfile_read PARAMS ((struct objfile *, struct section_offsets *, int));
-
-static void
-os9k_symfile_finish PARAMS ((struct objfile *));
-
-static void
-os9k_process_one_symbol PARAMS ((int, int, CORE_ADDR, char *, 
-     struct section_offsets *, struct objfile *));
-
-static struct partial_symtab *
-os9k_start_psymtab PARAMS ((struct objfile *, struct section_offsets *, char *,
-                       CORE_ADDR, int, int, struct partial_symbol **,
-                       struct partial_symbol **));
-
-static struct partial_symtab *
-os9k_end_psymtab PARAMS ((struct partial_symtab *, char **, int, int, CORE_ADDR,
-                     struct partial_symtab **, int));
-
-static void
-record_minimal_symbol PARAMS ((char *, CORE_ADDR, int, struct objfile *, 
-	             struct section_offsets *));
-
-#define HANDLE_RBRAC(val) \
-  if ((val) > pst->texthigh) pst->texthigh = (val);
-
-#define SWAP_STBHDR(hdrp, abfd) \
-  { \
-    (hdrp)->fmtno = bfd_get_16(abfd, (unsigned char *)&(hdrp)->fmtno); \
-    (hdrp)->crc = bfd_get_32(abfd, (unsigned char *)&(hdrp)->crc); \
-    (hdrp)->offset = bfd_get_32(abfd, (unsigned char *)&(hdrp)->offset); \
-    (hdrp)->nsym = bfd_get_32(abfd, (unsigned char *)&(hdrp)->nsym); \
-  }
-#define SWAP_STBSYM(symp, abfd) \
-  { \
-    (symp)->value = bfd_get_32(abfd, (unsigned char *)&(symp)->value); \
-    (symp)->type = bfd_get_16(abfd, (unsigned char *)&(symp)->type); \
-    (symp)->stroff = bfd_get_32(abfd, (unsigned char *)&(symp)->stroff); \
-  }
-#define N_DATA 0
-#define N_BSS 1
-#define N_RDATA 2
-#define N_IDATA 3
-#define N_TEXT 4
-#define N_ABS 6
-
-static void
-record_minimal_symbol (name, address, type, objfile, section_offsets)
-     char *name;
-     CORE_ADDR address;
-     int type;
-     struct objfile *objfile;
-     struct section_offsets *section_offsets;
-{
-  enum minimal_symbol_type ms_type;
-
-  switch (type)
-    {
-    case N_TEXT:
-	  ms_type = mst_text;
-	  address += ANOFFSET(section_offsets, SECT_OFF_TEXT);
-	  break;
-    case N_DATA:
-	  ms_type = mst_data;
-	  break;
-    case N_BSS:
-          ms_type = mst_bss;
-	  break;
-    case N_RDATA:
-	  ms_type = mst_bss;
-	  break;
-    case N_IDATA:	
-	  ms_type = mst_data;
-	  break;
-    case N_ABS:
-	  ms_type = mst_abs;
-	  break;
-    default:
-          ms_type = mst_unknown; break;
-  }
-
-  prim_record_minimal_symbol (name, address, ms_type, objfile);
-}
-
-/* read and process .stb file and store in minimal symbol table */
-typedef char mhhdr[80];
-struct stbhdr {
-	mhhdr comhdr;
-	char * name;
-	short fmtno;
-	int crc;
-	int offset;
-	int nsym;
-	char *pad;
-};
-struct stbsymbol {
-	int value;
-	short type;
-	int stroff;
-};
-#define STBSYMSIZE 10
-
-static void
-read_minimal_symbols(objfile, section_offsets)
-     struct objfile *objfile;
-     struct section_offsets *section_offsets;
-{
-FILE *fp;
-bfd *abfd;
-struct stbhdr hdr;
-struct stbsymbol sym;
-int ch, i, j, off;
-char buf[64], buf1[128];
-		
-  fp = objfile->auxf1;
-  if (fp == NULL) return;
-  abfd = objfile->obfd;
-  fread(&hdr.comhdr[0], sizeof(mhhdr), 1, fp);
-  i = 0;
-  ch = getc(fp);
-  while (ch != -1) {
-    buf[i] = (char)ch;
-    i++;
-    if (ch == 0) break;
-    ch = getc(fp);
-  };
-  if (i%2) ch=getc(fp);
-  hdr.name = &buf[0];
-
-  fread(&hdr.fmtno, sizeof(hdr.fmtno), 1, fp);
-  fread(&hdr.crc, sizeof(hdr.crc), 1, fp);
-  fread(&hdr.offset, sizeof(hdr.offset), 1, fp);
-  fread(&hdr.nsym, sizeof(hdr.nsym), 1, fp);
-  SWAP_STBHDR(&hdr, abfd);      
-	
-  /* read symbols */
-  init_minimal_symbol_collection();
-  off = hdr.offset;
-  for (i = hdr.nsym; i > 0; i--) {
-    fseek(fp, (long)off, 0);
-    fread(&sym.value, sizeof(sym.value), 1, fp);
-    fread(&sym.type, sizeof(sym.type), 1, fp);
-    fread(&sym.stroff, sizeof(sym.stroff), 1, fp);
-    SWAP_STBSYM (&sym, abfd);
-    fseek(fp, (long)sym.stroff, 0);
-    j = 0;
-    ch = getc(fp);
-    while (ch != -1) {
-	buf1[j] = (char)ch;
-	j++;
-	if (ch == 0) break;
-	ch = getc(fp);
-    };
-    record_minimal_symbol(buf1, sym.value, sym.type&7, objfile, section_offsets);
-    off += STBSYMSIZE;
-  };
-  install_minimal_symbols (objfile);
-  return;
-}
-
-/* Scan and build partial symbols for a symbol file.
-   We have been initialized by a call to os9k_symfile_init, which 
-   put all the relevant info into a "struct os9k_symfile_info",
-   hung off the objfile structure.
-
-   SECTION_OFFSETS contains offsets relative to which the symbols in the
-   various sections are (depending where the sections were actually loaded).
-   MAINLINE is true if we are reading the main symbol
-   table (as opposed to a shared lib or dynamically loaded file).  */
-
-static void
-os9k_symfile_read (objfile, section_offsets, mainline)
-     struct objfile *objfile;
-     struct section_offsets *section_offsets;
-     int mainline;	/* FIXME comments above */
-{
-  bfd *sym_bfd;
-  struct cleanup *back_to;
-
-  sym_bfd = objfile->obfd;
-  /* If we are reinitializing, or if we have never loaded syms yet, init */
-  if (mainline || objfile->global_psymbols.size == 0 || 
-    objfile->static_psymbols.size == 0)
-    init_psymbol_list (objfile, DBX_SYMCOUNT (objfile));
-
-  free_pending_blocks ();
-  back_to = make_cleanup ((make_cleanup_func) really_free_pendings, 0);
-
-  make_cleanup ((make_cleanup_func) discard_minimal_symbols, 0);
-  read_minimal_symbols (objfile, section_offsets);
-
-  /* Now that the symbol table data of the executable file are all in core,
-     process them and define symbols accordingly.  */
-  read_os9k_psymtab (section_offsets, objfile,
-		     DBX_TEXT_ADDR (objfile),
-		     DBX_TEXT_SIZE (objfile));
-
-  do_cleanups (back_to);
-}
-
-/* Initialize anything that needs initializing when a completely new
-   symbol file is specified (not just adding some symbols from another
-   file, e.g. a shared library).  */
-
-static void
-os9k_new_init (ignore)
-     struct objfile *ignore;
-{
-  stabsread_new_init ();
-  buildsym_new_init ();
-  psymfile_depth = 0;
-/*
-  init_header_files ();
-*/
-}
-
-/* os9k_symfile_init ()
-   It is passed a struct objfile which contains, among other things,
-   the BFD for the file whose symbols are being read, and a slot for a pointer
-   to "private data" which we fill with goodies.
-
-   Since BFD doesn't know how to read debug symbols in a format-independent
-   way (and may never do so...), we have to do it ourselves.  We will never
-   be called unless this is an a.out (or very similar) file. 
-   FIXME, there should be a cleaner peephole into the BFD environment here.  */
-
-static void
-os9k_symfile_init (objfile)
-     struct objfile *objfile;
-{
-  bfd *sym_bfd = objfile->obfd;
-  char *name = bfd_get_filename (sym_bfd);
-  char dbgname[512], stbname[512];
-  FILE *symfile = 0;
-  FILE *minfile = 0;
-  asection *text_sect;
-
-  strcpy(dbgname, name);
-  strcat(dbgname, ".dbg");
-  strcpy(stbname, name);
-  strcat(stbname, ".stb");
-
-  if ((symfile = fopen(dbgname, "r")) == NULL) {
-    warning("Symbol file %s not found", dbgname);
-  }
-  objfile->auxf2 = symfile;
-
-  if ((minfile = fopen(stbname, "r")) == NULL) {
-    warning("Symbol file %s not found", stbname);
-  }
-  objfile->auxf1 = minfile;
-
-  /* Allocate struct to keep track of the symfile */
-  objfile->sym_stab_info = (struct dbx_symfile_info *)
-    xmmalloc (objfile -> md, sizeof (struct dbx_symfile_info));
-  DBX_SYMFILE_INFO (objfile)->stab_section_info = NULL;
-
-  text_sect = bfd_get_section_by_name (sym_bfd, ".text");
-  if (!text_sect)
-    error ("Can't find .text section in file");
-  DBX_TEXT_ADDR (objfile) = bfd_section_vma (sym_bfd, text_sect);
-  DBX_TEXT_SIZE (objfile) = bfd_section_size (sym_bfd, text_sect);
-
-  DBX_SYMBOL_SIZE (objfile) = 0;     /* variable size symbol */
-  DBX_SYMCOUNT (objfile) =  0;  /* used to be bfd_get_symcount(sym_bfd) */
-  DBX_SYMTAB_OFFSET (objfile) = 0;  /* used to be SYMBOL_TABLE_OFFSET */
-}
-
-/* Perform any local cleanups required when we are done with a particular
-   objfile.  I.E, we are in the process of discarding all symbol information
-   for an objfile, freeing up all memory held for it, and unlinking the
-   objfile struct from the global list of known objfiles. */
-
-static void
-os9k_symfile_finish (objfile)
-     struct objfile *objfile;
-{
-  if (objfile->sym_stab_info != NULL)
-    {
-      mfree (objfile -> md, objfile->sym_stab_info);
-    }
-/*
-  free_header_files ();
-*/
-}
-
-
-struct st_dbghdr {
-  int sync;
-  short rev;
-  int crc;
-  short os;
-  short cpu;
-};
-#define SYNC 		(int)0xefbefeca
-
-#define SWAP_DBGHDR(hdrp, abfd) \
-  { \
-    (hdrp)->sync = bfd_get_32(abfd, (unsigned char *)&(hdrp)->sync); \
-    (hdrp)->rev = bfd_get_16(abfd, (unsigned char *)&(hdrp)->rev); \
-    (hdrp)->crc = bfd_get_32(abfd, (unsigned char *)&(hdrp)->crc); \
-    (hdrp)->os = bfd_get_16(abfd, (unsigned char *)&(hdrp)->os); \
-    (hdrp)->cpu = bfd_get_16(abfd, (unsigned char *)&(hdrp)->cpu); \
-  }
-
-#define N_SYM_CMPLR     0
-#define N_SYM_SLINE     1
-#define N_SYM_SYM       2
-#define N_SYM_LBRAC     3
-#define N_SYM_RBRAC     4
-#define N_SYM_SE        5
-
-struct internal_symstruct {
-  short n_type;
-  short n_desc;
-  long n_value;
-  char * n_strx;
-};
-static struct internal_symstruct symbol;
-static struct internal_symstruct *symbuf = &symbol;
-static char strbuf[4096];
-static struct st_dbghdr dbghdr;
-static short cmplrid;
-
-#define VER_PRE_ULTRAC	((short)4)
-#define VER_ULTRAC	((short)5)
-
-static int
-fill_sym (dbg_file, abfd)
-     FILE *dbg_file;
-     bfd *abfd;
-{
-short si, nmask;
-long li;
-int ii;
-char *p;
-
-  int nbytes = fread(&si, sizeof(si), 1, dbg_file);
-  if (nbytes == 0)
-    return 0;
-  if (nbytes < 0)
-    perror_with_name ("reading .dbg file.");
-  symbuf->n_desc = 0;
-  symbuf->n_value = 0;
-  symbuf->n_strx = NULL;
-  symbuf->n_type = bfd_get_16 (abfd, (unsigned char *)&si);
-  symbuf->n_type = 0xf & symbuf->n_type;
-  switch (symbuf->n_type)
-    {
-    case N_SYM_CMPLR:
-      fread(&si, sizeof(si), 1, dbg_file);
-      symbuf->n_desc = bfd_get_16(abfd, (unsigned char *)&si);
-      cmplrid = symbuf->n_desc & 0xff;
-      break;
-    case N_SYM_SLINE:
-      fread(&li, sizeof(li), 1, dbg_file);
-      symbuf->n_value = bfd_get_32(abfd, (unsigned char *)&li);
-      fread(&li, sizeof(li), 1, dbg_file);
-      li = bfd_get_32(abfd, (unsigned char *)&li);
-      symbuf->n_strx = (char *)(li >> 12);
-      symbuf->n_desc = li & 0xfff;
-      break;
-    case N_SYM_SYM:
-      fread(&li, sizeof(li), 1, dbg_file);
-      symbuf->n_value = bfd_get_32(abfd, (unsigned char *)&li);
-      si = 0;
-      do {
-	ii = getc(dbg_file);
-	strbuf[si++] = (char) ii;
-      } while (ii != 0 || si % 2 != 0);
-      symbuf->n_strx = strbuf;
-      p = (char *) strchr (strbuf, ':');
-      if (!p) break;
-      if ((p[1] == 'F' || p[1] == 'f') && cmplrid == VER_PRE_ULTRAC)
-	{
-	  fread(&si, sizeof(si), 1, dbg_file);
-	  nmask = bfd_get_16(abfd, (unsigned char *)&si);
-	  for (ii=0; ii<nmask; ii++)
-	    fread(&si, sizeof(si), 1, dbg_file);
-	}
-      break;
-    case N_SYM_LBRAC:
-      fread(&li, sizeof(li), 1, dbg_file);
-      symbuf->n_value = bfd_get_32(abfd, (unsigned char *)&li);
-      break;
-    case N_SYM_RBRAC:
-      fread(&li, sizeof(li), 1, dbg_file);
-      symbuf->n_value = bfd_get_32(abfd, (unsigned char *)&li);
-      break;
-    case N_SYM_SE:
-      break;
-    }
-    return 1;
-}
-
-/* Given pointers to an a.out symbol table in core containing dbx
-   style data, setup partial_symtab's describing each source file for
-   which debugging information is available.
-   SYMFILE_NAME is the name of the file we are reading from
-   and SECTION_OFFSETS is the set of offsets for the various sections
-   of the file (a set of zeros if the mainline program).  */
-
-static void
-read_os9k_psymtab (section_offsets, objfile, text_addr, text_size)
-     struct section_offsets *section_offsets;
-     struct objfile *objfile;
-     CORE_ADDR text_addr;
-     int text_size;
-{
-  register struct internal_symstruct *bufp = 0;	/* =0 avoids gcc -Wall glitch*/
-  register char *namestring;
-  int past_first_source_file = 0;
-  CORE_ADDR last_o_file_start = 0;
-#if 0
-  struct cleanup *back_to;
-#endif
-  bfd *abfd;
-  FILE *fp;
-
-  /* End of the text segment of the executable file.  */
-  static CORE_ADDR end_of_text_addr;
-
-  /* Current partial symtab */
-  static struct partial_symtab *pst = 0;
-
-  /* List of current psymtab's include files */
-  char **psymtab_include_list;
-  int includes_allocated;
-  int includes_used;
-
-  /* Index within current psymtab dependency list */
-  struct partial_symtab **dependency_list;
-  int dependencies_used, dependencies_allocated;
-
-  includes_allocated = 30;
-  includes_used = 0;
-  psymtab_include_list = (char **) alloca (includes_allocated *
-					   sizeof (char *));
-
-  dependencies_allocated = 30;
-  dependencies_used = 0;
-  dependency_list =
-    (struct partial_symtab **) alloca (dependencies_allocated *
-				       sizeof (struct partial_symtab *));
-
-  last_source_file = NULL;
-
-#ifdef END_OF_TEXT_DEFAULT
-  end_of_text_addr = END_OF_TEXT_DEFAULT;
-#else
-  end_of_text_addr = text_addr + section_offsets->offsets[SECT_OFF_TEXT]
-			       + text_size;	/* Relocate */
-#endif
-
-  abfd = objfile->obfd;
-  fp = objfile->auxf2; 
-  if (!fp) return;
-		
-  fread(&dbghdr.sync, sizeof(dbghdr.sync), 1, fp);
-  fread(&dbghdr.rev, sizeof(dbghdr.rev), 1, fp);
-  fread(&dbghdr.crc, sizeof(dbghdr.crc), 1, fp);
-  fread(&dbghdr.os, sizeof(dbghdr.os), 1, fp);
-  fread(&dbghdr.cpu, sizeof(dbghdr.cpu), 1, fp);
-  SWAP_DBGHDR(&dbghdr, abfd);      
-
-  symnum = 0;
-  while(1)
-    {
-    int ret;
-    long cursymoffset;
-
-      /* Get the symbol for this run and pull out some info */
-      QUIT;	/* allow this to be interruptable */
-      cursymoffset = ftell(objfile->auxf2);
-      ret = fill_sym(objfile->auxf2, abfd);
-      if (ret <= 0) break;
-      else symnum++;
-      bufp = symbuf;
-
-      /* Special case to speed up readin. */
-      if (bufp->n_type == (short)N_SYM_SLINE) continue;
-
-#define CUR_SYMBOL_VALUE bufp->n_value
-      /* partial-stab.h */
-
-      switch (bufp->n_type)
-	{
-	char *p;
-
-	case N_SYM_CMPLR:
-	  continue;
-
-	case N_SYM_SE:
-          CUR_SYMBOL_VALUE += ANOFFSET(section_offsets, SECT_OFF_TEXT);
-	  if (psymfile_depth == 1 && pst)
-	    {
-	      os9k_end_psymtab (pst, psymtab_include_list, includes_used,
-		       symnum, CUR_SYMBOL_VALUE,
-		       dependency_list, dependencies_used);
-	      pst = (struct partial_symtab *) 0;
-	      includes_used = 0;
-	      dependencies_used = 0;
-	    }
-  	  psymfile_depth--;
-	  continue;
-
-	case N_SYM_SYM:		/* Typedef or automatic variable. */
-	  namestring = bufp->n_strx;
-          p = (char *) strchr (namestring, ':');
-          if (!p)
-            continue;           /* Not a debugging symbol.   */
-
-	  /* Main processing section for debugging symbols which
-	     the initial read through the symbol tables needs to worry
-	     about.  If we reach this point, the symbol which we are
-	     considering is definitely one we are interested in.
-	     p must also contain the (valid) index into the namestring
-	     which indicates the debugging type symbol.  */
-
-	  switch (p[1])
-	    {
-	    case 'S' :
-	      {
-		unsigned long valu;
-            	enum language tmp_language;
-		char *str, *p;
-		int n;
-		
-		valu = CUR_SYMBOL_VALUE;
-		if (valu)
-		  valu += ANOFFSET (section_offsets, SECT_OFF_TEXT);
-		past_first_source_file = 1;
-
-                p = strchr(namestring, ':');
-                if (p) n = p-namestring;
-                else n = strlen(namestring);
-                str = alloca(n+1);
-                strncpy(str, namestring, n);
-                str[n] = '\0';
-
-		if (psymfile_depth == 0) {
-		  if (!pst)
-		    pst = os9k_start_psymtab (objfile, section_offsets,
-				 str, valu,
-				 cursymoffset,
-				 symnum-1,
-				 objfile -> global_psymbols.next,
-				 objfile -> static_psymbols.next);
-		} else { /* this is a include file */
-            	  tmp_language = deduce_language_from_filename (str);
-            	  if (tmp_language != language_unknown
-                	&& (tmp_language != language_c
-                    	|| psymtab_language != language_cplus))
-              		psymtab_language = tmp_language;
-
-/*
-		  if (pst && STREQ (str, pst->filename))
-		    continue;
-		  {
-		    register int i;
-		    for (i = 0; i < includes_used; i++)
-		      if (STREQ (str, psymtab_include_list[i]))
-			{
-			  i = -1; 
-			  break;
-			}
-		    if (i == -1)
-		      continue;
-		  }
-*/
-
-                  psymtab_include_list[includes_used++] = str;
-                  if (includes_used >= includes_allocated)
-                    {
-                      char **orig = psymtab_include_list;
-
-                      psymtab_include_list = (char **)
-                	  alloca ((includes_allocated *= 2) * sizeof (char *));
-                      memcpy ((PTR)psymtab_include_list, (PTR)orig,
-                          includes_used * sizeof (char *));
-              	    }
-
-		}
-  		psymfile_depth++;
-		continue;
-	      }
-
-	    case 'v':
-	      add_psymbol_to_list (namestring, p - namestring,
-				   VAR_NAMESPACE, LOC_STATIC,
-				   &objfile->static_psymbols,
-				   0, CUR_SYMBOL_VALUE,
-				   psymtab_language, objfile);
-	      continue;
-	    case 'V':
-	      add_psymbol_to_list (namestring, p - namestring,
-				   VAR_NAMESPACE, LOC_STATIC,
-				   &objfile->global_psymbols,
-				   0, CUR_SYMBOL_VALUE,
-				   psymtab_language, objfile);
-	      continue;
-
-	    case 'T':
-	      if (p != namestring)	/* a name is there, not just :T... */
-		{
-		  add_psymbol_to_list (namestring, p - namestring,
-				       STRUCT_NAMESPACE, LOC_TYPEDEF,
-				       &objfile->static_psymbols,
-				       CUR_SYMBOL_VALUE, 0,
-				       psymtab_language, objfile);
-		  if (p[2] == 't')
-		    {
-		      /* Also a typedef with the same name.  */
-		      add_psymbol_to_list (namestring, p - namestring,
-					   VAR_NAMESPACE, LOC_TYPEDEF,
-					   &objfile->static_psymbols,
-					   CUR_SYMBOL_VALUE, 0, psymtab_language,
-					   objfile);
-		      p += 1;
-		    }
-		  /* The semantics of C++ state that "struct foo { ... }"
-		     also defines a typedef for "foo".  Unfortuantely, cfront
-		     never makes the typedef when translating from C++ to C.
-		     We make the typedef here so that "ptype foo" works as
-		     expected for cfront translated code.  */
-		  else if (psymtab_language == language_cplus)
-		   {
-		      /* Also a typedef with the same name.  */
-		      add_psymbol_to_list (namestring, p - namestring,
-					   VAR_NAMESPACE, LOC_TYPEDEF,
-					   &objfile->static_psymbols,
-					   CUR_SYMBOL_VALUE, 0, psymtab_language,
-					   objfile);
-		   }
-		}
-	      goto check_enum;
-	    case 't':
-	      if (p != namestring)	/* a name is there, not just :T... */
-		{
-		  add_psymbol_to_list (namestring, p - namestring,
-				       VAR_NAMESPACE, LOC_TYPEDEF,
-				       &objfile->static_psymbols,
-				       CUR_SYMBOL_VALUE, 0,
-				       psymtab_language, objfile);
-		}
-	    check_enum:
-	      /* If this is an enumerated type, we need to
-		 add all the enum constants to the partial symbol
-		 table.  This does not cover enums without names, e.g.
-		 "enum {a, b} c;" in C, but fortunately those are
-		 rare.  There is no way for GDB to find those from the
-		 enum type without spending too much time on it.  Thus
-		 to solve this problem, the compiler needs to put out the
-		 enum in a nameless type.  GCC2 does this.  */
-
-	      /* We are looking for something of the form
-		 <name> ":" ("t" | "T") [<number> "="] "e" <size>
-		 {<constant> ":" <value> ","} ";".  */
-
-	      /* Skip over the colon and the 't' or 'T'.  */
-	      p += 2;
-	      /* This type may be given a number.  Also, numbers can come
-		 in pairs like (0,26).  Skip over it.  */
-	      while ((*p >= '0' && *p <= '9')
-		     || *p == '(' || *p == ',' || *p == ')'
-		     || *p == '=')
-		p++;
-
-	      if (*p++ == 'e')
-		{
-		  /* We have found an enumerated type. skip size */
-	          while (*p >= '0' && *p <= '9') p++;
-		  /* According to comments in read_enum_type
-		     a comma could end it instead of a semicolon.
-		     I don't know where that happens.
-		     Accept either.  */
-		  while (*p && *p != ';' && *p != ',')
-		    {
-		      char *q;
-
-		      /* Check for and handle cretinous dbx symbol name
-			 continuation! 
-		      if (*p == '\\')
-			p = next_symbol_text (objfile);
-		      */
-
-		      /* Point to the character after the name
-			 of the enum constant.  */
-		      for (q = p; *q && *q != ':'; q++)
-			;
-		      /* Note that the value doesn't matter for
-			 enum constants in psymtabs, just in symtabs.  */
-		      add_psymbol_to_list (p, q - p,
-					   VAR_NAMESPACE, LOC_CONST,
-					   &objfile->static_psymbols, 0,
-					   0, psymtab_language, objfile);
-		      /* Point past the name.  */
-		      p = q;
-		      /* Skip over the value.  */
-		      while (*p && *p != ',')
-			p++;
-		      /* Advance past the comma.  */
-		      if (*p)
-			p++;
-		    }
-		}
-	      continue;
-	    case 'c':
-	      /* Constant, e.g. from "const" in Pascal.  */
-	      add_psymbol_to_list (namestring, p - namestring,
-				   VAR_NAMESPACE, LOC_CONST,
-				   &objfile->static_psymbols, CUR_SYMBOL_VALUE,
-				   0, psymtab_language, objfile);
-	      continue;
-
-	    case 'f':
-	      CUR_SYMBOL_VALUE += ANOFFSET(section_offsets, SECT_OFF_TEXT);
-              if (pst && pst->textlow == 0)
-                pst->textlow = CUR_SYMBOL_VALUE;
-
-	      add_psymbol_to_list (namestring, p - namestring,
-				   VAR_NAMESPACE, LOC_BLOCK,
-				   &objfile->static_psymbols, CUR_SYMBOL_VALUE,
-				   0, psymtab_language, objfile);
-	      continue;
-
-	    case 'F':
-	      CUR_SYMBOL_VALUE += ANOFFSET(section_offsets, SECT_OFF_TEXT);
-              if (pst && pst->textlow == 0)
-                pst->textlow = CUR_SYMBOL_VALUE;
-
-	      add_psymbol_to_list (namestring, p - namestring,
-				   VAR_NAMESPACE, LOC_BLOCK,
-				   &objfile->global_psymbols, CUR_SYMBOL_VALUE,
-				   0, psymtab_language, objfile);
-	      continue;
-
-	    case 'p':
-	    case 'l':
-            case 's':
-	      continue;
-
-	    case ':':
-	      /* It is a C++ nested symbol.  We don't need to record it
-		 (I don't think); if we try to look up foo::bar::baz,
-		 then symbols for the symtab containing foo should get
-		 read in, I think.  */
-	      /* Someone says sun cc puts out symbols like
-		 /foo/baz/maclib::/usr/local/bin/maclib,
-		 which would get here with a symbol type of ':'.  */
-	      continue;
-
-	    default:
-	      /* Unexpected symbol descriptor.  The second and subsequent stabs
-		 of a continued stab can show up here.  The question is
-		 whether they ever can mimic a normal stab--it would be
-		 nice if not, since we certainly don't want to spend the
-		 time searching to the end of every string looking for
-		 a backslash.  */
-
-	      complain (&unknown_symchar_complaint, p[1]);
-	      continue;
-	    }
-
-	case N_SYM_RBRAC:
-	  CUR_SYMBOL_VALUE += ANOFFSET(section_offsets, SECT_OFF_TEXT);
-#ifdef HANDLE_RBRAC
-	  HANDLE_RBRAC(CUR_SYMBOL_VALUE);
-	  continue;
-#endif
-	case N_SYM_LBRAC:
-	  continue;
-
-	default:
-	  /* If we haven't found it yet, ignore it.  It's probably some
-	     new type we don't know about yet.  */
-	  complain (&unknown_symtype_complaint,
-		    local_hex_string ((unsigned long) bufp->n_type));
-	  continue;
-	}
-    }
-
-  DBX_SYMCOUNT (objfile) = symnum;
-
-  /* If there's stuff to be cleaned up, clean it up.  */
-  if (DBX_SYMCOUNT (objfile) > 0
-/*FIXME, does this have a bug at start address 0? */
-      && last_o_file_start
-      && objfile -> ei.entry_point < bufp->n_value
-      && objfile -> ei.entry_point >= last_o_file_start)
-    {
-      objfile -> ei.entry_file_lowpc = last_o_file_start;
-      objfile -> ei.entry_file_highpc = bufp->n_value;
-    }
-
-  if (pst)
-    {
-      os9k_end_psymtab (pst, psymtab_include_list, includes_used,
-		   symnum, end_of_text_addr,
-		   dependency_list, dependencies_used);
-    }
-/*
-  do_cleanups (back_to);
-*/
-}
-
-/* Allocate and partially fill a partial symtab.  It will be
-   completely filled at the end of the symbol list.
-
-   SYMFILE_NAME is the name of the symbol-file we are reading from, and ADDR
-   is the address relative to which its symbols are (incremental) or 0
-   (normal). */
-
-
-static struct partial_symtab *
-os9k_start_psymtab (objfile, section_offsets,
-	       filename, textlow, ldsymoff,ldsymcnt,  global_syms, static_syms)
-     struct objfile *objfile;
-     struct section_offsets *section_offsets;
-     char *filename;
-     CORE_ADDR textlow;
-     int ldsymoff;
-     int ldsymcnt;
-     struct partial_symbol **global_syms;
-     struct partial_symbol **static_syms;
-{
-  struct partial_symtab *result =
-      start_psymtab_common(objfile, section_offsets,
-			   filename, textlow, global_syms, static_syms);
-
-  result->read_symtab_private = (char *)
-    obstack_alloc (&objfile -> psymbol_obstack, sizeof (struct symloc));
-
-  LDSYMOFF(result) = ldsymoff;
-  LDSYMCNT(result) = ldsymcnt;
-  result->read_symtab = os9k_psymtab_to_symtab;
-
-  /* Deduce the source language from the filename for this psymtab. */
-  psymtab_language = deduce_language_from_filename (filename);
-  return result;
-}
-
-/* Close off the current usage of PST.  
-   Returns PST or NULL if the partial symtab was empty and thrown away.
-   FIXME:  List variables and peculiarities of same.  */
-
-static struct partial_symtab *
-os9k_end_psymtab (pst, include_list, num_includes, capping_symbol_cnt,
-	     capping_text, dependency_list, number_dependencies)
-     struct partial_symtab *pst;
-     char **include_list;
-     int num_includes;
-     int capping_symbol_cnt;
-     CORE_ADDR capping_text;
-     struct partial_symtab **dependency_list;
-     int number_dependencies;
-     /* struct partial_symbol *capping_global, *capping_static; */
-{
-  int i;
-  struct partial_symtab *p1;
-  struct objfile *objfile = pst -> objfile;
-
-  if (capping_symbol_cnt != -1)
-      LDSYMCNT(pst) = capping_symbol_cnt - LDSYMCNT(pst);
-
-  /* Under Solaris, the N_SO symbols always have a value of 0,
-     instead of the usual address of the .o file.  Therefore,
-     we have to do some tricks to fill in texthigh and textlow.
-     The first trick is in partial-stab.h: if we see a static
-     or global function, and the textlow for the current pst
-     is still 0, then we use that function's address for 
-     the textlow of the pst.
-
-     Now, to fill in texthigh, we remember the last function seen
-     in the .o file (also in partial-stab.h).  Also, there's a hack in
-     bfd/elf.c and gdb/elfread.c to pass the ELF st_size field
-     to here via the misc_info field.  Therefore, we can fill in
-     a reliable texthigh by taking the address plus size of the
-     last function in the file.
-
-     Unfortunately, that does not cover the case where the last function
-     in the file is static.  See the paragraph below for more comments
-     on this situation.
-
-     Finally, if we have a valid textlow for the current file, we run
-     down the partial_symtab_list filling in previous texthighs that
-     are still unknown.  */
-
-  if (pst->texthigh == 0 && last_function_name) {
-    char *p;
-    int n;
-    struct minimal_symbol *minsym;
-
-    p = strchr (last_function_name, ':');
-    if (p == NULL)
-      p = last_function_name;
-    n = p - last_function_name;
-    p = alloca (n + 1);
-    strncpy (p, last_function_name, n);
-    p[n] = 0;
-    
-    minsym = lookup_minimal_symbol (p, NULL, objfile);
-
-    if (minsym) {
-      pst->texthigh = SYMBOL_VALUE_ADDRESS(minsym)+(long)MSYMBOL_INFO(minsym);
-    } else {
-      /* This file ends with a static function, and it's
-	 difficult to imagine how hard it would be to track down
-	 the elf symbol.  Luckily, most of the time no one will notice,
-	 since the next file will likely be compiled with -g, so
-	 the code below will copy the first fuction's start address 
-	 back to our texthigh variable.  (Also, if this file is the
-	 last one in a dynamically linked program, texthigh already
-	 has the right value.)  If the next file isn't compiled
-	 with -g, then the last function in this file winds up owning
-	 all of the text space up to the next -g file, or the end (minus
-	 shared libraries).  This only matters for single stepping,
-	 and even then it will still work, except that it will single
-	 step through all of the covered functions, instead of setting
-	 breakpoints around them as it usualy does.  This makes it
-	 pretty slow, but at least it doesn't fail.
-
-	 We can fix this with a fairly big change to bfd, but we need
-	 to coordinate better with Cygnus if we want to do that.  FIXME.  */
-    }
-    last_function_name = NULL;
-  }
-
-  /* this test will be true if the last .o file is only data */
-  if (pst->textlow == 0)
-    pst->textlow = pst->texthigh;
-
-  /* If we know our own starting text address, then walk through all other
-     psymtabs for this objfile, and if any didn't know their ending text
-     address, set it to our starting address.  Take care to not set our
-     own ending address to our starting address, nor to set addresses on
-     `dependency' files that have both textlow and texthigh zero.  */
-  if (pst->textlow) {
-    ALL_OBJFILE_PSYMTABS (objfile, p1) {
-      if (p1->texthigh == 0  && p1->textlow != 0 && p1 != pst) {
-	p1->texthigh = pst->textlow;
-	/* if this file has only data, then make textlow match texthigh */
-	if (p1->textlow == 0)
-	  p1->textlow = p1->texthigh;
-      }
-    }
-  }
-
-  /* End of kludge for patching Solaris textlow and texthigh.  */
-
-  pst->n_global_syms =
-    objfile->global_psymbols.next - (objfile->global_psymbols.list + pst->globals_offset);
-  pst->n_static_syms =
-    objfile->static_psymbols.next - (objfile->static_psymbols.list + pst->statics_offset);
-
-  pst->number_of_dependencies = number_dependencies;
-  if (number_dependencies)
-    {
-      pst->dependencies = (struct partial_symtab **)
-	obstack_alloc (&objfile->psymbol_obstack,
-		       number_dependencies * sizeof (struct partial_symtab *));
-      memcpy (pst->dependencies, dependency_list,
-	     number_dependencies * sizeof (struct partial_symtab *));
-    }
-  else
-    pst->dependencies = 0;
-
-  for (i = 0; i < num_includes; i++)
-    {
-      struct partial_symtab *subpst =
-	allocate_psymtab (include_list[i], objfile);
-
-      subpst->section_offsets = pst->section_offsets;
-      subpst->read_symtab_private =
-	  (char *) obstack_alloc (&objfile->psymbol_obstack,
-				  sizeof (struct symloc));
-      LDSYMOFF(subpst) =
-	LDSYMCNT(subpst) =
-	  subpst->textlow =
-	    subpst->texthigh = 0;
-
-      /* We could save slight bits of space by only making one of these,
-	 shared by the entire set of include files.  FIXME-someday.  */
-      subpst->dependencies = (struct partial_symtab **)
-	obstack_alloc (&objfile->psymbol_obstack,
-		       sizeof (struct partial_symtab *));
-      subpst->dependencies[0] = pst;
-      subpst->number_of_dependencies = 1;
-
-      subpst->globals_offset =
-	subpst->n_global_syms =
-	  subpst->statics_offset =
-	    subpst->n_static_syms = 0;
-
-      subpst->readin = 0;
-      subpst->symtab = 0;
-      subpst->read_symtab = pst->read_symtab;
-    }
-
-  sort_pst_symbols (pst);
-
-  /* If there is already a psymtab or symtab for a file of this name, 
-     remove it.
-     (If there is a symtab, more drastic things also happen.)
-     This happens in VxWorks.  */
-  free_named_symtabs (pst->filename);
-
-  if (num_includes == 0
-   && number_dependencies == 0
-   && pst->n_global_syms == 0
-   && pst->n_static_syms == 0) {
-    /* Throw away this psymtab, it's empty.  We can't deallocate it, since
-       it is on the obstack, but we can forget to chain it on the list.  */
-    /* Indicate that psymtab was thrown away.  */
-
-    discard_psymtab (pst);
-
-    pst = (struct partial_symtab *)NULL;
-  }
-  return pst;
-}
-
-static void
-os9k_psymtab_to_symtab_1 (pst)
-     struct partial_symtab *pst;
-{
-  struct cleanup *old_chain;
-  int i;
-  
-  if (!pst)
-    return;
-
-  if (pst->readin)
-    {
-      fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in.  Shouldn't happen.\n",
-	       pst->filename);
-      return;
-    }
-
-  /* Read in all partial symtabs on which this one is dependent */
-  for (i = 0; i < pst->number_of_dependencies; i++)
-    if (!pst->dependencies[i]->readin)
-      {
-	/* Inform about additional files that need to be read in.  */
-	if (info_verbose)
-	  {
-	    fputs_filtered (" ", gdb_stdout);
-	    wrap_here ("");
-	    fputs_filtered ("and ", gdb_stdout);
-	    wrap_here ("");
-	    printf_filtered ("%s...", pst->dependencies[i]->filename);
-	    wrap_here ("");		/* Flush output */
-	    gdb_flush (gdb_stdout);
-	  }
-	os9k_psymtab_to_symtab_1 (pst->dependencies[i]);
-      }
-
-  if (LDSYMCNT(pst))		/* Otherwise it's a dummy */
-    {
-      /* Init stuff necessary for reading in symbols */
-      stabsread_init ();
-      buildsym_init ();
-      old_chain = make_cleanup ((make_cleanup_func) really_free_pendings, 0);
-
-      /* Read in this file's symbols */
-      os9k_read_ofile_symtab (pst);
-      sort_symtab_syms (pst->symtab);
-      do_cleanups (old_chain);
-    }
-
-  pst->readin = 1;
-}
-
-/* Read in all of the symbols for a given psymtab for real.
-   Be verbose about it if the user wants that.  */
-
-static void
-os9k_psymtab_to_symtab (pst)
-     struct partial_symtab *pst;
-{
-  bfd *sym_bfd;
-
-  if (!pst)
-    return;
-
-  if (pst->readin)
-    {
-      fprintf_unfiltered (gdb_stderr, "Psymtab for %s already read in.  Shouldn't happen.\n",
-	       pst->filename);
-      return;
-    }
-
-  if (LDSYMCNT(pst) || pst->number_of_dependencies)
-    {
-      /* Print the message now, before reading the string table,
-	 to avoid disconcerting pauses.  */
-      if (info_verbose)
-	{
-	  printf_filtered ("Reading in symbols for %s...", pst->filename);
-	  gdb_flush (gdb_stdout);
-	}
-
-      sym_bfd = pst->objfile->obfd;
-      os9k_psymtab_to_symtab_1 (pst);
-
-      /* Match with global symbols.  This only needs to be done once,
-         after all of the symtabs and dependencies have been read in.   */
-      scan_file_globals (pst->objfile);
-
-      /* Finish up the debug error message.  */
-      if (info_verbose)
-	printf_filtered ("done.\n");
-    }
-}
-
-/* Read in a defined section of a specific object file's symbols. */
-static void
-os9k_read_ofile_symtab (pst)
-     struct partial_symtab *pst;
-{
-  register struct internal_symstruct *bufp;
-  unsigned char type;
-  unsigned max_symnum;
-  register bfd *abfd;
-  struct objfile *objfile;
-  int sym_offset;		/* Offset to start of symbols to read */
-  CORE_ADDR text_offset;	/* Start of text segment for symbols */
-  int text_size;		/* Size of text segment for symbols */
-  struct section_offsets *section_offsets;
-  FILE *dbg_file;
-
-  objfile = pst->objfile;
-  sym_offset = LDSYMOFF(pst);
-  max_symnum = LDSYMCNT(pst);
-  text_offset = pst->textlow;
-  text_size = pst->texthigh - pst->textlow;
-  section_offsets = pst->section_offsets;
-
-  current_objfile = objfile;
-  subfile_stack = NULL;
-  last_source_file = NULL;
-
-  abfd = objfile->obfd;
-  dbg_file = objfile->auxf2;
-
-#if 0
-  /* It is necessary to actually read one symbol *before* the start
-     of this symtab's symbols, because the GCC_COMPILED_FLAG_SYMBOL
-     occurs before the N_SO symbol.
-     Detecting this in read_dbx_symtab
-     would slow down initial readin, so we look for it here instead. */
-  if (!processing_acc_compilation && sym_offset >= (int)symbol_size)
-    {
-      fseek (objefile->auxf2, sym_offset, SEEK_CUR);
-      fill_sym(objfile->auxf2, abfd);
-      bufp = symbuf;
-
-      processing_gcc_compilation = 0;
-      if (bufp->n_type == N_TEXT)
-	{
-	  if (STREQ (namestring, GCC_COMPILED_FLAG_SYMBOL))
-	    processing_gcc_compilation = 1;
-	  else if (STREQ (namestring, GCC2_COMPILED_FLAG_SYMBOL))
-	    processing_gcc_compilation = 2;
-	}
-
-      /* Try to select a C++ demangling based on the compilation unit
-	 producer. */
-
-      if (processing_gcc_compilation)
-	{
-	  if (AUTO_DEMANGLING)
-	    {
-	      set_demangling_style (GNU_DEMANGLING_STYLE_STRING);
-	    }
-	}
-    }
-  else
-    {
-      /* The N_SO starting this symtab is the first symbol, so we
-	 better not check the symbol before it.  I'm not this can
-	 happen, but it doesn't hurt to check for it.  */
-      bfd_seek (symfile_bfd, sym_offset, SEEK_CUR);
-      processing_gcc_compilation = 0;
-    }
-#endif /* 0 */
-
-  fseek(dbg_file, (long)sym_offset, 0);
-/*
-  if (bufp->n_type != (unsigned char)N_SYM_SYM)
-    error("First symbol in segment of executable not a source symbol");
-*/
-
-  for (symnum = 0; symnum < max_symnum; symnum++)
-    {
-      QUIT;			/* Allow this to be interruptable */
-      fill_sym(dbg_file, abfd);
-      bufp = symbuf;
-      type = bufp->n_type;
-
-      os9k_process_one_symbol ((int)type, (int)bufp->n_desc, 
-      (CORE_ADDR)bufp->n_value, bufp->n_strx, section_offsets, objfile);
-
-      /* We skip checking for a new .o or -l file; that should never
-         happen in this routine. */
-#if 0
-      else if (type == N_TEXT)
-	{
-	  /* I don't think this code will ever be executed, because
-	     the GCC_COMPILED_FLAG_SYMBOL usually is right before
-	     the N_SO symbol which starts this source file.
-	     However, there is no reason not to accept
-	     the GCC_COMPILED_FLAG_SYMBOL anywhere.  */
-
-	  if (STREQ (namestring, GCC_COMPILED_FLAG_SYMBOL))
-	    processing_gcc_compilation = 1;
-	  else if (STREQ (namestring, GCC2_COMPILED_FLAG_SYMBOL))
-	    processing_gcc_compilation = 2;
-
-	  if (AUTO_DEMANGLING)
-	    {
-	      set_demangling_style (GNU_DEMANGLING_STYLE_STRING);
-	    }
-	}
-      else if (type & N_EXT || type == (unsigned char)N_TEXT
-	       || type == (unsigned char)N_NBTEXT
-	       ) {
-	  /* Global symbol: see if we came across a dbx defintion for
-	     a corresponding symbol.  If so, store the value.  Remove
-	     syms from the chain when their values are stored, but
-	     search the whole chain, as there may be several syms from
-	     different files with the same name. */
-	  /* This is probably not true.  Since the files will be read
-	     in one at a time, each reference to a global symbol will
-	     be satisfied in each file as it appears. So we skip this
-	     section. */
-	  ;
-        }
-#endif /* 0 */
-    }
-
-  current_objfile = NULL;
-
-  /* In a Solaris elf file, this variable, which comes from the
-     value of the N_SO symbol, will still be 0.  Luckily, text_offset,
-     which comes from pst->textlow is correct. */
-  if (last_source_start_addr == 0)
-    last_source_start_addr = text_offset;
-  pst->symtab = end_symtab (text_offset + text_size, objfile, SECT_OFF_TEXT);
-  end_stabs ();
-}
-
-
-/* This handles a single symbol from the symbol-file, building symbols
-   into a GDB symtab.  It takes these arguments and an implicit argument.
-
-   TYPE is the type field of the ".stab" symbol entry.
-   DESC is the desc field of the ".stab" entry.
-   VALU is the value field of the ".stab" entry.
-   NAME is the symbol name, in our address space.
-   SECTION_OFFSETS is a set of amounts by which the sections of this object
-          file were relocated when it was loaded into memory.
-          All symbols that refer
-	  to memory locations need to be offset by these amounts.
-   OBJFILE is the object file from which we are reading symbols.
- 	       It is used in end_symtab.  */
-
-static void
-os9k_process_one_symbol (type, desc, valu, name, section_offsets, objfile)
-     int type, desc;
-     CORE_ADDR valu;
-     char *name;
-     struct section_offsets *section_offsets;
-     struct objfile *objfile;
-{
-  register struct context_stack *new;
-  /* The stab type used for the definition of the last function.
-     N_STSYM or N_GSYM for SunOS4 acc; N_FUN for other compilers.  */
-  static int function_stab_type = 0;
-
-#if 0
-  /* Something is wrong if we see real data before
-     seeing a source file name.  */
-  if (last_source_file == NULL && type != (unsigned char)N_SO)
-    {
-      /* Ignore any symbols which appear before an N_SO symbol.
-	 Currently no one puts symbols there, but we should deal
-	 gracefully with the case.  A complain()t might be in order,
-	 but this should not be an error ().  */
-      return;
-    }
-#endif /* 0 */
-
-  switch (type)
-    {
-    case N_SYM_LBRAC:
-      /* On most machines, the block addresses are relative to the
-	 N_SO, the linker did not relocate them (sigh).  */
-      valu += ANOFFSET (section_offsets, SECT_OFF_TEXT); 
-      new = push_context (desc, valu);
-      break;
-
-    case N_SYM_RBRAC:
-      valu += ANOFFSET (section_offsets, SECT_OFF_TEXT); 
-      new = pop_context();
-
-#if !defined (OS9K_VARIABLES_INSIDE_BLOCK)
-#define OS9K_VARIABLES_INSIDE_BLOCK(desc, gcc_p) 1
-#endif
-
-      if (!OS9K_VARIABLES_INSIDE_BLOCK(desc, processing_gcc_compilation))
-	local_symbols = new->locals;
-
-      if (context_stack_depth > 1)
-	{
-	  /* This is not the outermost LBRAC...RBRAC pair in the function,
-	     its local symbols preceded it, and are the ones just recovered
-	     from the context stack.  Define the block for them (but don't
-	     bother if the block contains no symbols.  Should we complain
-	     on blocks without symbols?  I can't think of any useful purpose
-	     for them).  */
-	  if (local_symbols != NULL)
-	    {
-	      /* Muzzle a compiler bug that makes end < start.  (which
-		 compilers?  Is this ever harmful?).  */
-	      if (new->start_addr > valu)
-		{
-		  complain (&lbrac_rbrac_complaint);
-		  new->start_addr = valu;
-		}
-	      /* Make a block for the local symbols within.  */
-	      finish_block (0, &local_symbols, new->old_blocks,
-			    new->start_addr, valu, objfile);
-	    }
-	}
-      else
-	{
-	  if (context_stack_depth == 0)
-	    {
-	      within_function = 0;
-	      /* Make a block for the local symbols within.  */
-	      finish_block (new->name, &local_symbols, new->old_blocks,
-			new->start_addr, valu, objfile);
-	    }
-	  else
-	    {
-	      /* attach local_symbols to the end of new->locals */
-	      if (!new->locals) new->locals = local_symbols;
-	      else {
-		struct pending *p;
-
-	        p = new->locals;
-	        while (p->next) p = p->next; 
-	        p->next = local_symbols;
-	      }
-	    }
-	}
-
-      if (OS9K_VARIABLES_INSIDE_BLOCK(desc, processing_gcc_compilation))
-	/* Now pop locals of block just finished.  */
-	local_symbols = new->locals;
-      break;
-
-
-    case N_SYM_SLINE:
-      /* This type of "symbol" really just records
-	 one line-number -- core-address correspondence.
-	 Enter it in the line list for this symbol table. */
-      /* Relocate for dynamic loading and for ELF acc fn-relative syms.  */
-      valu += ANOFFSET (section_offsets, SECT_OFF_TEXT); 
-      /* FIXME: loses if sizeof (char *) > sizeof (int) */
-      record_line (current_subfile, (int)name, valu);
-      break;
-
-    /* The following symbol types need to have the appropriate offset added
-       to their value; then we process symbol definitions in the name.  */
-    case N_SYM_SYM:
-
-      if (name)
-	{
-	  char deftype;
-	  char *dirn, *n;
-	  char *p = strchr (name, ':');
-	  if (p == NULL)
-	    deftype = '\0';
-	  else
-	    deftype = p[1];
-
-
-	  switch (deftype)
-	    {
-	    case 'S':
-      	      valu += ANOFFSET (section_offsets, SECT_OFF_TEXT);
-	      n = strrchr(name, '/');
-	      if (n != NULL) {
-		*n = '\0';
-		n++;
-		dirn = name;
-	      } else {
-		n = name;
-		dirn = NULL;
-	      }
-	      *p = '\0';
-	      if (symfile_depth++ == 0) {
-		if (last_source_file) {
-          	  end_symtab (valu, objfile, SECT_OFF_TEXT);
-		  end_stabs ();
-		}
-		start_stabs ();
-		os9k_stabs = 1;
-		start_symtab (n, dirn, valu);
-		record_debugformat ("OS9");
-	      } else {
-		push_subfile();
-		start_subfile (n, dirn!=NULL ? dirn : current_subfile->dirname);
-	      }
-	      break;
-
-	    case 'f':
-	    case 'F':
-              valu += ANOFFSET (section_offsets, SECT_OFF_TEXT);
-	      function_stab_type = type;
-
-	      within_function = 1;
-	      new = push_context (0, valu);
-	      new->name = define_symbol (valu, name, desc, type, objfile);
-	      break;
-
-	    case 'V':
-	    case 'v':
-              valu += ANOFFSET (section_offsets, SECT_OFF_DATA);
-	      define_symbol (valu, name, desc, type, objfile);
-	      break;
-
-	    default:
-	      define_symbol (valu, name, desc, type, objfile);
-	      break;
-	    }
-	}
-      break;
-
-    case N_SYM_SE:
-	if (--symfile_depth != 0)
-	  start_subfile(pop_subfile(), current_subfile->dirname);
-      break;
-
-    default:
-      complain (&unknown_symtype_complaint,
-		local_hex_string((unsigned long) type));
-      /* FALLTHROUGH */
-      break;
-
-    case N_SYM_CMPLR:
-      break;
-    }
-  previous_stab_code = type;
-}
-
-static struct sym_fns os9k_sym_fns =
-{
-  bfd_target_os9k_flavour,
-  os9k_new_init,	/* sym_new_init: init anything gbl to entire symtab */
-  os9k_symfile_init,	/* sym_init: read initial info, setup for sym_read() */
-  os9k_symfile_read,	/* sym_read: read a symbol file into symtab */
-  os9k_symfile_finish,	/* sym_finish: finished with file, cleanup */
-  default_symfile_offsets,
-			/* sym_offsets: parse user's offsets to internal form*/
-  NULL			/* next: pointer to next struct sym_fns */
-};
-
-void
-_initialize_os9kread ()
-{
-  add_symtab_fns(&os9k_sym_fns);
-}
diff --git a/contrib/gdb/gdb/remote-d10v.c b/contrib/gdb/gdb/remote-d10v.c
deleted file mode 100644
index d529b21..0000000
--- a/contrib/gdb/gdb/remote-d10v.c
+++ /dev/null
@@ -1,228 +0,0 @@
-/* Remote target communications for d10v connected via a serial line.
-   Copyright 1988, 1991, 1992, 1993, 1994, 1995, 1996, 1997 Free
-   Software Foundation, Inc.
-
-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 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.  */
-
-#include "defs.h"
-#include "gdb_string.h"
-#include <fcntl.h>
-#include "frame.h"
-#include "inferior.h"
-#include "bfd.h"
-#include "symfile.h"
-#include "target.h"
-#include "wait.h"
-/*#include "terminal.h"*/
-#include "gdbcmd.h"
-#include "objfiles.h"
-#include "gdb-stabs.h"
-#include "gdbthread.h"
-
-#include "dcache.h"
-
-#ifdef USG
-#include <sys/types.h>
-#endif
-
-#include <signal.h>
-#include "serial.h"
-
-/* Prototypes for local functions */
-
-static void remote_d10v_open PARAMS ((char *name, int from_tty));
-
-/* Define the target subroutine names */
-static struct target_ops remote_d10v_ops;
-
-/* Open a connection to a remote debugger.
-   NAME is the filename used for communication.  */
-
-static void
-remote_d10v_open (name, from_tty)
-     char *name;
-     int from_tty;
-{
-  pop_target ();
-  push_remote_target (name, from_tty);
-}
-
-
-/* Translate a GDB virtual ADDR/LEN into a format the remote target
-   understands.  Returns number of bytes that can be transfered
-   starting at taddr, ZERO if no bytes can be transfered. */
-int
-remote_d10v_translate_xfer_address (memaddr, nr_bytes, taddr)
-     CORE_ADDR memaddr;
-     int nr_bytes;
-     CORE_ADDR *taddr;
-{
-  CORE_ADDR phys;
-  CORE_ADDR seg;
-  CORE_ADDR off;
-  char *from = "unknown";
-  char *to = "unknown";
-  unsigned short imap0 = read_register (IMAP0_REGNUM);
-  unsigned short imap1 = read_register (IMAP1_REGNUM);
-  unsigned short dmap = read_register (DMAP_REGNUM);
-
-  /* GDB interprets addresses as:
-
-       0x00xxxxxx: Logical data address segment        (DMAP translated memory)
-       0x01xxxxxx: Logical instruction address segment (IMAP translated memory)
-       0x10xxxxxx: Physical data memory segment        (On-chip data memory)
-       0x11xxxxxx: Physical instruction memory segment (On-chip insn memory)
-       0x12xxxxxx: Phisical unified memory segment     (Unified memory)
-
-     The remote d10v board interprets addresses as:
-
-       0x00xxxxxx: Phisical unified memory segment     (Unified memory)
-       0x01xxxxxx: Physical instruction memory segment (On-chip insn memory)
-       0x02xxxxxx: Physical data memory segment        (On-chip data memory)
-
-     Translate according to current IMAP/dmap registers */
-
-  enum {
-    targ_unified = 0x00000000,
-    targ_insn = 0x01000000,
-    targ_data = 0x02000000,
-  };
-
-  seg = (memaddr >> 24);
-  off = (memaddr & 0xffffffL);
-
-  switch (seg) 
-      {
-      case 0x00: /* in logical data address segment */
-	{
-	  from = "logical-data";
-	  if (off <= 0x7fffL)
-	    {
-	      /* On chip data */
-	      phys = targ_data + off;
-	      if (off + nr_bytes > 0x7fffL)
-		/* don't cross VM boundary */
-		nr_bytes = 0x7fffL - off + 1;
-	      to = "chip-data";
-	    }
-	  else if (off <= 0xbfffL)
-	    {
-	      short map = dmap;
-	      if (map & 0x1000)
-		{
-		  /* Instruction memory */
-		  phys = targ_insn | ((map & 0xf) << 14) | (off & 0x3fff);
-		  to = "chip-insn";
-		}
-	      else
-		{
-		  /* Unified memory */
-		  phys = targ_unified | ((map & 0x3ff) << 14) | (off & 0x3fff);
-		  to = "unified";
-		}
-	      if (off + nr_bytes > 0xbfffL)
-		/* don't cross VM boundary */
-		nr_bytes = (0xbfffL - off + 1);
-	    }	    
-	  else
-	    {
-	      /* Logical address out side of data segments, not supported */
-	      return (0);
-	    }
-	  break;
-	}
-
-      case 0x01: /* in logical instruction address segment */
-	{
-	  short map;
-	  from = "logical-insn";
-	  if (off <= 0x1ffffL)
-	    {
-	      map = imap0;
-	    }
-	  else if (off <= 0x3ffffL)
-	    {
-	      map = imap1;
-	    }
-	  else
-	    {
-	      /* Logical address outside of IMAP[01] segment, not
-		 supported */
-	      return (0);
-	    }
-	  if ((off & 0x1ffff) + nr_bytes > 0x1ffffL)
-	    {
-	      /* don't cross VM boundary */
-	      nr_bytes = 0x1ffffL - (off & 0x1ffffL) + 1;
-	    }
-	  if (map & 0x1000)
-	    /* Instruction memory */
-	    {
-	      phys = targ_insn | off;
-	      to = "chip-insn";
-	    }
-	  else
-	    {
-	      phys = ((map & 0x7fL) << 17) + (off & 0x1ffffL);
-	      if (phys > 0xffffffL)
-		/* Address outside of unified address segment */
-		return (0);
-	      phys |= targ_unified;
-	      to = "unified";
-	    }
-	  break;
-	}
-
-      case 0x10: /* Physical data memory segment */
-	from = "phys-data";
-	phys = targ_data | off;
-	to = "chip-data";
-	break;
-
-      case 0x11: /* Physical instruction memory */
-	from = "phys-insn";
-	phys = targ_insn | off;
-	to = "chip-insn";
-	break;
-
-      case 0x12: /* Physical unified memory */
-	from = "phys-unified";
-	phys = targ_unified | off;
-	to = "unified";
-	break;
-
-      default:
-	return (0);
-      }
-
-
-  *taddr = phys;
-  return nr_bytes;
-}
-
-
-void
-_initialize_remote_d10v ()
-{
-  remote_d10v_ops.to_shortname = "d10v";
-  remote_d10v_ops.to_longname = "Remote d10v serial target in gdb-specific protocol";
-  remote_d10v_ops.to_doc = "Use a remote d10v via a serial line, using a gdb-specific protocol.\n\
-Specify the serial device it is connected to (e.g. /dev/ttya).";
-  remote_d10v_ops.to_open = remote_d10v_open;
-
-  add_target (&remote_d10v_ops);
-}
diff --git a/contrib/gdb/gdb/remote-sds.c b/contrib/gdb/gdb/remote-sds.c
deleted file mode 100644
index 3ab5f44..0000000
--- a/contrib/gdb/gdb/remote-sds.c
+++ /dev/null
@@ -1,1206 +0,0 @@
-/* Remote target communications for serial-line targets using SDS' protocol.
-   Copyright 1997 Free Software Foundation, Inc.
-
-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 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.  */
-
-/* This interface was written by studying the behavior of the SDS
-   monitor on an ADS 821/860 board, and by consulting the
-   documentation of the monitor that is available on Motorola's web
-   site.  -sts 8/13/97 */
-
-#include "defs.h"
-#include "gdb_string.h"
-#include <fcntl.h>
-#include "frame.h"
-#include "inferior.h"
-#include "bfd.h"
-#include "symfile.h"
-#include "target.h"
-#include "wait.h"
-#include "gdbcmd.h"
-#include "objfiles.h"
-#include "gdb-stabs.h"
-#include "gdbthread.h"
-#include "gdbcore.h"
-#include "dcache.h"
-
-#ifdef USG
-#include <sys/types.h>
-#endif
-
-#include <signal.h>
-#include "serial.h"
-
-extern void _initialize_remote_sds PARAMS ((void));
-
-/* Declarations of local functions. */
-
-static int sds_write_bytes PARAMS ((CORE_ADDR, char *, int));
-
-static int sds_read_bytes PARAMS ((CORE_ADDR, char *, int));
-
-static void sds_files_info PARAMS ((struct target_ops *ignore));
-
-static int sds_xfer_memory PARAMS ((CORE_ADDR, char *,
-				    int, int, struct target_ops *));
-
-static void sds_prepare_to_store PARAMS ((void));
-
-static void sds_fetch_registers PARAMS ((int));
-
-static void sds_resume PARAMS ((int, int, enum target_signal));
-
-static int sds_start_remote PARAMS ((PTR));
-
-static void sds_open PARAMS ((char *, int));
-
-static void sds_close PARAMS ((int));
-
-static void sds_store_registers PARAMS ((int));
-
-static void sds_mourn PARAMS ((void));
-
-static void sds_create_inferior PARAMS ((char *, char *, char **));
-
-static void sds_load PARAMS ((char *, int));
-
-static int getmessage PARAMS ((unsigned char *, int));
-
-static int putmessage PARAMS ((unsigned char *, int));
-
-static int sds_send PARAMS ((unsigned char *, int));
-
-static int readchar PARAMS ((int));
-
-static int sds_wait PARAMS ((int, struct target_waitstatus *));
-
-static void sds_kill PARAMS ((void));
-
-static int tohex PARAMS ((int));
-
-static int fromhex PARAMS ((int));
-
-static void sds_detach PARAMS ((char *, int));
-
-static void sds_interrupt PARAMS ((int));
-
-static void sds_interrupt_twice PARAMS ((int));
-
-static void interrupt_query PARAMS ((void));
-
-static int read_frame PARAMS ((char *));
-
-static int sds_insert_breakpoint PARAMS ((CORE_ADDR, char *));
-
-static int sds_remove_breakpoint PARAMS ((CORE_ADDR, char *));
-
-static void init_sds_ops PARAMS ((void));
-
-static void sds_command PARAMS ((char *args, int from_tty));
-
-/* Define the target operations vector. */
-
-static struct target_ops sds_ops;
-
-/* This was 5 seconds, which is a long time to sit and wait.
-   Unless this is going though some terminal server or multiplexer or
-   other form of hairy serial connection, I would think 2 seconds would
-   be plenty.  */
-
-static int sds_timeout = 2;
-
-/* Descriptor for I/O to remote machine.  Initialize it to NULL so
-   that sds_open knows that we don't have a file open when the program
-   starts.  */
-
-static serial_t sds_desc = NULL;
-
-/* This limit comes from the monitor.  */
-
-#define	PBUFSIZ	250
-
-/* Maximum number of bytes to read/write at once.  The value here
-   is chosen to fill up a packet (the headers account for the 32).  */
-#define MAXBUFBYTES ((PBUFSIZ-32)/2)
-
-static int next_msg_id;
-
-static int just_started;
-
-static int message_pending;
-
-
-/* Clean up connection to a remote debugger.  */
-
-/* ARGSUSED */
-static void
-sds_close (quitting)
-     int quitting;
-{
-  if (sds_desc)
-    SERIAL_CLOSE (sds_desc);
-  sds_desc = NULL;
-}
-
-/* Stub for catch_errors.  */
-
-static int
-sds_start_remote (dummy)
-     PTR dummy;
-{
-  char c;
-  unsigned char buf[200];
-
-  immediate_quit = 1;		/* Allow user to interrupt it */
-
-  /* Ack any packet which the remote side has already sent.  */
-  SERIAL_WRITE (sds_desc, "{#*\r\n", 5);
-  SERIAL_WRITE (sds_desc, "{#}\r\n", 5);
-
-  while ((c = readchar (1)) >= 0)
-    printf_unfiltered ("%c", c);
-  printf_unfiltered ("\n");
-
-  next_msg_id = 251;
-
-  buf[0] = 26;
-  sds_send (buf, 1);
-
-  buf[0] = 0;
-  sds_send (buf, 1);
-
-  immediate_quit = 0;
-
-  start_remote ();		/* Initialize gdb process mechanisms */
-  return 1;
-}
-
-/* Open a connection to a remote debugger.
-   NAME is the filename used for communication.  */
-
-static DCACHE *sds_dcache;
-
-static void
-sds_open (name, from_tty)
-     char *name;
-     int from_tty;
-{
-  if (name == 0)
-    error ("To open a remote debug connection, you need to specify what serial\n\
-device is attached to the remote system (e.g. /dev/ttya).");
-
-  target_preopen (from_tty);
-
-  unpush_target (&sds_ops);
-
-  sds_dcache = dcache_init (sds_read_bytes, sds_write_bytes);
-
-  sds_desc = SERIAL_OPEN (name);
-  if (!sds_desc)
-    perror_with_name (name);
-
-  if (baud_rate != -1)
-    {
-      if (SERIAL_SETBAUDRATE (sds_desc, baud_rate))
-	{
-	  SERIAL_CLOSE (sds_desc);
-	  perror_with_name (name);
-	}
-    }
-
-
-  SERIAL_RAW (sds_desc);
-
-  /* If there is something sitting in the buffer we might take it as a
-     response to a command, which would be bad.  */
-  SERIAL_FLUSH_INPUT (sds_desc);
-
-  if (from_tty)
-    {
-      puts_filtered ("Remote debugging using ");
-      puts_filtered (name);
-      puts_filtered ("\n");
-    }
-  push_target (&sds_ops);	/* Switch to using remote target now */
-
-  just_started = 1;
-
-  /* Start the remote connection; if error (0), discard this target.
-     In particular, if the user quits, be sure to discard it (we'd be
-     in an inconsistent state otherwise).  */
-  if (!catch_errors (sds_start_remote, NULL, 
-		     "Couldn't establish connection to remote target\n",
-		     RETURN_MASK_ALL))
-    pop_target ();
-}
-
-/* This takes a program previously attached to and detaches it.  After
-   this is done, GDB can be used to debug some other program.  We
-   better not have left any breakpoints in the target program or it'll
-   die when it hits one.  */
-
-static void
-sds_detach (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  char buf[PBUFSIZ];
-
-  if (args)
-    error ("Argument given to \"detach\" when remotely debugging.");
-
-#if 0
-  /* Tell the remote target to detach.  */
-  strcpy (buf, "D");
-  sds_send (buf, 1);
-#endif
-
-  pop_target ();
-  if (from_tty)
-    puts_filtered ("Ending remote debugging.\n");
-}
-
-/* Convert hex digit A to a number.  */
-
-static int
-fromhex (a)
-     int a;
-{
-  if (a >= '0' && a <= '9')
-    return a - '0';
-  else if (a >= 'a' && a <= 'f')
-    return a - 'a' + 10;
-  else 
-    error ("Reply contains invalid hex digit %d", a);
-}
-
-/* Convert number NIB to a hex digit.  */
-
-static int
-tohex (nib)
-     int nib;
-{
-  if (nib < 10)
-    return '0'+nib;
-  else
-    return 'a'+nib-10;
-}
-
-static int
-tob64 (inbuf, outbuf, len)
-     unsigned char *inbuf;
-     char *outbuf;
-     int len;
-{
-  int i, sum;
-  char *p;
-
-  if (len % 3 != 0)
-    error ("bad length");
-
-  p = outbuf;
-  for (i = 0; i < len; i += 3)
-    {
-      /* Collect the next three bytes into a number.  */
-      sum = ((long) *inbuf++) << 16;
-      sum |= ((long) *inbuf++) <<  8;
-      sum |= ((long) *inbuf++);
-
-      /* Spit out 4 6-bit encodings.  */
-      *p++ = ((sum >> 18) & 0x3f) + '0';
-      *p++ = ((sum >> 12) & 0x3f) + '0';
-      *p++ = ((sum >>  6) & 0x3f) + '0';
-      *p++ = (sum & 0x3f) + '0';
-    }
-  return (p - outbuf);
-}
-
-static int
-fromb64 (inbuf, outbuf, len)
-     char *inbuf, *outbuf;
-     int len;
-{
-  int i, sum;
-
-  if (len % 4 != 0)
-    error ("bad length");
-
-  for (i = 0; i < len; i += 4)
-    {
-      /* Collect 4 6-bit digits.  */
-      sum  = (*inbuf++ - '0') << 18;
-      sum |= (*inbuf++ - '0') << 12;
-      sum |= (*inbuf++ - '0') <<  6;
-      sum |= (*inbuf++ - '0');
-
-      /* Now take the resulting 24-bit number and get three bytes out
-         of it.  */
-      *outbuf++ = (sum >> 16) & 0xff;
-      *outbuf++ = (sum >>  8) & 0xff;
-      *outbuf++ = sum & 0xff;
-    }
-
-  return (len / 4) * 3;
-}
-
-
-/* Tell the remote machine to resume.  */
-
-static enum target_signal last_sent_signal = TARGET_SIGNAL_0;
-int last_sent_step;
-
-static void
-sds_resume (pid, step, siggnal)
-     int pid, step;
-     enum target_signal siggnal;
-{
-  unsigned char buf[PBUFSIZ];
-
-  dcache_flush (sds_dcache);
-
-  last_sent_signal = siggnal;
-  last_sent_step = step;
-
-  buf[0] = (step ? 21 : 20);
-  buf[1] = 0;  /* (should be signal?) */
-
-  sds_send (buf, 2);
-}
-
-/* Send a message to target to halt it.  Target will respond, and send
-   us a message pending notice.  */
-
-static void
-sds_interrupt (signo)
-     int signo;
-{
-  unsigned char buf[PBUFSIZ];
-
-  /* If this doesn't work, try more severe steps.  */
-  signal (signo, sds_interrupt_twice);
-  
-  if (remote_debug)
-    printf_unfiltered ("sds_interrupt called\n");
-
-  buf[0] = 25;
-  sds_send (buf, 1);
-}
-
-static void (*ofunc)();
-
-/* The user typed ^C twice.  */
-
-static void
-sds_interrupt_twice (signo)
-     int signo;
-{
-  signal (signo, ofunc);
-  
-  interrupt_query ();
-
-  signal (signo, sds_interrupt);
-}
-
-/* Ask the user what to do when an interrupt is received.  */
-
-static void
-interrupt_query ()
-{
-  target_terminal_ours ();
-
-  if (query ("Interrupted while waiting for the program.\n\
-Give up (and stop debugging it)? "))
-    {
-      target_mourn_inferior ();
-      return_to_top_level (RETURN_QUIT);
-    }
-
-  target_terminal_inferior ();
-}
-
-/* If nonzero, ignore the next kill.  */
-int kill_kludge;
-
-/* Wait until the remote machine stops, then return, storing status in
-   STATUS just as `wait' would.  Returns "pid" (though it's not clear
-   what, if anything, that means in the case of this target).  */
-
-static int
-sds_wait (pid, status)
-     int pid;
-     struct target_waitstatus *status;
-{
-  unsigned char buf[PBUFSIZ];
-  int retlen;
-
-  status->kind = TARGET_WAITKIND_EXITED;
-  status->value.integer = 0;
-
-  ofunc = (void (*)()) signal (SIGINT, sds_interrupt);
-
-  signal (SIGINT, ofunc);
-
-  if (just_started)
-    {
-      just_started = 0;
-      status->kind = TARGET_WAITKIND_STOPPED;
-      return inferior_pid;
-    }
-
-  while (1)
-    {
-      getmessage (buf, 1);
-
-      if (message_pending)
-	{
-	  buf[0] = 26;
-	  retlen = sds_send (buf, 1);
-	  if (remote_debug)
-	    {
-	      fprintf_unfiltered (gdb_stderr, "Signals: %04x %02x %02x\n",
-				  ((int) buf[0]) << 8 + buf[1],
-				  buf[2], buf[3]);
-	    }
-	  message_pending = 0;
-	  status->kind = TARGET_WAITKIND_STOPPED;
-	  status->value.sig = TARGET_SIGNAL_TRAP;
-	  goto got_status;
-	}
-    }
- got_status:
-  return inferior_pid;
-}
-
-static unsigned char sprs[16];
-
-/* Read the remote registers into the block REGS.  */
-/* Currently we just read all the registers, so we don't use regno.  */
-
-/* ARGSUSED */
-static void
-sds_fetch_registers (regno)
-     int regno;
-{
-  unsigned char buf[PBUFSIZ];
-  int i, retlen;
-  char *p;
-  char regs[REGISTER_BYTES];
-
-  /* Unimplemented registers read as all bits zero.  */
-  memset (regs, 0, REGISTER_BYTES);
-
-  buf[0] = 18;
-  buf[1] = 1;
-  buf[2] = 0;
-  retlen = sds_send (buf, 3);
-
-  for (i = 0; i < 4 * 6; ++i)
-    regs[i + 4 * 32 + 8 * 32] = buf[i];
-  for (i = 0; i < 4 * 4; ++i)
-    sprs[i] = buf[i + 4 * 7];
-
-  buf[0] = 18;
-  buf[1] = 2;
-  buf[2] = 0;
-  retlen = sds_send (buf, 3);
-
-  for (i = 0; i < retlen; i++)
-    regs[i] = buf[i];
-
-  /* (should warn about reply too short) */
-
-  for (i = 0; i < NUM_REGS; i++)
-    supply_register (i, &regs[REGISTER_BYTE(i)]);
-}
-
-/* Prepare to store registers.  Since we may send them all, we have to
-   read out the ones we don't want to change first.  */
-
-static void 
-sds_prepare_to_store ()
-{
-  /* Make sure the entire registers array is valid.  */
-  read_register_bytes (0, (char *)NULL, REGISTER_BYTES);
-}
-
-/* Store register REGNO, or all registers if REGNO == -1, from the contents
-   of REGISTERS.  FIXME: ignores errors.  */
-
-static void
-sds_store_registers (regno)
-     int regno;
-{
-  unsigned char *p, buf[PBUFSIZ];
-  int i;
-
-  /* Store all the special-purpose registers.  */
-  p = buf;
-  *p++ = 19;
-  *p++ = 1;
-  *p++ = 0;
-  *p++ = 0;
-  for (i = 0; i < 4 * 6; i++)
-    *p++ = registers[i + 4 * 32 + 8 * 32];
-  for (i = 0; i < 4 * 1; i++)
-    *p++ = 0;
-  for (i = 0; i < 4 * 4; i++)
-    *p++ = sprs[i];
-
-  sds_send (buf, p - buf);
-
-  /* Store all the general-purpose registers.  */
-  p = buf;
-  *p++ = 19;
-  *p++ = 2;
-  *p++ = 0;
-  *p++ = 0;
-  for (i = 0; i < 4 * 32; i++)
-    *p++ = registers[i];
-
-  sds_send (buf, p - buf);
-
-}
-
-/* Write memory data directly to the remote machine.  This does not
-   inform the data cache; the data cache uses this.  MEMADDR is the
-   address in the remote memory space.  MYADDR is the address of the
-   buffer in our space.  LEN is the number of bytes.
-
-   Returns number of bytes transferred, or 0 for error.  */
-
-static int
-sds_write_bytes (memaddr, myaddr, len)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-{
-  int max_buf_size;		/* Max size of packet output buffer */
-  int origlen;
-  unsigned char buf[PBUFSIZ];
-  int todo;
-  int i;
-
-  /* Chop the transfer down if necessary */
-
-  max_buf_size = 150;
-
-  origlen = len;
-  while (len > 0)
-    {
-      todo = min (len, max_buf_size);
-
-      buf[0] = 13;
-      buf[1] = 0;
-      buf[2] = (int) (memaddr >> 24) & 0xff;
-      buf[3] = (int) (memaddr >> 16) & 0xff;
-      buf[4] = (int) (memaddr >>  8) & 0xff;
-      buf[5] = (int) (memaddr      ) & 0xff;
-      buf[6] = 1;
-      buf[7] = 0;
-
-      for (i = 0; i < todo; i++)
-	buf[i + 8] = myaddr[i];
-
-      sds_send (buf, 8 + todo);
-
-      /* (should look at result) */
-
-      myaddr += todo;
-      memaddr += todo;
-      len -= todo;
-    }
-  return origlen;
-}
-
-/* Read memory data directly from the remote machine.  This does not
-   use the data cache; the data cache uses this.  MEMADDR is the
-   address in the remote memory space.  MYADDR is the address of the
-   buffer in our space.  LEN is the number of bytes.
-
-   Returns number of bytes transferred, or 0 for error.  */
-
-static int
-sds_read_bytes (memaddr, myaddr, len)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-{
-  int max_buf_size;		/* Max size of packet output buffer */
-  int origlen, retlen;
-  unsigned char buf[PBUFSIZ];
-  int todo;
-  int i;
-
-  /* Chop the transfer down if necessary */
-
-  max_buf_size = 150;
-
-  origlen = len;
-  while (len > 0)
-    {
-      todo = min (len, max_buf_size);
-
-      buf[0] = 12;
-      buf[1] = 0;
-      buf[2] = (int) (memaddr >> 24) & 0xff;
-      buf[3] = (int) (memaddr >> 16) & 0xff;
-      buf[4] = (int) (memaddr >>  8) & 0xff;
-      buf[5] = (int) (memaddr      ) & 0xff;
-      buf[6] = (int) (todo >> 8) & 0xff;
-      buf[7] = (int) (todo     ) & 0xff;
-      buf[8] = 1;
-
-      retlen = sds_send (buf, 9);
-
-      if (retlen - 2 != todo)
-	{
-	  return 0;
-	}
-
-      /* Reply describes memory byte by byte. */
-
-      for (i = 0; i < todo; i++)
-	myaddr[i] = buf[i + 2];
-
-      myaddr += todo;
-      memaddr += todo;
-      len -= todo;
-    }
-
-  return origlen;
-}
-
-/* Read or write LEN bytes from inferior memory at MEMADDR,
-   transferring to or from debugger address MYADDR.  Write to inferior
-   if SHOULD_WRITE is nonzero.  Returns length of data written or
-   read; 0 for error.  */
-
-/* ARGSUSED */
-static int
-sds_xfer_memory(memaddr, myaddr, len, should_write, target)
-     CORE_ADDR memaddr;
-     char *myaddr;
-     int len;
-     int should_write;
-     struct target_ops *target;			/* ignored */
-{
-  return dcache_xfer_memory (sds_dcache, memaddr, myaddr, len, should_write);
-}
-
-
-static void
-sds_files_info (ignore)
-     struct target_ops *ignore;
-{
-  puts_filtered ("Debugging over a serial connection, using SDS protocol.\n");
-}
-
-/* Stuff for dealing with the packets which are part of this protocol.
-   See comment at top of file for details.  */
-
-/* Read a single character from the remote end, masking it down to 7 bits. */
-
-static int
-readchar (timeout)
-     int timeout;
-{
-  int ch;
-
-  ch = SERIAL_READCHAR (sds_desc, timeout);
-
-  if (remote_debug > 1 && ch >= 0)
-    printf_unfiltered("%c(%x)", ch, ch);
-
-  switch (ch)
-    {
-    case SERIAL_EOF:
-      error ("Remote connection closed");
-    case SERIAL_ERROR:
-      perror_with_name ("Remote communication error");
-    case SERIAL_TIMEOUT:
-      return ch;
-    default:
-      return ch & 0x7f;
-    }
-}
-
-/* An SDS-style checksum is a sum of the bytes modulo 253.  (Presumably
-   because 253, 254, and 255 are special flags in the protocol.)  */
-
-static int
-compute_checksum (csum, buf, len)
-     int csum, len;
-     char *buf;
-{
-  int i;
-
-  for (i = 0; i < len; ++i)
-    csum += (unsigned char) buf[i];
-
-  csum %= 253;
-  return csum;
-}
-
-/* Send the command in BUF to the remote machine, and read the reply
-   into BUF also.  */
-
-static int
-sds_send (buf, len)
-     unsigned char *buf;
-     int len;
-{
-  putmessage (buf, len);
-
-  return getmessage (buf, 0);
-}
-
-/* Send a message to the remote machine.  */
-
-static int
-putmessage (buf, len)
-     unsigned char *buf;
-     int len;
-{
-  int i, enclen;
-  unsigned char csum = 0;
-  char buf2[PBUFSIZ], buf3[PBUFSIZ];
-  unsigned char header[3];
-  int ch;
-  int tcount = 0;
-  char *p;
-
-  /* Copy the packet into buffer BUF2, encapsulating it
-     and giving it a checksum.  */
-
-  if (len > 170)		/* Prosanity check */
-    abort();
-
-  if (remote_debug)
-    {
-      fprintf_unfiltered (gdb_stderr, "Message to send: \"");
-      for (i = 0; i < len; ++i)
-	fprintf_unfiltered (gdb_stderr, "%02x", buf[i]);
-      fprintf_unfiltered (gdb_stderr, "\"\n");
-    }
-
-  p = buf2;
-  *p++ = '$';
-
-  if (len % 3 != 0)
-    {
-      buf[len] = '\0';
-      buf[len+1] = '\0';
-    }
-
-  header[1] = next_msg_id;
-
-  header[2] = len;
-
-  csum = compute_checksum (csum, buf, len);
-  csum = compute_checksum (csum, header + 1, 2);
-
-  header[0] = csum;
-
-  tob64 (header, p, 3);
-  p += 4;
-  enclen = tob64 (buf, buf3, ((len + 2) / 3) * 3);
-
-  for (i = 0; i < enclen; ++i)
-    *p++ = buf3[i];
-  *p++ = '\r';
-  *p++ = '\n';
-
-  next_msg_id = (next_msg_id + 3) % 245;
-
-  /* Send it over and over until we get a positive ack.  */
-
-  while (1)
-    {
-      int started_error_output = 0;
-
-      if (remote_debug)
-	{
-	  *p = '\0';
-	  printf_unfiltered ("Sending encoded: \"%s\"", buf2);
-	  printf_unfiltered ("  (Checksum %d, id %d, length %d)\n",
-			     header[0], header[1], header[2]);
-	  gdb_flush (gdb_stdout);
-	}
-      if (SERIAL_WRITE (sds_desc, buf2, p - buf2))
-	perror_with_name ("putmessage: write failed");
-
-      return 1;
-
-    }
-
-}
-
-/* Come here after finding the start of the frame.  Collect the rest
-   into BUF.  Returns 0 on any error, 1 on success.  */
-
-static int
-read_frame (buf)
-     char *buf;
-{
-  char *bp;
-  int c;
-
-  bp = buf;
-
-  while (1)
-    {
-      c = readchar (sds_timeout);
-
-      switch (c)
-	{
-	case SERIAL_TIMEOUT:
-	  if (remote_debug)
-	    puts_filtered ("Timeout in mid-message, retrying\n");
-	  return 0;
-	case '$':
-	  if (remote_debug)
-	    puts_filtered ("Saw new packet start in middle of old one\n");
-	  return 0;		/* Start a new packet, count retries */
-	case '\r':
-	  break;
-
-	case '\n':
-	  {
-	    *bp = '\000';
-	    if (remote_debug)
-	      fprintf_unfiltered (gdb_stderr, "Received encoded: \"%s\"\n",
-				  buf);
-	    return 1;
-	  }
-
-	default:
-	  if (bp < buf + PBUFSIZ - 1)
-	    {
-	      *bp++ = c;
-	      continue;
-	    }
-
-	  *bp = '\0';
-	  puts_filtered ("Message too long: ");
-	  puts_filtered (buf);
-	  puts_filtered ("\n");
-
-	  return 0;
-	}
-    }
-}
-
-/* Read a packet from the remote machine, with error checking,
-   and store it in BUF.  BUF is expected to be of size PBUFSIZ.
-   If FOREVER, wait forever rather than timing out; this is used
-   while the target is executing user code.  */
-
-static int
-getmessage (buf, forever)
-     unsigned char *buf;
-     int forever;
-{
-  int c, c2, c3;
-  int tries;
-  int timeout;
-  int val, i, len, csum;
-  unsigned char header[3];
-  unsigned char inbuf[500];
-
-  strcpy (buf, "timeout");
-
-  if (forever)
-    {
-#ifdef MAINTENANCE_CMDS
-      timeout = watchdog > 0 ? watchdog : -1;
-#else
-      timeout = -1;
-#endif
-    }
-
-  else
-    timeout = sds_timeout;
-
-#define MAX_TRIES 3
-
-  for (tries = 1; tries <= MAX_TRIES; tries++)
-    {
-      /* This can loop forever if the remote side sends us characters
-	 continuously, but if it pauses, we'll get a zero from readchar
-	 because of timeout.  Then we'll count that as a retry.  */
-
-      /* Note that we will only wait forever prior to the start of a packet.
-	 After that, we expect characters to arrive at a brisk pace.  They
-	 should show up within sds_timeout intervals.  */
-
-      do
-	{
-	  c = readchar (timeout);
-
-	  if (c == SERIAL_TIMEOUT)
-	    {
-#ifdef MAINTENANCE_CMDS
-	      if (forever)	/* Watchdog went off.  Kill the target. */
-		{
-		  target_mourn_inferior ();
-		  error ("Watchdog has expired.  Target detached.\n");
-		}
-#endif
-	      if (remote_debug)
-		puts_filtered ("Timed out.\n");
-	      goto retry;
-	    }
-	}
-      while (c != '$' && c != '{');
-
-      /* We might have seen a "trigraph", a sequence of three characters
-	 that indicate various sorts of communication state.  */
-
-      if (c == '{')
-	{
-	  /* Read the other two chars of the trigraph. */
-	  c2 = readchar (timeout);
-	  c3 = readchar (timeout);
-	  if (remote_debug)
-	    fprintf_unfiltered (gdb_stderr, "Trigraph %c%c%c received\n",
-				c, c2, c3);
-	  if (c3 == '+')
-	    {
-	      message_pending = 1;
-	      return 0; /*????*/
-	    }
-	  continue;
-	}
-
-      val = read_frame (inbuf);
-
-      if (val == 1)
-	{
-	  fromb64 (inbuf, header, 4);
-	  /* (should check out other bits) */
-	  fromb64 (inbuf + 4, buf, strlen (inbuf) - 4);
-
-	  len = header[2];
-
-	  csum = 0;
-	  csum = compute_checksum (csum, buf, len);
-	  csum = compute_checksum (csum, header + 1, 2);
-
-	  if (csum != header[0])
-	    fprintf_unfiltered (gdb_stderr,
-				"Checksum mismatch: computed %d, received %d\n",
-				csum, header[0]);
-
-	  if (header[2] == 0xff)
-	    fprintf_unfiltered (gdb_stderr, "Requesting resend...\n");
-
-	  if (remote_debug)
-	    {
-	      fprintf_unfiltered (gdb_stderr,
-				  "... (Got checksum %d, id %d, length %d)\n",
-				  header[0], header[1], header[2]);
-	      fprintf_unfiltered (gdb_stderr, "Message received: \"");
-	      for (i = 0; i < len; ++i)
-		{
-		  fprintf_unfiltered (gdb_stderr, "%02x", (unsigned char) buf[i]);
-		}
-	      fprintf_unfiltered (gdb_stderr, "\"\n");
-	    }
-
-	  /* no ack required? */
-	  return len;
-	}
-
-      /* Try the whole thing again.  */
-    retry:
-      /* need to do something here */
-    }
-
-  /* We have tried hard enough, and just can't receive the packet.  Give up. */
-
-  printf_unfiltered ("Ignoring packet error, continuing...\n");
-  return 0;
-}
-
-static void
-sds_kill ()
-{
-  /* Don't try to do anything to the target.  */
-}
-
-static void
-sds_mourn ()
-{
-  unpush_target (&sds_ops);
-  generic_mourn_inferior ();
-}
-
-static void
-sds_create_inferior (exec_file, args, env)
-     char *exec_file;
-     char *args;
-     char **env;
-{
-  inferior_pid = 42000;
-
-  /* Clean up from the last time we were running.  */
-  clear_proceed_status ();
-
-  /* Let the remote process run.  */
-  proceed (bfd_get_start_address (exec_bfd), TARGET_SIGNAL_0, 0);
-}
-
-static void
-sds_load (filename, from_tty)
-    char *filename;
-    int from_tty;
-{
-  generic_load (filename, from_tty);
-
-  inferior_pid = 0;
-}
-
-/* The SDS monitor has commands for breakpoint insertion, although it
-   it doesn't actually manage the breakpoints, it just returns the
-   replaced instruction back to the debugger.  */
-
-static int
-sds_insert_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
-{
-  int i, retlen;
-  unsigned char *p, buf[PBUFSIZ];
-
-  p = buf;
-  *p++ = 16;
-  *p++ = 0;
-  *p++ = (int) (addr >> 24) & 0xff;
-  *p++ = (int) (addr >> 16) & 0xff;
-  *p++ = (int) (addr >>  8) & 0xff;
-  *p++ = (int) (addr      ) & 0xff;
-  
-  retlen = sds_send (buf, p - buf);
-
-  for (i = 0; i < 4; ++i)
-    contents_cache[i] = buf[i + 2];
-
-  return 0;
-}
-
-static int
-sds_remove_breakpoint (addr, contents_cache)
-     CORE_ADDR addr;
-     char *contents_cache;
-{
-  int i, retlen;
-  unsigned char *p, buf[PBUFSIZ];
-
-  p = buf;
-  *p++ = 17;
-  *p++ = 0;
-  *p++ = (int) (addr >> 24) & 0xff;
-  *p++ = (int) (addr >> 16) & 0xff;
-  *p++ = (int) (addr >>  8) & 0xff;
-  *p++ = (int) (addr      ) & 0xff;
-  for (i = 0; i < 4; ++i)
-    *p++ = contents_cache[i];
-
-  retlen = sds_send (buf, p - buf);
-
-  return 0;
-}
-
-static void 
-init_sds_ops ()
-{
-  sds_ops.to_shortname = "sds";
-  sds_ops.to_longname = "Remote serial target with SDS protocol";
-  sds_ops.to_doc = "Use a remote computer via a serial line; using the SDS protocol.\n\
-Specify the serial device it is connected to (e.g. /dev/ttya).";
-  sds_ops.to_open = sds_open;
-  sds_ops.to_close = sds_close;
-  sds_ops.to_detach = sds_detach;
-  sds_ops.to_resume = sds_resume;
-  sds_ops.to_wait = sds_wait;
-  sds_ops.to_fetch_registers = sds_fetch_registers;
-  sds_ops.to_store_registers = sds_store_registers;
-  sds_ops.to_prepare_to_store = sds_prepare_to_store;
-  sds_ops.to_xfer_memory = sds_xfer_memory;
-  sds_ops.to_files_info = sds_files_info;
-  sds_ops.to_insert_breakpoint = sds_insert_breakpoint;
-  sds_ops.to_remove_breakpoint = sds_remove_breakpoint;
-  sds_ops.to_kill = sds_kill;
-  sds_ops.to_load = sds_load;
-  sds_ops.to_create_inferior = sds_create_inferior;
-  sds_ops.to_mourn_inferior = sds_mourn;
-  sds_ops.to_stratum = process_stratum;
-  sds_ops.to_has_all_memory = 1;
-  sds_ops.to_has_memory = 1;
-  sds_ops.to_has_stack = 1;
-  sds_ops.to_has_registers = 1;
-  sds_ops.to_has_execution = 1;
-  sds_ops.to_magic = OPS_MAGIC;
-}
-
-/* Put a command string, in args, out to the monitor and display the
-   reply message.  */
-
-static void
-sds_command (args, from_tty)
-     char *args;
-     int from_tty;
-{
-  char *p;
-  int i, len, retlen;
-  unsigned char buf[1000];
-
-  /* Convert hexadecimal chars into a byte buffer.  */
-  p = args;
-  len = 0;
-  while (*p != '\0')
-    {
-      buf[len++] = fromhex (p[0]) * 16 + fromhex (p[1]);
-      if (p[1] == '\0')
-	break;
-      p += 2;
-    }
-
-  retlen = sds_send (buf, len);
-
-  printf_filtered ("Reply is ");
-  for (i = 0; i < retlen; ++i)
-    {
-      printf_filtered ("%02x", buf[i]);
-    }  
-  printf_filtered ("\n");
-}
-
-void
-_initialize_remote_sds ()
-{
-  init_sds_ops ();
-  add_target (&sds_ops);
-
-  add_show_from_set (add_set_cmd ("sdstimeout", no_class,
-				  var_integer, (char *)&sds_timeout,
-				  "Set timeout value for sds read.\n", &setlist),
-		     &showlist);
-
-  add_com ("sds", class_obscure, sds_command,
-	   "Send a command to the SDS monitor."); 
-}
diff --git a/contrib/gdb/gdb/v850-tdep.c b/contrib/gdb/gdb/v850-tdep.c
deleted file mode 100644
index b98a4bd..0000000
--- a/contrib/gdb/gdb/v850-tdep.c
+++ /dev/null
@@ -1,884 +0,0 @@
-/* Target-dependent code for the NEC V850 for GDB, the GNU debugger.
-   Copyright 1996, Free Software Foundation, Inc.
-
-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 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.  */
-
-#include "defs.h"
-#include "frame.h"
-#include "inferior.h"
-#include "obstack.h"
-#include "target.h"
-#include "value.h"
-#include "bfd.h"
-#include "gdb_string.h"
-#include "gdbcore.h"
-#include "symfile.h"
-
-
-static char *v850_generic_reg_names[] = REGISTER_NAMES;
-
-static char *v850e_reg_names[] =
-{
-  "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7",
-  "r8", "r9", "r10", "r11", "r12", "r13", "r14", "r15",
-  "r16", "r17", "r18", "r19", "r20", "r21", "r22", "r23",
-  "r24", "r25", "r26", "r27", "r28", "r29", "r30", "r31",
-  "eipc", "eipsw", "fepc", "fepsw", "ecr", "psw", "sr6", "sr7",
-  "sr8", "sr9", "sr10", "sr11", "sr12", "sr13", "sr14", "sr15",
-  "ctpc", "ctpsw", "dbpc", "dbpsw", "ctbp", "sr21", "sr22", "sr23",
-  "sr24", "sr25", "sr26", "sr27", "sr28", "sr29", "sr30", "sr31",
-  "pc", "fp"
-};
-
-char **v850_register_names = v850_generic_reg_names;
-
-struct
-{
-  char **regnames;
-  int mach;
-} v850_processor_type_table[] =
-{
-  { v850_generic_reg_names, bfd_mach_v850 },
-  { v850e_reg_names, bfd_mach_v850e },
-  { v850e_reg_names, bfd_mach_v850ea },
-  { NULL, 0 }
-};
-
-/* Info gleaned from scanning a function's prologue.  */
-
-struct pifsr			/* Info about one saved reg */
-{
-  int framereg;			/* Frame reg (SP or FP) */
-  int offset;			/* Offset from framereg */
-  int cur_frameoffset;		/* Current frameoffset */
-  int reg;			/* Saved register number */
-};
-
-struct prologue_info
-{
-  int framereg;
-  int frameoffset;
-  int start_function;
-  struct pifsr *pifsrs;
-};
-
-static CORE_ADDR v850_scan_prologue PARAMS ((CORE_ADDR pc, 
-					     struct prologue_info *fs));
-
-
-/* Should call_function allocate stack space for a struct return?  */
-int
-v850_use_struct_convention (gcc_p, type)
-     int gcc_p;
-     struct type *type;
-{
-  return (TYPE_NFIELDS (type) > 1 || TYPE_LENGTH (type) > 4);
-}
-
-
-
-/* Structure for mapping bits in register lists to register numbers. */
-struct reg_list 
-{
-  long mask;
-  int regno;
-};
-
-/* Helper function for v850_scan_prologue to handle prepare instruction. */
-
-static void
-handle_prepare (int insn, int insn2, CORE_ADDR *current_pc_ptr,
-		struct prologue_info *pi, struct pifsr **pifsr_ptr)
-
-{
-  CORE_ADDR current_pc = *current_pc_ptr;
-  struct pifsr *pifsr = *pifsr_ptr;
-  long next = insn2 & 0xffff;
-  long list12 = ((insn & 1) << 16) + (next & 0xffe0);
-  long offset = (insn & 0x3e) << 1;
-  static struct reg_list reg_table [] =
-  {
-    { 0x00800, 20 },	/* r20 */
-    { 0x00400, 21 },	/* r21 */
-    { 0x00200, 22 },	/* r22 */
-    { 0x00100, 23 },	/* r23 */
-    { 0x08000, 24 },	/* r24 */
-    { 0x04000, 25 },	/* r25 */
-    { 0x02000, 26 },	/* r26 */
-    { 0x01000, 27 },	/* r27 */
-    { 0x00080, 28 },	/* r28 */
-    { 0x00040, 29 },	/* r29 */
-    { 0x10000, 30 },	/* ep */
-    { 0x00020, 31 },	/* lp */
-    { 0, 0 }		/* end of table */
-  };
-  int i;
-
-  if ((next & 0x1f) == 0x0b)		/* skip imm16 argument */
-    current_pc += 2;
-  else if ((next & 0x1f) == 0x13)	/* skip imm16 argument */
-    current_pc += 2;
-  else if ((next & 0x1f) == 0x1b)	/* skip imm32 argument */
-    current_pc += 4;
-
-  /* Calculate the total size of the saved registers, and add it
-     it to the immediate value used to adjust SP. */
-  for (i = 0; reg_table[i].mask != 0; i++)
-    if (list12 & reg_table[i].mask)
-      offset += REGISTER_RAW_SIZE (regtable[i].regno);
-  pi->frameoffset -= offset;
-
-  /* Calculate the offsets of the registers relative to the value
-     the SP will have after the registers have been pushed and the
-     imm5 value has been subtracted from it. */
-  if (pifsr)
-    {
-      for (i = 0; reg_table[i].mask != 0; i++)
-	{
-	  if (list12 & reg_table[i].mask)
-	    {
-	      int reg = reg_table[i].regno;
-	      offset -= REGISTER_RAW_SIZE (reg);
-	      pifsr->reg = reg;
-	      pifsr->offset = offset;
-	      pifsr->cur_frameoffset = pi->frameoffset;
-    #ifdef DEBUG
-	      printf_filtered ("\tSaved register r%d, offset %d", reg, pifsr->offset);
-    #endif
-	      pifsr++;
-	    }
-	}
-    }
-#ifdef DEBUG
-  printf_filtered ("\tfound ctret after regsave func");
-#endif
-
-  /* Set result parameters. */
-  *current_pc_ptr = current_pc;
-  *pifsr_ptr = pifsr;
-}
-
-
-/* Helper function for v850_scan_prologue to handle pushm/pushl instructions.
-   FIXME: the SR bit of the register list is not supported; must check
-   that the compiler does not ever generate this bit. */
-
-static void
-handle_pushm (int insn, int insn2, struct prologue_info *pi,
-	     struct pifsr **pifsr_ptr)
-
-{
-  struct pifsr *pifsr = *pifsr_ptr;
-  long list12 = ((insn & 0x0f) << 16) + (insn2 & 0xfff0);
-  long offset = 0;
-  static struct reg_list pushml_reg_table [] =
-  {
-    { 0x80000, PS_REGNUM },	/* PSW */
-    { 0x40000, 1 },		/* r1 */
-    { 0x20000, 2 },		/* r2 */
-    { 0x10000, 3 },		/* r3 */
-    { 0x00800, 4 },		/* r4 */
-    { 0x00400, 5 },		/* r5 */
-    { 0x00200, 6 },		/* r6 */
-    { 0x00100, 7 },		/* r7 */
-    { 0x08000, 8 },		/* r8 */
-    { 0x04000, 9 },		/* r9 */
-    { 0x02000, 10 },		/* r10 */
-    { 0x01000, 11 },		/* r11 */
-    { 0x00080, 12 },		/* r12 */
-    { 0x00040, 13 },		/* r13 */
-    { 0x00020, 14 },		/* r14 */
-    { 0x00010, 15 },		/* r15 */
-    { 0, 0 }		/* end of table */
-  };
-  static struct reg_list pushmh_reg_table [] =
-  {
-    { 0x80000, 16 },		/* r16 */
-    { 0x40000, 17 },		/* r17 */
-    { 0x20000, 18 },		/* r18 */
-    { 0x10000, 19 },		/* r19 */
-    { 0x00800, 20 },		/* r20 */
-    { 0x00400, 21 },		/* r21 */
-    { 0x00200, 22 },		/* r22 */
-    { 0x00100, 23 },		/* r23 */
-    { 0x08000, 24 },		/* r24 */
-    { 0x04000, 25 },		/* r25 */
-    { 0x02000, 26 },		/* r26 */
-    { 0x01000, 27 },		/* r27 */
-    { 0x00080, 28 },		/* r28 */
-    { 0x00040, 29 },		/* r29 */
-    { 0x00010, 30 },		/* r30 */
-    { 0x00020, 31 },		/* r31 */
-    { 0, 0 }		/* end of table */
-  };
-  struct reg_list *reg_table;
-  int i;
-
-  /* Is this a pushml or a pushmh? */
-  if ((insn2 & 7) == 1)
-    reg_table = pushml_reg_table;
-  else
-    reg_table = pushmh_reg_table;
-
-  /* Calculate the total size of the saved registers, and add it
-     it to the immediate value used to adjust SP. */
-  for (i = 0; reg_table[i].mask != 0; i++)
-    if (list12 & reg_table[i].mask)
-      offset += REGISTER_RAW_SIZE (regtable[i].regno);
-  pi->frameoffset -= offset;
-
-  /* Calculate the offsets of the registers relative to the value
-     the SP will have after the registers have been pushed and the
-     imm5 value is subtracted from it. */
-  if (pifsr)
-    {
-      for (i = 0; reg_table[i].mask != 0; i++)
-	{
-	  if (list12 & reg_table[i].mask)
-	    {
-	      int reg = reg_table[i].regno;
-	      offset -= REGISTER_RAW_SIZE (reg);
-	      pifsr->reg = reg;
-	      pifsr->offset = offset;
-	      pifsr->cur_frameoffset = pi->frameoffset;
-    #ifdef DEBUG
-	      printf_filtered ("\tSaved register r%d, offset %d", reg, pifsr->offset);
-    #endif
-	      pifsr++;
-	    }
-	}
-    }
-#ifdef DEBUG
-  printf_filtered ("\tfound ctret after regsave func");
-#endif
-
-  /* Set result parameters. */
-  *pifsr_ptr = pifsr;
-}
-
-
-
-
-/* Function: scan_prologue
-   Scan the prologue of the function that contains PC, and record what
-   we find in PI.  PI->fsr must be zeroed by the called.  Returns the
-   pc after the prologue.  Note that the addresses saved in pi->fsr
-   are actually just frame relative (negative offsets from the frame
-   pointer).  This is because we don't know the actual value of the
-   frame pointer yet.  In some circumstances, the frame pointer can't
-   be determined till after we have scanned the prologue.  */
-
-static CORE_ADDR
-v850_scan_prologue (pc, pi)
-     CORE_ADDR pc;
-     struct prologue_info *pi;
-{
-  CORE_ADDR func_addr, prologue_end, current_pc;
-  struct pifsr *pifsr, *pifsr_tmp;
-  int fp_used;
-  int ep_used;
-  int reg;
-  CORE_ADDR save_pc, save_end;
-  int regsave_func_p;
-  int r12_tmp;
-
-  /* First, figure out the bounds of the prologue so that we can limit the
-     search to something reasonable.  */
-
-  if (find_pc_partial_function (pc, NULL, &func_addr, NULL))
-    {
-      struct symtab_and_line sal;
-
-      sal = find_pc_line (func_addr, 0);
-
-      if (func_addr == entry_point_address ())
-	pi->start_function = 1;
-      else
-	pi->start_function = 0;
-
-#if 0
-      if (sal.line == 0)
-	prologue_end = pc;
-      else
-	prologue_end = sal.end;
-#else
-      prologue_end = pc;
-#endif
-    }
-  else
-    {				/* We're in the boondocks */
-      func_addr = pc - 100;
-      prologue_end = pc;
-    }
-
-  prologue_end = min (prologue_end, pc);
-
-  /* Now, search the prologue looking for instructions that setup fp, save
-     rp, adjust sp and such.  We also record the frame offset of any saved
-     registers. */ 
-
-  pi->frameoffset = 0;
-  pi->framereg = SP_REGNUM;
-  fp_used = 0;
-  ep_used = 0;
-  pifsr = pi->pifsrs;
-  regsave_func_p = 0;
-  save_pc = 0;
-  save_end = 0;
-  r12_tmp = 0;
-
-#ifdef DEBUG
-  printf_filtered ("Current_pc = 0x%.8lx, prologue_end = 0x%.8lx\n",
-		   (long)func_addr, (long)prologue_end);
-#endif
-
-  for (current_pc = func_addr; current_pc < prologue_end; )
-    {
-      int insn, insn2;
-
-#ifdef DEBUG
-      printf_filtered ("0x%.8lx ", (long)current_pc);
-      (*tm_print_insn) (current_pc, &tm_print_insn_info);
-#endif
-
-      insn = read_memory_unsigned_integer (current_pc, 2);
-      current_pc += 2;
-      if ((insn & 0x0780) >= 0x0600) /* Four byte instruction? */
-	{
-	  insn2 = read_memory_unsigned_integer (current_pc, 2);
-	  current_pc += 2;
-	}
-
-      if ((insn & 0xffc0) == ((10 << 11) | 0x0780) && !regsave_func_p)
-	{			/* jarl <func>,10 */
-	  long low_disp = insn2 & ~ (long) 1;
-	  long disp = (((((insn & 0x3f) << 16) + low_disp)
-			& ~ (long) 1) ^ 0x00200000) - 0x00200000;
-
-	  save_pc = current_pc;
-	  save_end = prologue_end;
-	  regsave_func_p = 1;
-	  current_pc += disp - 4;
-	  prologue_end = (current_pc
-			  + (2 * 3)	/* moves to/from ep */
-			  + 4		/* addi <const>,sp,sp */
-			  + 2		/* jmp [r10] */
-			  + (2 * 12)	/* sst.w to save r2, r20-r29, r31 */
-			  + 20);	/* slop area */
-
-#ifdef DEBUG
-	  printf_filtered ("\tfound jarl <func>,r10, disp = %ld, low_disp = %ld, new pc = 0x%.8lx\n",
-			   disp, low_disp, (long)current_pc + 2);
-#endif
-	  continue;
-	}
-      else if ((insn & 0xffc0) == 0x0200 && !regsave_func_p)
-	{			/* callt <imm6> */
-	  long ctbp = read_register (CTBP_REGNUM);
-	  long adr = ctbp + ((insn & 0x3f) << 1);
-
-	  save_pc = current_pc;
-	  save_end = prologue_end;
-	  regsave_func_p = 1;
-	  current_pc = ctbp + (read_memory_unsigned_integer (adr, 2) & 0xffff);
-	  prologue_end = (current_pc
-			  + (2 * 3)	/* prepare list2,imm5,sp/imm */
-			  + 4		/* ctret */
-			  + 20);	/* slop area */
-
-#ifdef DEBUG
-	  printf_filtered ("\tfound callt,  ctbp = 0x%.8lx, adr = %.8lx, new pc = 0x%.8lx\n",
-			   ctbp, adr, (long)current_pc);
-#endif
-	  continue;
-	}
-      else if ((insn & 0xffc0) == 0x0780)	/* prepare list2,imm5 */
-	{
-	  handle_prepare (insn, insn2, &current_pc, pi, &pifsr);
-	  continue;
-	}
-      else if (insn == 0x07e0 && regsave_func_p && insn2 == 0x0144)
-	{			/* ctret after processing register save function */
-	  current_pc = save_pc;
-	  prologue_end = save_end;
-	  regsave_func_p = 0;
-#ifdef DEBUG
-	  printf_filtered ("\tfound ctret after regsave func");
-#endif
-	  continue;
-	}
-      else if ((insn & 0xfff0) == 0x07e0 && (insn2 & 5) == 1)
-	{			/* pushml, pushmh */
-	  handle_pushm (insn, insn2, pi, &pifsr);
-	  continue;
-	}
-      else if ((insn & 0xffe0) == 0x0060 && regsave_func_p)
-	{			/* jmp after processing register save function */
-	  current_pc = save_pc;
-	  prologue_end = save_end;
-	  regsave_func_p = 0;
-#ifdef DEBUG
-	  printf_filtered ("\tfound jmp after regsave func");
-#endif
-	  continue;
-	}
-      else if ((insn & 0x07c0) == 0x0780	/* jarl or jr */
-	       || (insn & 0xffe0) == 0x0060	/* jmp */
-	       || (insn & 0x0780) == 0x0580)	/* branch */
-	{
-#ifdef DEBUG
-	  printf_filtered ("\n");
-#endif
-	  break;				/* Ran into end of prologue */
-	}
-
-      else if ((insn & 0xffe0) == ((SP_REGNUM << 11) | 0x0240))		/* add <imm>,sp */
-	pi->frameoffset += ((insn & 0x1f) ^ 0x10) - 0x10;
-      else if (insn == ((SP_REGNUM << 11) | 0x0600 | SP_REGNUM))	/* addi <imm>,sp,sp */
-	pi->frameoffset += insn2;
-      else if (insn == ((FP_RAW_REGNUM << 11) | 0x0000 | SP_REGNUM))	/* mov sp,fp */
-	{
-	  fp_used = 1;
-	  pi->framereg = FP_RAW_REGNUM;
-	}
-
-      else if (insn == ((R12_REGNUM << 11) | 0x0640 | R0_REGNUM))	/* movhi hi(const),r0,r12 */
-	r12_tmp = insn2 << 16;
-      else if (insn == ((R12_REGNUM << 11) | 0x0620 | R12_REGNUM))	/* movea lo(const),r12,r12 */
-	r12_tmp += insn2;
-      else if (insn == ((SP_REGNUM << 11) | 0x01c0 | R12_REGNUM) && r12_tmp) /* add r12,sp */
-	pi->frameoffset = r12_tmp;
-      else if (insn == ((EP_REGNUM << 11) | 0x0000 | SP_REGNUM))	/* mov sp,ep */
-	ep_used = 1;
-      else if (insn == ((EP_REGNUM << 11) | 0x0000 | R1_REGNUM))	/* mov r1,ep */
-	ep_used = 0;
-      else if (((insn & 0x07ff) == (0x0760 | SP_REGNUM)			/* st.w <reg>,<offset>[sp] */
-		|| (fp_used
-		    && (insn & 0x07ff) == (0x0760 | FP_RAW_REGNUM)))	/* st.w <reg>,<offset>[fp] */
-	       && pifsr
-	       && (((reg = (insn >> 11) & 0x1f) >= SAVE1_START_REGNUM && reg <= SAVE1_END_REGNUM)
-		   || (reg >= SAVE2_START_REGNUM && reg <= SAVE2_END_REGNUM)
-		   || (reg >= SAVE3_START_REGNUM && reg <= SAVE3_END_REGNUM)))
-	{
-	  pifsr->reg = reg;
-	  pifsr->offset = insn2 & ~1;
-	  pifsr->cur_frameoffset = pi->frameoffset;
-#ifdef DEBUG
-	  printf_filtered ("\tSaved register r%d, offset %d", reg, pifsr->offset);
-#endif
-	  pifsr++;
-	}
-
-      else if (ep_used						/* sst.w <reg>,<offset>[ep] */
-	       && ((insn & 0x0781) == 0x0501)
-	       && pifsr
-	       && (((reg = (insn >> 11) & 0x1f) >= SAVE1_START_REGNUM && reg <= SAVE1_END_REGNUM)
-		   || (reg >= SAVE2_START_REGNUM && reg <= SAVE2_END_REGNUM)
-		   || (reg >= SAVE3_START_REGNUM && reg <= SAVE3_END_REGNUM)))
-	{
-	  pifsr->reg = reg;
-	  pifsr->offset = (insn & 0x007e) << 1;
-	  pifsr->cur_frameoffset = pi->frameoffset;
-#ifdef DEBUG
-	  printf_filtered ("\tSaved register r%d, offset %d", reg, pifsr->offset);
-#endif
-	  pifsr++;
-	}
-
-#ifdef DEBUG
-      printf_filtered ("\n");
-#endif
-    }
-
-  if (pifsr)
-    pifsr->framereg = 0;	/* Tie off last entry */
-
-  /* Fix up any offsets to the final offset.  If a frame pointer was created, use it
-     instead of the stack pointer.  */
-  for (pifsr_tmp = pi->pifsrs; pifsr_tmp && pifsr_tmp != pifsr; pifsr_tmp++)
-    {
-      pifsr_tmp->offset -= pi->frameoffset - pifsr_tmp->cur_frameoffset;
-      pifsr_tmp->framereg = pi->framereg;
-
-#ifdef DEBUG
-      printf_filtered ("Saved register r%d, offset = %d, framereg = r%d\n",
-		       pifsr_tmp->reg, pifsr_tmp->offset, pifsr_tmp->framereg);
-#endif
-    }
-
-#ifdef DEBUG
-  printf_filtered ("Framereg = r%d, frameoffset = %d\n", pi->framereg, pi->frameoffset);
-#endif
-
-  return current_pc;
-}
-
-/* Function: init_extra_frame_info
-   Setup the frame's frame pointer, pc, and frame addresses for saved
-   registers.  Most of the work is done in scan_prologue().
-
-   Note that when we are called for the last frame (currently active frame),
-   that fi->pc and fi->frame will already be setup.  However, fi->frame will
-   be valid only if this routine uses FP.  For previous frames, fi-frame will
-   always be correct (since that is derived from v850_frame_chain ()).
-
-   We can be called with the PC in the call dummy under two circumstances.
-   First, during normal backtracing, second, while figuring out the frame
-   pointer just prior to calling the target function (see run_stack_dummy).  */
-
-void
-v850_init_extra_frame_info (fi)
-     struct frame_info *fi;
-{
-  struct prologue_info pi;
-  struct pifsr pifsrs[NUM_REGS + 1], *pifsr;
-
-  if (fi->next)
-    fi->pc = FRAME_SAVED_PC (fi->next);
-
-  memset (fi->fsr.regs, '\000', sizeof fi->fsr.regs);
-
-  /* The call dummy doesn't save any registers on the stack, so we can return
-     now.  */
-  if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-      return;
-
-  pi.pifsrs = pifsrs;
-
-  v850_scan_prologue (fi->pc, &pi);
-
-  if (!fi->next && pi.framereg == SP_REGNUM)
-    fi->frame = read_register (pi.framereg) - pi.frameoffset;
-
-  for (pifsr = pifsrs; pifsr->framereg; pifsr++)
-    {
-      fi->fsr.regs[pifsr->reg] = pifsr->offset + fi->frame;
-
-      if (pifsr->framereg == SP_REGNUM)
-	fi->fsr.regs[pifsr->reg] += pi.frameoffset;
-    }
-}
-
-/* Function: frame_chain
-   Figure out the frame prior to FI.  Unfortunately, this involves
-   scanning the prologue of the caller, which will also be done
-   shortly by v850_init_extra_frame_info.  For the dummy frame, we
-   just return the stack pointer that was in use at the time the
-   function call was made.  */
-
-CORE_ADDR
-v850_frame_chain (fi)
-     struct frame_info *fi;
-{
-  struct prologue_info pi;
-  CORE_ADDR callers_pc, fp;
-
-  /* First, find out who called us */
-  callers_pc = FRAME_SAVED_PC (fi);
-  /* If caller is a call-dummy, then our FP bears no relation to his FP! */
-  fp = v850_find_callers_reg (fi, FP_RAW_REGNUM);
-  if (PC_IN_CALL_DUMMY(callers_pc, fp, fp))
-    return fp;	/* caller is call-dummy: return oldest value of FP */
-
-  /* Caller is NOT a call-dummy, so everything else should just work.
-     Even if THIS frame is a call-dummy! */
-  pi.pifsrs = NULL;
-
-  v850_scan_prologue (callers_pc, &pi);
-
-  if (pi.start_function)
-    return 0;			/* Don't chain beyond the start function */
-
-  if (pi.framereg == FP_RAW_REGNUM)
-    return v850_find_callers_reg (fi, pi.framereg);
-
-  return fi->frame - pi.frameoffset;
-}
-
-/* Function: find_callers_reg
-   Find REGNUM on the stack.  Otherwise, it's in an active register.
-   One thing we might want to do here is to check REGNUM against the
-   clobber mask, and somehow flag it as invalid if it isn't saved on
-   the stack somewhere.  This would provide a graceful failure mode
-   when trying to get the value of caller-saves registers for an inner
-   frame.  */
-
-CORE_ADDR
-v850_find_callers_reg (fi, regnum)
-     struct frame_info *fi;
-     int regnum;
-{
-  for (; fi; fi = fi->next)
-    if (PC_IN_CALL_DUMMY (fi->pc, fi->frame, fi->frame))
-      return generic_read_register_dummy (fi->pc, fi->frame, regnum);
-    else if (fi->fsr.regs[regnum] != 0)
-      return read_memory_unsigned_integer (fi->fsr.regs[regnum], 
-					   REGISTER_RAW_SIZE(regnum));
-
-  return read_register (regnum);
-}
-
-/* Function: skip_prologue
-   Return the address of the first code past the prologue of the function.  */
-
-CORE_ADDR
-v850_skip_prologue (pc)
-     CORE_ADDR pc;
-{
-  CORE_ADDR func_addr, func_end;
-
-  /* See what the symbol table says */
-
-  if (find_pc_partial_function (pc, NULL, &func_addr, &func_end))
-    {
-      struct symtab_and_line sal;
-
-      sal = find_pc_line (func_addr, 0);
-
-      if (sal.line != 0 && sal.end < func_end)
-	return sal.end;
-      else
-	/* Either there's no line info, or the line after the prologue is after
-	   the end of the function.  In this case, there probably isn't a
-	   prologue.  */
-	return pc;
-    }
-
-/* We can't find the start of this function, so there's nothing we can do. */
-  return pc;
-}
-
-/* Function: pop_frame
-   This routine gets called when either the user uses the `return'
-   command, or the call dummy breakpoint gets hit.  */
-
-void
-v850_pop_frame (frame)
-     struct frame_info *frame;
-{
-  int regnum;
-
-  if (PC_IN_CALL_DUMMY(frame->pc, frame->frame, frame->frame))
-    generic_pop_dummy_frame ();
-  else
-    {
-      write_register (PC_REGNUM, FRAME_SAVED_PC (frame));
-
-      for (regnum = 0; regnum < NUM_REGS; regnum++)
-	if (frame->fsr.regs[regnum] != 0)
-	  write_register (regnum,
-			  read_memory_unsigned_integer (frame->fsr.regs[regnum],
-							REGISTER_RAW_SIZE(regnum)));
-
-      write_register (SP_REGNUM, FRAME_FP (frame));
-    }
-
-  flush_cached_frames ();
-}
-
-/* Function: push_arguments
-   Setup arguments and RP for a call to the target.  First four args
-   go in R6->R9, subsequent args go into sp + 16 -> sp + ...  Structs
-   are passed by reference.  64 bit quantities (doubles and long
-   longs) may be split between the regs and the stack.  When calling a
-   function that returns a struct, a pointer to the struct is passed
-   in as a secret first argument (always in R6).
-
-   Stack space for the args has NOT been allocated: that job is up to us.
-   */
-
-CORE_ADDR
-v850_push_arguments (nargs, args, sp, struct_return, struct_addr)
-     int nargs;
-     value_ptr *args;
-     CORE_ADDR sp;
-     unsigned char struct_return;
-     CORE_ADDR struct_addr;
-{
-  int argreg;
-  int argnum;
-  int len = 0;
-  int stack_offset;
-
-  /* First, just for safety, make sure stack is aligned */
-  sp &= ~3;
-
-  /* Now make space on the stack for the args. */
-  for (argnum = 0; argnum < nargs; argnum++)
-    len += ((TYPE_LENGTH(VALUE_TYPE(args[argnum])) + 3) & ~3);
-  sp -= len;	/* possibly over-allocating, but it works... */
-		/* (you might think we could allocate 16 bytes */
-		/* less, but the ABI seems to use it all! )  */
-  argreg = ARG0_REGNUM;
-
-  /* the struct_return pointer occupies the first parameter-passing reg */
-  if (struct_return)
-      write_register (argreg++, struct_addr);
-
-  stack_offset = 16;
-  /* The offset onto the stack at which we will start copying parameters
-     (after the registers are used up) begins at 16 rather than at zero.
-     I don't really know why, that's just the way it seems to work.  */
-
-  /* Now load as many as possible of the first arguments into
-     registers, and push the rest onto the stack.  There are 16 bytes
-     in four registers available.  Loop thru args from first to last.  */
-  for (argnum = 0; argnum < nargs; argnum++)
-    {
-      int len;
-      char *val;
-      char valbuf[REGISTER_RAW_SIZE(ARG0_REGNUM)];
-
-      if (TYPE_CODE (VALUE_TYPE (*args)) == TYPE_CODE_STRUCT
-	  && TYPE_LENGTH (VALUE_TYPE (*args)) > 8)
-	{
-	  store_address (valbuf, 4, VALUE_ADDRESS (*args));
-	  len = 4;
-	  val = valbuf;
-	}
-      else
-	{
-	  len = TYPE_LENGTH (VALUE_TYPE (*args));
-	  val = (char *)VALUE_CONTENTS (*args);
-	}
-
-      while (len > 0)
-	if  (argreg <= ARGLAST_REGNUM)
-	  {
-	    CORE_ADDR regval;
-
-	    regval = extract_address (val, REGISTER_RAW_SIZE (argreg));
-	    write_register (argreg, regval);
-
-	    len -= REGISTER_RAW_SIZE (argreg);
-	    val += REGISTER_RAW_SIZE (argreg);
-	    argreg++;
-	  }
-	else
-	  {
-	    write_memory (sp + stack_offset, val, 4);
-
-	    len -= 4;
-	    val += 4;
-	    stack_offset += 4;
-	  }
-      args++;
-    }
-  return sp;
-}
-
-/* Function: push_return_address (pc)
-   Set up the return address for the inferior function call.
-   Needed for targets where we don't actually execute a JSR/BSR instruction */
- 
-CORE_ADDR
-v850_push_return_address (pc, sp)
-     CORE_ADDR pc;
-     CORE_ADDR sp;
-{
-  write_register (RP_REGNUM, CALL_DUMMY_ADDRESS ());
-  return sp;
-}
- 
-/* Function: frame_saved_pc 
-   Find the caller of this frame.  We do this by seeing if RP_REGNUM
-   is saved in the stack anywhere, otherwise we get it from the
-   registers.  If the inner frame is a dummy frame, return its PC
-   instead of RP, because that's where "caller" of the dummy-frame
-   will be found.  */
-
-CORE_ADDR
-v850_frame_saved_pc (fi)
-     struct frame_info *fi;
-{
-  if (PC_IN_CALL_DUMMY(fi->pc, fi->frame, fi->frame))
-    return generic_read_register_dummy(fi->pc, fi->frame, PC_REGNUM);
-  else
-    return v850_find_callers_reg (fi, RP_REGNUM);
-}
-
-void
-get_saved_register (raw_buffer, optimized, addrp, frame, regnum, lval)
-     char *raw_buffer;
-     int *optimized;
-     CORE_ADDR *addrp;
-     struct frame_info *frame;
-     int regnum;
-     enum lval_type *lval;
-{
-  generic_get_saved_register (raw_buffer, optimized, addrp, 
-			      frame, regnum, lval);
-}
-
-
-/* Function: fix_call_dummy
-   Pokes the callee function's address into the CALL_DUMMY assembly stub.
-   Assumes that the CALL_DUMMY looks like this:
-	jarl <offset24>, r31
-	trap
-   */
-
-int
-v850_fix_call_dummy (dummy, sp, fun, nargs, args, type, gcc_p)
-     char *dummy;
-     CORE_ADDR sp;
-     CORE_ADDR fun;
-     int nargs;
-     value_ptr *args;
-     struct type *type;
-     int gcc_p;
-{
-  long offset24;
-
-  offset24 = (long) fun - (long) entry_point_address ();
-  offset24 &= 0x3fffff;
-  offset24 |= 0xff800000;	/* jarl <offset24>, r31 */
-
-  store_unsigned_integer ((unsigned int *)&dummy[2], 2, offset24 & 0xffff);
-  store_unsigned_integer ((unsigned int *)&dummy[0], 2, offset24 >> 16);
-  return 0;
-}
-
-/* Change the register names based on the current machine type. */
-
-static int
-v850_target_architecture_hook (ap)
-     const bfd_arch_info_type *ap;
-{
-  int i, j;
-
-  if (ap->arch != bfd_arch_v850)
-    return 0;
-
-  for (i = 0; v850_processor_type_table[i].regnames != NULL; i++)
-    {
-      if (v850_processor_type_table[i].mach == ap->mach)
-	{
-	  v850_register_names = v850_processor_type_table[i].regnames;
-	  return 1;
-	}
-    }
-
-  fatal ("Architecture `%s' unreconized", ap->printable_name);
-}
-
-void
-_initialize_v850_tdep ()
-{
-  tm_print_insn = print_insn_v850;
-  target_architecture_hook = v850_target_architecture_hook;
-}