* The following block of changes add support for debugging assembly

	source files.
	* breakpoint.c (resolve_sal_pc):  Prevent crash when pc isn't
	associated with a function.
	* buildsym.c (record_line start_symtab end_symtab):  Don't delete
	symtabs which only have line numbers (but no other debug symbols).
	* dbxread.c (read_dbx_symtab end_psymtab):  Ditto.

	* remote-sim.c:  New functions gdbsim_insert/remove_breakpoint.  Use
	intrinsic simulator breakpoints if available, otherwise do it the
 	hard way.
	* configure.tgt:  Add d30v.
	* d30v-tdep.c:  New file.
	* config/d30v/d30v.mt, config/d30v/tm-d30v.h:  New files.

9 files changed, 1486 insertions, 3 deletions

diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index b7aacef..5b622bd 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -74,6 +74,20 @@ else
 	fi
 fi
 
+d30v_files="d30v-tdep.c"
+
+if ( echo $* | grep keep\-d30v > /dev/null ) ; then
+	keep_these_too="${d30v_files} ${keep_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Keeping ${d30v_files}
+	fi
+else
+	lose_these_too="${d30v_files} ${lose_these_too}"
+	if [ -n "${verbose}" ] ; then
+		echo Deleting ${d30v_files}
+	fi
+fi
+
 # All files listed between the "Things-to-keep:" line and the
 # "Files-to-sed:" line will be kept.  All other files will be removed.
 # Directories listed in this section will have their own Sanitize
@@ -654,6 +668,33 @@ else
 	done
 fi
 
+if ( echo $* | grep keep\-d30v > /dev/null ) ; then
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Keeping d30v stuff in $i
+			fi
+		fi
+	done
+else
+	for i in * ; do
+		if test ! -d $i && (grep sanitize-d30v $i > /dev/null) ; then
+			if [ -n "${verbose}" ] ; then
+				echo Removing traces of \"d30v\" from $i...
+			fi
+			cp $i new
+			sed '/start\-sanitize\-d30v/,/end-\sanitize\-d30v/d' < $i > new
+			if [ -n "${safe}" -a ! -f .Recover/$i ] ; then
+				if [ -n "${verbose}" ] ; then
+					echo Caching $i in .Recover...
+				fi
+				mv $i .Recover
+			fi
+			mv new $i
+		fi
+	done
+fi
+
 for i in * ; do
 	if test ! -d $i && (grep sanitize $i > /dev/null) ; then
 		echo '***' Some mentions of Sanitize are still left in $i! 1>&2
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 0da5389..651098a 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,22 @@
+Wed Sep 24 18:12:47 1997  Stu Grossman  <grossman@babylon-5.cygnus.com>
+
+	* The following block of changes add support for debugging assembly
+	source files.
+	* breakpoint.c (resolve_sal_pc):  Prevent crash when pc isn't
+	associated with a function.
+	* buildsym.c (record_line start_symtab end_symtab):  Don't delete
+	symtabs which only have line numbers (but no other debug symbols).
+	* dbxread.c (read_dbx_symtab end_psymtab):  Ditto.
+
+	* remote-sim.c:  New functions gdbsim_insert/remove_breakpoint.  Use
+	intrinsic simulator breakpoints if available, otherwise do it the
+ 	hard way.
+start-sanitize-d30v
+	* configure.tgt:  Add d30v.
+	* d30v-tdep.c:  New file.
+	* config/d30v/d30v.mt, config/d30v/tm-d30v.h:  New files.
+end-sanitize-d30v
+
 Tue Sep 23 11:24:13 1997  Stan Shebs  <shebs@andros.cygnus.com>
 
 	* Makefile.in (ALLCONFIG): Remove, inaccurate and never used.
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 806d700..f5b1683 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -55,6 +55,10 @@ static struct pending_block *pending_blocks = NULL;
 
 static struct pending *free_pendings;
 
+/* Non-zero if symtab has line number info.  This prevents an otherwise empty
+   symtab from being tossed.  */
+
+static int have_line_numbers;
 
 static int
 compare_line_numbers PARAMS ((const void *, const void *));
@@ -714,6 +718,7 @@ record_line (subfile, line, pc)
 	xmalloc (sizeof (struct linetable)
 	  + subfile->line_vector_length * sizeof (struct linetable_entry));
       subfile->line_vector->nitems = 0;
+      have_line_numbers = 1;
     }
 
   if (subfile->line_vector->nitems + 1 >= subfile->line_vector_length)
@@ -770,6 +775,7 @@ start_symtab (name, dirname, start_addr)
   file_symbols = NULL;
   global_symbols = NULL;
   within_function = 0;
+  have_line_numbers = 0;
 
   /* Context stack is initially empty.  Allocate first one with room for
      10 levels; reuse it forever afterward.  */
@@ -886,7 +892,8 @@ end_symtab (end_addr, objfile, section)
 
   if (pending_blocks == NULL
       && file_symbols == NULL
-      && global_symbols == NULL)
+      && global_symbols == NULL
+      && have_line_numbers == 0)
     {
       /* Ignore symtabs that have no functions with real debugging info */
       blockvector = NULL;
diff --git a/gdb/config/d30v/.Sanitize b/gdb/config/d30v/.Sanitize
new file mode 100644
index 0000000..6cc012e
--- /dev/null
+++ b/gdb/config/d30v/.Sanitize
@@ -0,0 +1,33 @@
+# .Sanitize for devo/gdb/config/d30v
+
+# Each directory to survive its way into a release will need a file
+# like this one called "./.Sanitize".  All keyword lines must exist,
+# and must exist in the order specified by this file.  Each directory
+# in the tree will be processed, top down, in the following order.
+
+# Hash started lines like this one are comments and will be deleted
+# before anything else is done.  Blank lines will also be squashed
+# out.
+
+# The lines between the "Do-first:" line and the "Things-to-keep:"
+# line are executed as a /bin/sh shell script before anything else is
+# done in this directory.
+
+Do-first:
+
+# All files listed between the "Things-to-keep:" line and the
+# "Files-to-sed:" line will be kept.  All other files will be removed.
+# Directories listed in this section will have their own Sanitize
+# called.  Directories not listed will be removed in their entirety
+# with rm -rf.
+
+Things-to-keep:
+
+d30v.mt
+tm-d30v.h
+
+Things-to-lose:
+
+Do-last:
+
+# End of file.
diff --git a/gdb/config/d30v/d30v.mt b/gdb/config/d30v/d30v.mt
new file mode 100644
index 0000000..b949167
--- /dev/null
+++ b/gdb/config/d30v/d30v.mt
@@ -0,0 +1,6 @@
+# Target: Mitsubishi D30V processor
+TDEPFILES= d30v-tdep.o
+TM_FILE= tm-d30v.h
+SIM_OBS= remote-sim.o
+SIM= ../sim/d30v/libsim.a -lm
+
diff --git a/gdb/config/d30v/tm-d30v.h b/gdb/config/d30v/tm-d30v.h
new file mode 100644
index 0000000..5dc255b
--- /dev/null
+++ b/gdb/config/d30v/tm-d30v.h
@@ -0,0 +1,304 @@
+/* Target-specific definition for the Mitsubishi D30V
+   Copyright (C) 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.  */
+
+#ifndef TM_D30V_H
+#define TM_D30V_H
+
+/* Define the bit, byte, and word ordering of the machine.  */
+
+#define TARGET_BYTE_ORDER	BIG_ENDIAN
+
+/* Offset from address of function to start of its code.
+   Zero on most machines.  */
+
+#define FUNCTION_START_OFFSET 0
+
+/* these are the addresses the D30V-EVA board maps data */
+/* and instruction memory to. */
+
+#define DMEM_START	0x2000000
+#define IMEM_START	0x1000000
+#define STACK_START	0x2007ffe
+
+#ifdef __STDC__		/* Forward decls for prototypes */
+struct frame_info;
+struct frame_saved_regs; 
+struct type;
+struct value;
+#endif
+
+/* Advance PC across any function entry prologue instructions
+   to reach some "real" code.  */
+
+extern CORE_ADDR d30v_skip_prologue ();
+#define SKIP_PROLOGUE(ip) \
+    {(ip) = d30v_skip_prologue(ip);}
+
+
+/* Stack grows downward.  */
+#define INNER_THAN <
+
+/* for a breakpoint, use "dbt || nop" */
+#define BREAKPOINT {0x00, 0xb0, 0x00, 0x00,\
+		    0x00, 0xf0, 0x00, 0x00}
+
+/* If your kernel resets the pc after the trap happens you may need to
+   define this before including this file.  */
+#define DECR_PC_AFTER_BREAK 0
+
+#define REGISTER_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",	\
+    "r32", "r33", "r34", "r35", "r36", "r37", "r38", "r39",	\
+    "r40", "r41", "r42", "r43", "r44", "r45", "r46", "r47",	\
+    "r48", "r49", "r50", "r51", "r52", "r53", "r54", "r55",	\
+    "r56", "r57", "r58", "r59", "r60", "r61", "r62", "r63",	\
+    "spi", "spu", \
+    "psw", "bpsw", "pc", "bpc", "dpsw", "dpc", "cr6", "rpt_c",	\
+    "rpt_s", "rpt_e", "mod_s", "mod_e", "cr12", "cr13", "iba", "eit_vb",\
+    "int_s", "int_m", "a0", "a1" \
+    }
+
+#define NUM_REGS 86
+
+/* Register numbers of various important registers.
+   Note that some of these values are "real" register numbers,
+   and correspond to the general registers of the machine,
+   and some are "phony" register numbers which are too large
+   to be actual register numbers as far as the user is concerned
+   but do serve to get the desired values when passed to read_register.  */
+
+#define R0_REGNUM	0
+#define FP_REGNUM	11
+#define LR_REGNUM 	62
+#define SP_REGNUM 	63
+#define SPI_REGNUM	64	/* Interrupt stack pointer */
+#define SPU_REGNUM	65	/* User stack pointer */
+#define CREGS_START	66
+
+#define PSW_REGNUM 	(CREGS_START + 0) /* psw, bpsw, or dpsw??? */
+#define    PSW_SM 0x80000000	/* Stack mode: 0 == interrupt (SPI),
+					       1 == user (SPU) */
+#define BPSW_REGNUM	(CREGS_START + 1) /* Backup PSW (on interrupt) */
+#define PC_REGNUM 	(CREGS_START + 2) /* pc, bpc, or dpc??? */
+#define BPC_REGNUM 	(CREGS_START + 3) /* Backup PC (on interrupt) */
+#define DPSW_REGNUM	(CREGS_START + 4) /* Backup PSW (on debug trap) */
+#define DPC_REGNUM 	(CREGS_START + 5) /* Backup PC (on debug trap) */
+#define RPT_C_REGNUM	(CREGS_START + 7) /* Loop count */
+#define RPT_S_REGNUM	(CREGS_START + 8) /* Loop start address*/
+#define RPT_E_REGNUM	(CREGS_START + 9) /* Loop end address */
+#define MOD_S_REGNUM	(CREGS_START + 10)
+#define MOD_E_REGNUM	(CREGS_START + 11)
+#define IBA_REGNUM	(CREGS_START + 14) /* Instruction break address */
+#define EIT_VB_REGNUM	(CREGS_START + 15) /* Vector base address */
+#define INT_S_REGNUM	(CREGS_START + 16) /* Interrupt status */
+#define INT_M_REGNUM	(CREGS_START + 17) /* Interrupt mask */
+#define A0_REGNUM 	84
+#define A1_REGNUM 	85
+
+/* Say how much memory is needed to store a copy of the register set */
+#define REGISTER_BYTES    ((NUM_REGS - 2) * 4 + 2 * 8) 
+
+/* Index within `registers' of the first byte of the space for
+   register N.  */
+
+#define REGISTER_BYTE(N)  \
+( ((N) >= A0_REGNUM) ? ( ((N) - A0_REGNUM) * 8 + A0_REGNUM * 4 ) : ((N) * 4) )
+
+/* Number of bytes of storage in the actual machine representation
+   for register N.  */
+
+#define REGISTER_RAW_SIZE(N) ( ((N) >= A0_REGNUM) ? 8 : 4 )
+
+/* Number of bytes of storage in the program's representation
+   for register N.  */   
+#define REGISTER_VIRTUAL_SIZE(N) REGISTER_RAW_SIZE(N)
+
+/* Largest value REGISTER_RAW_SIZE can have.  */
+
+#define MAX_REGISTER_RAW_SIZE 8
+
+/* Largest value REGISTER_VIRTUAL_SIZE can have.  */
+
+#define MAX_REGISTER_VIRTUAL_SIZE 8
+
+/* Return the GDB type object for the "standard" data type
+   of data in register N.  */
+
+#define REGISTER_VIRTUAL_TYPE(N) \
+( ((N) < A0_REGNUM ) ? builtin_type_long : builtin_type_long_long)
+
+/* Writing to r0 is a noop (not an error or exception or anything like
+   that, however).  */
+
+#define CANNOT_STORE_REGISTER(regno) ((regno) == R0_REGNUM)
+
+void d30v_do_registers_info PARAMS ((int regnum, int fpregs));
+
+#define DO_REGISTERS_INFO d30v_do_registers_info
+
+/* Store the address of the place in which to copy the structure the
+   subroutine will return.  This is called from call_function. 
+
+   We store structs through a pointer passed in R2 */
+
+#define STORE_STRUCT_RETURN(ADDR, SP) \
+    { write_register (2, (ADDR));  }
+
+
+/* Write into appropriate registers a function return value
+   of type TYPE, given in virtual format.  
+
+   Things always get returned in R2/R3 */
+
+#define STORE_RETURN_VALUE(TYPE,VALBUF) \
+  write_register_bytes (REGISTER_BYTE(2), VALBUF, TYPE_LENGTH (TYPE))
+
+
+/* Extract from an array REGBUF containing the (raw) register state
+   the address in which a function should return its structure value,
+   as a CORE_ADDR (or an expression that can be used as one).  */
+
+#define EXTRACT_STRUCT_VALUE_ADDRESS(REGBUF) (*(CORE_ADDR *)(REGBUF))
+
+
+/* Define other aspects of the stack frame. 
+   we keep a copy of the worked out return pc lying around, since it
+   is a useful bit of info */
+
+#define EXTRA_FRAME_INFO \
+    CORE_ADDR return_pc; \
+    CORE_ADDR dummy; \
+    int frameless; \
+    int size;
+
+#define INIT_EXTRA_FRAME_INFO(fromleaf, fi) \
+    d30v_init_extra_frame_info(fromleaf, fi) 
+
+extern void d30v_init_extra_frame_info PARAMS (( int fromleaf, struct frame_info *fi ));
+
+/* A macro that tells us whether the function invocation represented
+   by FI does not have a frame on the stack associated with it.  If it
+   does not, FRAMELESS is set to 1, else 0.  */
+
+#define FRAMELESS_FUNCTION_INVOCATION(FI, FRAMELESS) \
+  (FRAMELESS) = frameless_look_for_prologue(FI)
+
+#define FRAME_CHAIN(FRAME)       d30v_frame_chain(FRAME)
+#define FRAME_CHAIN_VALID(chain,frame)	\
+      ((chain) != 0 && (frame) != 0 && (frame)->pc > IMEM_START)
+#define FRAME_SAVED_PC(FRAME)    ((FRAME)->return_pc)   
+#define FRAME_ARGS_ADDRESS(fi)   (fi)->frame
+#define FRAME_LOCALS_ADDRESS(fi) (fi)->frame
+
+/* Immediately after a function call, return the saved pc.  We can't */
+/* use frame->return_pc beause that is determined by reading R13 off the */
+/*stack and that may not be written yet. */
+
+#define SAVED_PC_AFTER_CALL(frame) ((read_register(LR_REGNUM) << 2) | IMEM_START)
+    
+/* Set VAL to the number of args passed to frame described by FI.
+   Can set VAL to -1, meaning no way to tell.  */
+/* We can't tell how many args there are */
+
+#define FRAME_NUM_ARGS(val,fi) (val = -1)
+
+/* Return number of bytes at start of arglist that are not really args.  */
+
+#define FRAME_ARGS_SKIP 0
+
+
+/* Put here the code to store, into a struct frame_saved_regs,
+   the addresses of the saved registers of frame described by FRAME_INFO.
+   This includes special registers such as pc and fp saved in special
+   ways in the stack frame.  sp is even more special:
+   the address we return for it IS the sp for the next frame.  */
+
+#define FRAME_FIND_SAVED_REGS(frame_info, frame_saved_regs)	    \
+   d30v_frame_find_saved_regs(frame_info, &(frame_saved_regs))
+
+extern void d30v_frame_find_saved_regs PARAMS ((struct frame_info *, struct frame_saved_regs *));
+
+#define NAMES_HAVE_UNDERSCORE
+      
+/* 
+DUMMY FRAMES.  Need these to support inferior function calls.  They work
+like this on D30V:  First we set a breakpoint at 0 or __start.  Then we push
+all the registers onto the stack.  Then put the function arguments in the proper
+registers and set r13 to our breakpoint address.  Finally call the function directly.
+When it hits the breakpoint, clear the break point and pop the old register contents
+off the stack.
+*/
+
+#define CALL_DUMMY		{ }  
+#define PUSH_DUMMY_FRAME
+#define CALL_DUMMY_START_OFFSET	0	
+#define CALL_DUMMY_LOCATION	AT_ENTRY_POINT
+#define CALL_DUMMY_BREAKPOINT_OFFSET (0)
+
+extern CORE_ADDR d30v_call_dummy_address PARAMS ((void));
+#define CALL_DUMMY_ADDRESS() d30v_call_dummy_address()
+
+#define FIX_CALL_DUMMY(dummyname, pc, fun, nargs, args, type, gcc_p) \
+sp = d30v_fix_call_dummy (dummyname, pc, fun, nargs, args, type, gcc_p)
+
+#define PC_IN_CALL_DUMMY(pc, sp, frame_address)	( pc == IMEM_START + 4 )
+
+extern CORE_ADDR d30v_fix_call_dummy PARAMS ((char *, CORE_ADDR, CORE_ADDR,
+					   int, struct value **,
+					   struct type *, int));
+#define PUSH_ARGUMENTS(nargs, args, sp, struct_return, struct_addr) \
+    sp = d30v_push_arguments((nargs), (args), (sp), (struct_return), (struct_addr))
+extern CORE_ADDR d30v_push_arguments PARAMS ((int, struct value **, CORE_ADDR, int, CORE_ADDR));
+
+
+/* Extract from an array REGBUF containing the (raw) register state
+   a function return value of type TYPE, and copy that, in virtual format,
+   into VALBUF.  */
+
+#define EXTRACT_RETURN_VALUE(TYPE,REGBUF,VALBUF) \
+d30v_extract_return_value(TYPE, REGBUF, VALBUF)
+  extern void
+d30v_extract_return_value PARAMS ((struct type *, char *, char *));
+
+
+/* Discard from the stack the innermost frame,
+   restoring all saved registers.  */
+#define POP_FRAME d30v_pop_frame();
+extern void d30v_pop_frame PARAMS((void));
+
+#define REGISTER_SIZE 4
+
+/* Need to handle SP special, as we need to select between spu and spi.  */
+
+#define TARGET_READ_SP() ((read_register (PSW_REGNUM) & PSW_SM) \
+			  ? read_register (SPU_REGNUM) \
+			  : read_register (SPI_REGNUM))
+
+#define TARGET_WRITE_SP(val) ((read_register (PSW_REGNUM) & PSW_SM) \
+			  ? write_register (SPU_REGNUM, (val)) \
+			  : write_register (SPI_REGNUM, (val)))
+
+/* Turn this on to cause remote-sim.c to use sim_set/clear_breakpoint. */
+
+#define SIM_HAS_BREAKPOINTS
+
+#endif /* TM_D30V_H */
diff --git a/gdb/configure.tgt b/gdb/configure.tgt
index bc3e3cc..f5dab23 100644
--- a/gdb/configure.tgt
+++ b/gdb/configure.tgt
@@ -53,7 +53,10 @@ c1-*-*)			gdb_target=convex ;;
 c2-*-*)			gdb_target=convex ;;
 
 d10v-*-*)		gdb_target=d10v ;;
+# start-sanitize-d30v
+d30v-*-*)		gdb_target=d30v ;;
 
+# end-sanitize-d30v
 h8300-*-*)		gdb_target=h8300 ;;
 h8500-*-*)		gdb_target=h8500 ;;
 
diff --git a/gdb/d30v-tdep.c b/gdb/d30v-tdep.c
new file mode 100644
index 0000000..eb88990
--- /dev/null
+++ b/gdb/d30v-tdep.c
@@ -0,0 +1,1021 @@
+/* Target-dependent code for Mitsubishi D30V, for GDB.
+   Copyright (C) 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.  */
+
+/*  Contributed by Martin Hunt, hunt@cygnus.com */
+
+#include "defs.h"
+#include "frame.h"
+#include "obstack.h"
+#include "symtab.h"
+#include "gdbtypes.h"
+#include "gdbcmd.h"
+#include "gdbcore.h"
+#include "gdb_string.h"
+#include "value.h"
+#include "inferior.h"
+#include "dis-asm.h"  
+#include "symfile.h"
+#include "objfiles.h"
+
+void d30v_frame_find_saved_regs PARAMS ((struct frame_info *fi,
+					 struct frame_saved_regs *fsr));
+static void d30v_pop_dummy_frame PARAMS ((struct frame_info *fi));
+
+/* Discard from the stack the innermost frame, restoring all saved
+   registers.  */
+
+void
+d30v_pop_frame ()
+{
+  struct frame_info *frame = get_current_frame ();
+  CORE_ADDR fp;
+  int regnum;
+  struct frame_saved_regs fsr;
+  char raw_buffer[8];
+
+  fp = FRAME_FP (frame);
+  if (frame->dummy)
+    {
+      d30v_pop_dummy_frame(frame);
+      return;
+    }
+
+  /* fill out fsr with the address of where each */
+  /* register was stored in the frame */
+  get_frame_saved_regs (frame, &fsr);
+  
+  /* now update the current registers with the old values */
+  for (regnum = A0_REGNUM; regnum < A0_REGNUM+2 ; regnum++)
+    {
+      if (fsr.regs[regnum])
+	{
+	  read_memory (fsr.regs[regnum], raw_buffer, 8);
+	  write_register_bytes (REGISTER_BYTE (regnum), raw_buffer, 8);
+	}
+    }
+  for (regnum = 0; regnum < SP_REGNUM; regnum++)
+    {
+      if (fsr.regs[regnum])
+	{
+	  write_register (regnum, read_memory_unsigned_integer (fsr.regs[regnum], 2));
+	}
+    }
+  if (fsr.regs[PSW_REGNUM])
+    {
+      write_register (PSW_REGNUM, read_memory_unsigned_integer (fsr.regs[PSW_REGNUM], 2));
+    }
+
+  write_register (PC_REGNUM, read_register(13));
+  write_register (SP_REGNUM, fp + frame->size);
+  target_store_registers (-1);
+  flush_cached_frames ();
+}
+
+static int 
+check_prologue (op)
+     unsigned short op;
+{
+  /* st  rn, @-sp */
+  if ((op & 0x7E1F) == 0x6C1F)
+    return 1;
+
+  /* st2w  rn, @-sp */
+  if ((op & 0x7E3F) == 0x6E1F)
+    return 1;
+
+  /* subi  sp, n */
+  if ((op & 0x7FE1) == 0x01E1)
+    return 1;
+
+  /* mv  r11, sp */
+  if (op == 0x417E)
+    return 1;
+
+  /* nop */
+  if (op == 0x5E00)
+    return 1;
+
+  /* st  rn, @sp */
+  if ((op & 0x7E1F) == 0x681E)
+    return 1;
+
+  /* st2w  rn, @sp */
+ if ((op & 0x7E3F) == 0x3A1E)
+   return 1;
+
+  return 0;
+}
+
+CORE_ADDR
+d30v_skip_prologue (pc)
+     CORE_ADDR pc;
+{
+  unsigned long op;
+  unsigned short op1, op2;
+  CORE_ADDR func_addr, func_end;
+  struct symtab_and_line sal;
+
+  /* If we have line debugging information, then the end of the */
+  /* prologue should the first assembly instruction of  the first source line */
+  if (find_pc_partial_function (pc, NULL, &func_addr, &func_end))
+    {
+      sal = find_pc_line (func_addr, 0);
+      if ( sal.end && sal.end < func_end)
+	return sal.end;
+    }
+  
+  if (target_read_memory (pc, (char *)&op, 4))
+    return pc;			/* Can't access it -- assume no prologue. */
+
+  while (1)
+    {
+      op = (unsigned long)read_memory_integer (pc, 4);
+      if ((op & 0xC0000000) == 0xC0000000)
+	{
+	  /* long instruction */
+	  if ( ((op & 0x3FFF0000) != 0x01FF0000) &&   /* add3 sp,sp,n */
+	       ((op & 0x3F0F0000) != 0x340F0000) &&   /* st  rn, @(offset,sp) */
+ 	       ((op & 0x3F1F0000) != 0x350F0000))     /* st2w  rn, @(offset,sp) */
+	    break;
+	}
+      else
+	{
+	  /* short instructions */
+	  if ((op & 0xC0000000) == 0x80000000)
+	    {
+	      op2 = (op & 0x3FFF8000) >> 15;
+	      op1 = op & 0x7FFF;
+	    } 
+	  else 
+	    {
+	      op1 = (op & 0x3FFF8000) >> 15;
+	      op2 = op & 0x7FFF;
+	    }
+	  if (check_prologue(op1))
+	    {
+	      if (!check_prologue(op2))
+		{
+		  /* if the previous opcode was really part of the prologue */
+		  /* and not just a NOP, then we want to break after both instructions */
+		  if (op1 != 0x5E00)
+		    pc += 4;
+		  break;
+		}
+	    }
+	  else
+	    break;
+	}
+      pc += 4;
+    }
+  return pc;
+}
+
+/* Given a GDB frame, determine the address of the calling function's frame.
+   This will be used to create a new GDB frame struct, and then
+   INIT_EXTRA_FRAME_INFO and INIT_FRAME_PC will be called for the new frame.
+*/
+
+CORE_ADDR
+d30v_frame_chain (frame)
+     struct frame_info *frame;
+{
+  struct frame_saved_regs fsr;
+
+  d30v_frame_find_saved_regs (frame, &fsr);
+
+  if (frame->return_pc == IMEM_START)
+    return (CORE_ADDR)0;
+
+  if (!fsr.regs[FP_REGNUM])
+    {
+      if (!fsr.regs[SP_REGNUM] || fsr.regs[SP_REGNUM] == STACK_START)
+	return (CORE_ADDR)0;
+      
+      return fsr.regs[SP_REGNUM];
+    }
+
+  if (!read_memory_unsigned_integer(fsr.regs[FP_REGNUM],2))
+    return (CORE_ADDR)0;
+
+  return read_memory_unsigned_integer(fsr.regs[FP_REGNUM],2)| DMEM_START;
+}  
+
+static int next_addr, uses_frame;
+
+static int 
+prologue_find_regs (op, fsr, addr)
+     unsigned short op;
+     struct frame_saved_regs *fsr;
+     CORE_ADDR addr;
+{
+  int n;
+
+  /* st  rn, @-sp */
+  if ((op & 0x7E1F) == 0x6C1F)
+    {
+      n = (op & 0x1E0) >> 5;
+      next_addr -= 2;
+      fsr->regs[n] = next_addr;
+      return 1;
+    }
+
+  /* st2w  rn, @-sp */
+  else if ((op & 0x7E3F) == 0x6E1F)
+    {
+      n = (op & 0x1E0) >> 5;
+      next_addr -= 4;
+      fsr->regs[n] = next_addr;
+      fsr->regs[n+1] = next_addr+2;
+      return 1;
+    }
+
+  /* subi  sp, n */
+  if ((op & 0x7FE1) == 0x01E1)
+    {
+      n = (op & 0x1E) >> 1;
+      if (n == 0)
+	n = 16;
+      next_addr -= n;
+      return 1;
+    }
+
+  /* mv  r11, sp */
+  if (op == 0x417E)
+    {
+      uses_frame = 1;
+      return 1;
+    }
+
+  /* nop */
+  if (op == 0x5E00)
+    return 1;
+
+  /* st  rn, @sp */
+  if ((op & 0x7E1F) == 0x681E)
+    {
+      n = (op & 0x1E0) >> 5;
+      fsr->regs[n] = next_addr;
+      return 1;
+    }
+
+  /* st2w  rn, @sp */
+  if ((op & 0x7E3F) == 0x3A1E)
+    {
+      n = (op & 0x1E0) >> 5;
+      fsr->regs[n] = next_addr;
+      fsr->regs[n+1] = next_addr+2;
+      return 1;
+    }
+
+  return 0;
+}
+
+/* Put here the code to store, into a struct frame_saved_regs, the
+   addresses of the saved registers of frame described by FRAME_INFO.
+   This includes special registers such as pc and fp saved in special
+   ways in the stack frame.  sp is even more special: the address we
+   return for it IS the sp for the next frame. */
+void
+d30v_frame_find_saved_regs (fi, fsr)
+     struct frame_info *fi;
+     struct frame_saved_regs *fsr;
+{
+  CORE_ADDR fp, pc;
+  unsigned long op;
+  unsigned short op1, op2;
+  int i;
+
+  fp = fi->frame;
+  memset (fsr, 0, sizeof (*fsr));
+  next_addr = 0;
+
+  pc = get_pc_function_start (fi->pc);
+
+  uses_frame = 0;
+  while (1)
+    {
+      op = (unsigned long)read_memory_integer (pc, 4);
+      if ((op & 0xC0000000) == 0xC0000000)
+	{
+	  /* long instruction */
+	  if ((op & 0x3FFF0000) == 0x01FF0000)
+	    {
+	      /* add3 sp,sp,n */
+	      short n = op & 0xFFFF;
+	      next_addr += n;
+	    }
+	  else if ((op & 0x3F0F0000) == 0x340F0000)
+	    {
+	      /* st  rn, @(offset,sp) */
+	      short offset = op & 0xFFFF;
+	      short n = (op >> 20) & 0xF;
+	      fsr->regs[n] = next_addr + offset;
+	    }
+	  else if ((op & 0x3F1F0000) == 0x350F0000)
+	    {
+	      /* st2w  rn, @(offset,sp) */
+	      short offset = op & 0xFFFF;
+	      short n = (op >> 20) & 0xF;
+	      fsr->regs[n] = next_addr + offset;
+	      fsr->regs[n+1] = next_addr + offset + 2;
+	    }
+	  else
+	    break;
+	}
+      else
+	{
+	  /* short instructions */
+	  if ((op & 0xC0000000) == 0x80000000)
+	    {
+	      op2 = (op & 0x3FFF8000) >> 15;
+	      op1 = op & 0x7FFF;
+	    } 
+	  else 
+	    {
+	      op1 = (op & 0x3FFF8000) >> 15;
+	      op2 = op & 0x7FFF;
+	    }
+	  if (!prologue_find_regs(op1,fsr,pc) || !prologue_find_regs(op2,fsr,pc))
+	    break;
+	}
+      pc += 4;
+    }
+  
+  fi->size = -next_addr;
+
+  if (!(fp & 0xffff))
+    fp = read_register(SP_REGNUM) | DMEM_START;
+
+  for (i=0; i<NUM_REGS-1; i++)
+    if (fsr->regs[i])
+      {
+	fsr->regs[i] = fp - (next_addr - fsr->regs[i]); 
+      }
+
+  if (fsr->regs[LR_REGNUM])
+    fi->return_pc = ((read_memory_unsigned_integer(fsr->regs[LR_REGNUM],2) - 1) << 2) | IMEM_START;
+  else
+    fi->return_pc = ((read_register(LR_REGNUM) - 1) << 2) | IMEM_START;
+  
+  /* th SP is not normally (ever?) saved, but check anyway */
+  if (!fsr->regs[SP_REGNUM])
+    {
+      /* if the FP was saved, that means the current FP is valid, */
+      /* otherwise, it isn't being used, so we use the SP instead */
+      if (uses_frame)
+	fsr->regs[SP_REGNUM] = read_register(FP_REGNUM) + fi->size;
+      else
+	{
+	  fsr->regs[SP_REGNUM] = fp + fi->size;
+	  fi->frameless = 1;
+	  fsr->regs[FP_REGNUM] = 0;
+	}
+    }
+}
+
+void
+d30v_init_extra_frame_info (fromleaf, fi)
+     int fromleaf;
+     struct frame_info *fi;
+{
+  struct frame_saved_regs dummy;
+
+  if (fi->next && ((fi->pc & 0xffff) == 0)) 
+    fi->pc = fi->next->return_pc; 
+
+  d30v_frame_find_saved_regs (fi, &dummy);
+}
+
+static void d30v_print_register PARAMS ((int regnum, int tabular));
+
+static void
+d30v_print_register (regnum, tabular)
+     int regnum;
+     int tabular;
+{
+  if (regnum < A0_REGNUM)
+    {
+      if (tabular)
+	printf_filtered ("%08x", read_register (regnum));
+      else
+	printf_filtered ("0x%x	%d", read_register (regnum),
+			 read_register (regnum));
+    }
+  else
+    {
+      char regbuf[MAX_REGISTER_RAW_SIZE];
+
+      read_relative_register_raw_bytes (regnum, regbuf);
+
+      val_print (REGISTER_VIRTUAL_TYPE (regnum), regbuf, 0,
+		 gdb_stdout, 'x', 1, 0, Val_pretty_default);
+
+      if (!tabular)
+	{
+	  printf_filtered ("	");
+	  val_print (REGISTER_VIRTUAL_TYPE (regnum), regbuf, 0,
+		 gdb_stdout, 'd', 1, 0, Val_pretty_default);
+	}
+    }
+}
+
+void
+d30v_do_registers_info (regnum, fpregs)
+     int regnum;
+     int fpregs;
+{
+  long long num1, num2;
+
+  if (regnum != -1)
+    {
+      if (reg_names[0] == NULL || reg_names[0][0] == '\000')
+	return;
+
+      printf_filtered ("%s ", reg_names[regnum]);
+      d30v_print_register (regnum, 0);
+
+      printf_filtered ("\n");
+      return;
+    }
+
+  /* Have to print all the registers.  Format them nicely.  */
+
+  printf_filtered ("PC=");
+  print_address (read_pc (), gdb_stdout);
+
+  printf_filtered (" PSW=");
+  d30v_print_register (PSW_REGNUM, 1);
+
+  printf_filtered (" BPC=");
+  print_address (read_register (BPC_REGNUM), gdb_stdout);
+
+  printf_filtered (" BPSW=");
+  d30v_print_register (BPSW_REGNUM, 1);
+  printf_filtered ("\n");
+
+  printf_filtered ("DPC=");
+  print_address (read_register (DPC_REGNUM), gdb_stdout);
+
+  printf_filtered (" DPSW=");
+  d30v_print_register (DPSW_REGNUM, 1);
+
+  printf_filtered (" IBA=");
+  print_address (read_register (IBA_REGNUM), gdb_stdout);
+  printf_filtered ("\n");
+
+  printf_filtered ("RPT_C=");
+  d30v_print_register (RPT_C_REGNUM, 1);
+
+  printf_filtered (" RPT_S=");
+  print_address (read_register (RPT_S_REGNUM), gdb_stdout);
+
+  printf_filtered (" RPT_E=");
+  print_address (read_register (RPT_E_REGNUM), gdb_stdout);
+  printf_filtered ("\n");
+
+  printf_filtered ("MOD_S=");
+  print_address (read_register (MOD_S_REGNUM), gdb_stdout);
+
+  printf_filtered (" MOD_E=");
+  print_address (read_register (MOD_E_REGNUM), gdb_stdout);
+  printf_filtered ("\n");
+
+  printf_filtered ("EIT_VB=");
+  print_address (read_register (EIT_VB_REGNUM), gdb_stdout);
+
+  printf_filtered (" INT_S=");
+  d30v_print_register (INT_S_REGNUM, 1);
+
+  printf_filtered (" INT_M=");
+  d30v_print_register (INT_M_REGNUM, 1);
+  printf_filtered ("\n");
+
+  for (regnum = 0; regnum <= 63;)
+    {
+      int i;
+
+      printf_filtered ("R%d-R%d ", regnum, regnum + 7);
+      if (regnum < 10)
+	printf_filtered (" ");
+      if (regnum + 7 < 10)
+	printf_filtered (" ");
+
+      for (i = 0; i < 8; i++)
+	{
+	  printf_filtered (" ");
+	  d30v_print_register (regnum++, 1);
+	}
+
+      printf_filtered ("\n");
+    }
+
+  printf_filtered ("A0-A1    ");
+
+  d30v_print_register (A0_REGNUM, 1);
+  printf_filtered ("    ");
+  d30v_print_register (A1_REGNUM, 1);
+  printf_filtered ("\n");
+}
+
+CORE_ADDR
+d30v_fix_call_dummy (dummyname, start_sp, fun, nargs, args, type, gcc_p)
+     char *dummyname;
+     CORE_ADDR start_sp;
+     CORE_ADDR fun;
+     int nargs;
+     value_ptr *args;
+     struct type *type;
+     int gcc_p;
+{
+  int regnum;
+  CORE_ADDR sp;
+  char buffer[MAX_REGISTER_RAW_SIZE];
+  struct frame_info *frame = get_current_frame ();
+  frame->dummy = start_sp;
+  start_sp |= DMEM_START;
+
+  sp = start_sp;
+  for (regnum = 0; regnum < NUM_REGS; regnum++)
+    {
+      sp -= REGISTER_RAW_SIZE(regnum);
+      store_address (buffer, REGISTER_RAW_SIZE(regnum), read_register(regnum));
+      write_memory (sp, buffer, REGISTER_RAW_SIZE(regnum));
+    }
+  write_register (SP_REGNUM, (LONGEST)(sp & 0xffff)); 
+  /* now we need to load LR with the return address */
+  write_register (LR_REGNUM, (LONGEST)(d30v_call_dummy_address() & 0xffff) >> 2);  
+  return sp;
+}
+
+static void
+d30v_pop_dummy_frame (fi)
+     struct frame_info *fi;
+{
+  CORE_ADDR sp = fi->dummy;
+  int regnum;
+
+  for (regnum = 0; regnum < NUM_REGS; regnum++)
+    {
+      sp -= REGISTER_RAW_SIZE(regnum);
+      write_register(regnum, read_memory_unsigned_integer (sp, REGISTER_RAW_SIZE(regnum)));
+    }
+  flush_cached_frames (); /* needed? */
+}
+
+
+CORE_ADDR
+d30v_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 i, len, index=0, regnum=2;
+  char buffer[4], *contents;
+  LONGEST val;
+  CORE_ADDR ptrs[10];
+
+  /* Pass 1. Put all large args on stack */
+  for (i = 0; i < nargs; i++)
+    {
+      value_ptr arg = args[i];
+      struct type *arg_type = check_typedef (VALUE_TYPE (arg));
+      len = TYPE_LENGTH (arg_type);
+      contents = VALUE_CONTENTS(arg);
+      val = extract_signed_integer (contents, len);
+      if (len > 4)
+	{
+	  /* put on stack and pass pointers */
+	  sp -= len;
+	  write_memory (sp, contents, len);
+	  ptrs[index++] = sp;
+	}
+    }
+
+  index = 0;
+
+  for (i = 0; i < nargs; i++)
+    {
+      value_ptr arg = args[i];
+      struct type *arg_type = check_typedef (VALUE_TYPE (arg));
+      len = TYPE_LENGTH (arg_type);
+      contents = VALUE_CONTENTS(arg);
+      val = extract_signed_integer (contents, len);
+      if (len > 4)
+	{
+	  /* use a pointer to previously saved data */
+	  if (regnum < 6)
+	    write_register (regnum++, ptrs[index++]);
+	  else
+	    {
+	      /* no more registers available.  put it on the stack */
+	      sp -= 2;
+	      store_address (buffer, 2, ptrs[index++]);
+	      write_memory (sp, buffer, 2);
+	    }
+	}
+      else
+	{
+	  if (regnum < 6 )
+	    {
+	      if (len == 4)
+		write_register (regnum++, val>>16);
+	      write_register (regnum++, val & 0xffff);
+	    }
+	  else
+	    {
+	      sp -= len;
+	      store_address (buffer, len, val);
+	      write_memory (sp, buffer, len);
+	    }
+	}
+    }
+  return sp;
+}
+
+
+/* pick an out-of-the-way place to set the return value */
+/* for an inferior function call.  The link register is set to this  */
+/* value and a momentary breakpoint is set there.  When the breakpoint */
+/* is hit, the dummy frame is popped and the previous environment is */
+/* restored. */
+
+CORE_ADDR
+d30v_call_dummy_address ()
+{
+  CORE_ADDR entry;
+  struct minimal_symbol *sym;
+
+  entry = entry_point_address ();
+
+  if (entry != 0)
+    return entry;
+
+  sym = lookup_minimal_symbol ("_start", NULL, symfile_objfile);
+
+  if (!sym || MSYMBOL_TYPE (sym) != mst_text)
+    return 0;
+  else
+    return SYMBOL_VALUE_ADDRESS (sym);
+}
+
+/* Given a return value in `regbuf' with a type `valtype', 
+   extract and copy its value into `valbuf'.  */
+
+void
+d30v_extract_return_value (valtype, regbuf, valbuf)
+     struct type *valtype;
+     char regbuf[REGISTER_BYTES];
+     char *valbuf;
+{
+  memcpy (valbuf, regbuf + REGISTER_BYTE (2), TYPE_LENGTH (valtype));
+}
+
+/* The following code implements access to, and display of, the D30V's
+   instruction trace buffer.  The buffer consists of 64K or more
+   4-byte words of data, of which each words includes an 8-bit count,
+   an 8-bit segment number, and a 16-bit instruction address.
+
+   In theory, the trace buffer is continuously capturing instruction
+   data that the CPU presents on its "debug bus", but in practice, the
+   ROMified GDB stub only enables tracing when it continues or steps
+   the program, and stops tracing when the program stops; so it
+   actually works for GDB to read the buffer counter out of memory and
+   then read each trace word.  The counter records where the tracing
+   stops, but there is no record of where it started, so we remember
+   the PC when we resumed and then search backwards in the trace
+   buffer for a word that includes that address.  This is not perfect,
+   because you will miss trace data if the resumption PC is the target
+   of a branch.  (The value of the buffer counter is semi-random, any
+   trace data from a previous program stop is gone.)  */
+
+/* The address of the last word recorded in the trace buffer.  */
+
+#define DBBC_ADDR (0xd80000)
+
+/* The base of the trace buffer, at least for the "Board_0".  */
+
+#define TRACE_BUFFER_BASE (0xf40000)
+
+static void trace_command PARAMS ((char *, int));
+
+static void untrace_command PARAMS ((char *, int));
+
+static void trace_info PARAMS ((char *, int));
+
+static void tdisassemble_command PARAMS ((char *, int));
+
+static void display_trace PARAMS ((int, int));
+
+/* True when instruction traces are being collected.  */
+
+static int tracing;
+
+/* Remembered PC.  */
+
+static CORE_ADDR last_pc;
+
+/* True when trace output should be displayed whenever program stops.  */
+
+static int trace_display;
+
+/* True when trace listing should include source lines.  */
+
+static int default_trace_show_source = 1;
+
+struct trace_buffer {
+  int size;
+  short *counts;
+  CORE_ADDR *addrs;
+} trace_data;
+
+static void
+trace_command (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  /* Clear the host-side trace buffer, allocating space if needed.  */
+  trace_data.size = 0;
+  if (trace_data.counts == NULL)
+    trace_data.counts = (short *) xmalloc (65536 * sizeof(short));
+  if (trace_data.addrs == NULL)
+    trace_data.addrs = (CORE_ADDR *) xmalloc (65536 * sizeof(CORE_ADDR));
+
+  tracing = 1;
+
+  printf_filtered ("Tracing is now on.\n");
+}
+
+static void
+untrace_command (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  tracing = 0;
+
+  printf_filtered ("Tracing is now off.\n");
+}
+
+static void
+trace_info (args, from_tty)
+     char *args;
+     int from_tty;
+{
+  int i;
+
+  if (trace_data.size)
+    {
+      printf_filtered ("%d entries in trace buffer:\n", trace_data.size);
+
+      for (i = 0; i < trace_data.size; ++i)
+	{
+	  printf_filtered ("%d: %d instruction%s at 0x%x\n",
+			   i, trace_data.counts[i],
+			   (trace_data.counts[i] == 1 ? "" : "s"),
+			   trace_data.addrs[i]);
+	}
+    }
+  else
+    printf_filtered ("No entries in trace buffer.\n");
+
+  printf_filtered ("Tracing is currently %s.\n", (tracing ? "on" : "off"));
+}
+
+/* Print the instruction at address MEMADDR in debugged memory,
+   on STREAM.  Returns length of the instruction, in bytes.  */
+
+static int
+print_insn (memaddr, stream)
+     CORE_ADDR memaddr;
+     GDB_FILE *stream;
+{
+  /* If there's no disassembler, something is very wrong.  */
+  if (tm_print_insn == NULL)
+    abort ();
+
+  if (TARGET_BYTE_ORDER == BIG_ENDIAN)
+    tm_print_insn_info.endian = BFD_ENDIAN_BIG;
+  else
+    tm_print_insn_info.endian = BFD_ENDIAN_LITTLE;
+  return (*tm_print_insn) (memaddr, &tm_print_insn_info);
+}
+
+void
+d30v_eva_prepare_to_trace ()
+{
+  if (!tracing)
+    return;
+
+  last_pc = read_register (PC_REGNUM);
+}
+
+/* Collect trace data from the target board and format it into a form
+   more useful for display.  */
+
+void
+d30v_eva_get_trace_data ()
+{
+  int count, i, j, oldsize;
+  int trace_addr, trace_seg, trace_cnt, next_cnt;
+  unsigned int last_trace, trace_word, next_word;
+  unsigned int *tmpspace;
+
+  if (!tracing)
+    return;
+
+  tmpspace = xmalloc (65536 * sizeof(unsigned int));
+
+  last_trace = read_memory_unsigned_integer (DBBC_ADDR, 2) << 2;
+
+  /* Collect buffer contents from the target, stopping when we reach
+     the word recorded when execution resumed.  */
+
+  count = 0;
+  while (last_trace > 0)
+    {
+      QUIT;
+      trace_word =
+	read_memory_unsigned_integer (TRACE_BUFFER_BASE + last_trace, 4);
+      trace_addr = trace_word & 0xffff;
+      last_trace -= 4;
+      /* Ignore an apparently nonsensical entry.  */
+      if (trace_addr == 0xffd5)
+	continue;
+      tmpspace[count++] = trace_word;
+      if (trace_addr == last_pc)
+	break;
+      if (count > 65535)
+	break;
+    }
+
+  /* Move the data to the host-side trace buffer, adjusting counts to
+     include the last instruction executed and transforming the address
+     into something that GDB likes.  */
+
+  for (i = 0; i < count; ++i)
+    {
+      trace_word = tmpspace[i];
+      next_word = ((i == 0) ? 0 : tmpspace[i - 1]);
+      trace_addr = trace_word & 0xffff;
+      next_cnt = (next_word >> 24) & 0xff;
+      j = trace_data.size + count - i - 1;
+      trace_data.addrs[j] = (trace_addr << 2) + 0x1000000;
+      trace_data.counts[j] = next_cnt + 1;
+    }
+
+  oldsize = trace_data.size;
+  trace_data.size += count;
+
+  free (tmpspace);
+
+  if (trace_display)
+    display_trace (oldsize, trace_data.size);
+}
+
+static void
+tdisassemble_command (arg, from_tty)
+     char *arg;
+     int from_tty;
+{
+  int i, count;
+  CORE_ADDR low, high;
+  char *space_index;
+
+  if (!arg)
+    {
+      low = 0;
+      high = trace_data.size;
+    }
+  else if (!(space_index = (char *) strchr (arg, ' ')))
+    {
+      low = parse_and_eval_address (arg);
+      high = low + 5;
+    }
+  else
+    {
+      /* Two arguments.  */
+      *space_index = '\0';
+      low = parse_and_eval_address (arg);
+      high = parse_and_eval_address (space_index + 1);
+      if (high < low)
+	high = low;
+    }
+
+  printf_filtered ("Dump of trace from %d to %d:\n", low, high);
+
+  display_trace (low, high);
+
+  printf_filtered ("End of trace dump.\n");
+  gdb_flush (gdb_stdout);
+}
+
+static void
+display_trace (low, high)
+     int low, high;
+{
+  int i, count, trace_show_source, first, suppress;
+  CORE_ADDR next_address;
+
+  trace_show_source = default_trace_show_source;
+  if (!have_full_symbols () && !have_partial_symbols())
+    {
+      trace_show_source = 0;
+      printf_filtered ("No symbol table is loaded.  Use the \"file\" command.\n");
+      printf_filtered ("Trace will not display any source.\n");
+    }
+
+  first = 1;
+  suppress = 0;
+  for (i = low; i < high; ++i)
+    {
+      next_address = trace_data.addrs[i];
+      count = trace_data.counts[i]; 
+      while (count-- > 0)
+	{
+	  QUIT;
+	  if (trace_show_source)
+	    {
+	      struct symtab_and_line sal, sal_prev;
+
+	      sal_prev = find_pc_line (next_address - 4, 0);
+	      sal = find_pc_line (next_address, 0);
+
+	      if (sal.symtab)
+		{
+		  if (first || sal.line != sal_prev.line)
+		    print_source_lines (sal.symtab, sal.line, sal.line + 1, 0);
+		  suppress = 0;
+		}
+	      else
+		{
+		  if (!suppress)
+		    /* FIXME-32x64--assumes sal.pc fits in long.  */
+		    printf_filtered ("No source file for address %s.\n",
+				     local_hex_string((unsigned long) sal.pc));
+		  suppress = 1;
+		}
+	    }
+	  first = 0;
+	  print_address (next_address, gdb_stdout);
+	  printf_filtered (":");
+	  printf_filtered ("\t");
+	  wrap_here ("    ");
+	  next_address = next_address + print_insn (next_address, gdb_stdout);
+	  printf_filtered ("\n");
+	  gdb_flush (gdb_stdout);
+	}
+    }
+}
+
+extern void (*target_resume_hook) PARAMS ((void));
+extern void (*target_wait_loop_hook) PARAMS ((void));
+
+void
+_initialize_d30v_tdep ()
+{
+  tm_print_insn = print_insn_d30v;
+
+  target_resume_hook = d30v_eva_prepare_to_trace;
+  target_wait_loop_hook = d30v_eva_get_trace_data;
+
+  add_com ("trace", class_support, trace_command,
+	   "Enable tracing of instruction execution.");
+
+  add_com ("untrace", class_support, untrace_command,
+	   "Disable tracing of instruction execution.");
+
+  add_com ("tdisassemble", class_vars, tdisassemble_command,
+	   "Disassemble the trace buffer.\n\
+Two optional arguments specify a range of trace buffer entries\n\
+as reported by info trace (NOT addresses!).");
+
+  add_info ("trace", trace_info,
+	    "Display info about the trace data buffer.");
+
+  add_show_from_set (add_set_cmd ("tracedisplay", no_class,
+				  var_integer, (char *)&trace_display,
+				  "Set automatic display of trace.\n", &setlist),
+		     &showlist);
+  add_show_from_set (add_set_cmd ("tracesource", no_class,
+				  var_integer, (char *)&default_trace_show_source,
+				  "Set display of source code with trace.\n", &setlist),
+		     &showlist);
+
+} 
diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c
index 49e573f..0bdb354 100644
--- a/gdb/remote-sim.c
+++ b/gdb/remote-sim.c
@@ -810,6 +810,55 @@ gdbsim_mourn_inferior ()
   generic_mourn_inferior ();
 }
 
+static int
+gdbsim_insert_breakpoint (addr, contents_cache)
+     CORE_ADDR addr;
+     char *contents_cache;
+{
+#ifdef SIM_HAS_BREAKPOINTS
+  SIM_RC retcode;
+
+  retcode = sim_set_breakpoint (gdbsim_desc, addr);
+
+  switch (retcode)
+    {
+    case SIM_RC_OK:
+      return 0;
+    case SIM_RC_INSUFFICIENT_RESOURCES:
+      return ENOMEM;
+    default:
+      return EIO;
+    }
+#else
+  return memory_insert_breakpoint (addr, contents_cache);
+#endif
+}
+
+static int
+gdbsim_remove_breakpoint (addr, contents_cache)
+     CORE_ADDR addr;
+     char *contents_cache;
+{
+#ifdef SIM_HAS_BREAKPOINTS
+  SIM_RC retcode;
+
+  retcode = sim_clear_breakpoint (gdbsim_desc, addr);
+
+  switch (retcode)
+    {
+    case SIM_RC_OK:
+    case SIM_RC_UNKNOWN_BREAKPOINT:
+      return 0;
+    case SIM_RC_INSUFFICIENT_RESOURCES:
+      return ENOMEM;
+    default:
+      return EIO;
+    }
+#else
+  return memory_remove_breakpoint (addr, contents_cache);
+#endif
+}
+
 /* Pass the command argument through to the simulator verbatim.  The
    simulator must do any command interpretation work.  */
 
@@ -854,8 +903,8 @@ struct target_ops gdbsim_ops = {
   gdbsim_prepare_to_store,	/* to_prepare_to_store */
   gdbsim_xfer_inferior_memory,	/* to_xfer_memory */
   gdbsim_files_info,		/* to_files_info */
-  memory_insert_breakpoint,	/* to_insert_breakpoint */
-  memory_remove_breakpoint,	/* to_remove_breakpoint */
+  gdbsim_insert_breakpoint,	/* to_insert_breakpoint */
+  gdbsim_remove_breakpoint,	/* to_remove_breakpoint */
   NULL,				/* to_terminal_init */
   NULL,				/* to_terminal_inferior */
   NULL,				/* to_terminal_ours_for_output */