aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gdb/.Sanitize1
-rw-r--r--gdb/ChangeLog8
-rw-r--r--gdb/Makefile.in7
-rw-r--r--gdb/config/sh/sh.mt2
-rw-r--r--gdb/config/sh/tm-sh.h1
-rw-r--r--gdb/monitor.h6
-rw-r--r--gdb/sh3-rom.c201
7 files changed, 219 insertions, 7 deletions
diff --git a/gdb/.Sanitize b/gdb/.Sanitize
index d8e70f7..5b40e9f 100644
--- a/gdb/.Sanitize
+++ b/gdb/.Sanitize
@@ -299,6 +299,7 @@ ser-unix.c
serial.c
serial.h
sh-tdep.c
+sh3-rom.c
signals.h
solib.c
solib.h
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 5b23373..4735333 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,13 @@
Mon Oct 16 11:27:06 1995 Stu Grossman (grossman@cygnus.com)
+ * Makefile.in sh3-rom.c config/sh/sh.mt config/sh/tm-sh.h: Add
+ sh3 monitor support.
+ * monitor.c: Cleanup regexp compilation stuff to make it easier
+ to use several regexps.
+ * monitor.h: Get rid of struct rom_cmd_data. It's no longer used.
+ * config/m68k/tm-monitor.h: Don't redefine NUM_REGS here. It just
+ causes GDB to crash.
+
* sparcl-tdep.c: Cleanup serial error handling.
Sun Oct 15 16:19:27 1995 Stan Shebs <shebs@andros.cygnus.com>
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 99833db..d8d13ef 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -931,6 +931,7 @@ ALLDEPFILES = 29k-share/udi/udip2soc.c 29k-share/udi/udr.c \
tahoe-tdep.c ultra3-nat.c ultra3-xdep.c umax-xdep.c \
vax-tdep.c \
vx-share/xdr_ld.c vx-share/xdr_ptrace.c vx-share/xdr_rdb.c \
+ win32-nat.c \
xcoffread.c xcoffsolib.c z8k-tdep.c
ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt config/a29k/vx29k.mt\
@@ -953,6 +954,7 @@ ALLCONFIG = config/a29k/a29k-kern.mt config/a29k/a29k-udi.mt config/a29k/vx29k.m
config/i386/ncr3000.mh config/i386/ncr3000.mt config/i386/ptx.mh \
config/i386/sun386.mh \
config/i386/sun386.mt config/i386/symmetry.mh config/i386/symmetry.mt \
+ config/i386/win32.mh config/i386/win32.mt \
config/i960/nindy960.mt config/i960/vxworks960.mt config/m68k/3b1.mh \
config/m68k/3b1.mt config/m68k/altos.mh config/m68k/altos.mt \
config/m68k/amix.mh config/m68k/amix.mt config/m68k/apollo68b.mh \
@@ -1414,6 +1416,9 @@ sh-tdep.o: sh-tdep.c $(bfd_h) $(dis-asm_h) \
$(srcdir)/../opcodes/sh-opc.h $(defs_h) $(expression_h) $(frame_h) \
$(gdbcmd_h) $(gdbtypes_h) $(symtab_h) $(value_h)
+sh3-rom.o: sh3-rom.c monitor.h $(bfd_h) $(wait_h) $(defs_h) $(gdbcmd_h) \
+ $(inferior_h) target.h serial.h terminal.h
+
solib.o: solib.c $(command_h) $(defs_h) $(gdbcore_h) $(inferior_h) \
objfiles.h regex.h symfile.h target.h
@@ -1487,6 +1492,8 @@ vax-tdep.o: vax-tdep.c $(OP_INCLUDE)/vax.h $(defs_h) $(symtab_h)
w65-tdep.o : w65-tdep.c
+win32-nat.o: win32-nat.c $(gdbcmd_h) $(gdbcore_h) $(inferior_h) $(defs_h)
+
xdr_ld.o: vx-share/xdr_ld.c $(defs_h) vx-share/vxTypes.h \
vx-share/vxWorks.h vx-share/xdr_ld.h
$(CC) -c $(INTERNAL_CFLAGS) $(srcdir)/vx-share/xdr_ld.c
diff --git a/gdb/config/sh/sh.mt b/gdb/config/sh/sh.mt
index b4a4a8b..6182b87 100644
--- a/gdb/config/sh/sh.mt
+++ b/gdb/config/sh/sh.mt
@@ -1,5 +1,5 @@
# Target: Hitachi Super-H with ICE and simulator
-TDEPFILES= sh-tdep.o remote-e7000.o ser-e7kpc.o
+TDEPFILES= sh-tdep.o monitor.o sh3-rom.o remote-e7000.o ser-e7kpc.o
TM_FILE= tm-sh.h
SIM_OBS = remote-sim.o
diff --git a/gdb/config/sh/tm-sh.h b/gdb/config/sh/tm-sh.h
index c49ecbe..d47cb2e 100644
--- a/gdb/config/sh/tm-sh.h
+++ b/gdb/config/sh/tm-sh.h
@@ -117,6 +117,7 @@ extern CORE_ADDR sh_skip_prologue ();
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 14
#define SP_REGNUM 15
#define PC_REGNUM 16
diff --git a/gdb/monitor.h b/gdb/monitor.h
index 13af0bef..3d727a3 100644
--- a/gdb/monitor.h
+++ b/gdb/monitor.h
@@ -24,12 +24,6 @@
#include "serial.h"
-struct rom_cmd_data {
- char *cmd; /* command to send */
- char *delim; /* the delimiter */
- char *result; /* the result */
-};
-
/* This structure describes the strings necessary to give small command
sequences to the monitor, and parse the response.
diff --git a/gdb/sh3-rom.c b/gdb/sh3-rom.c
new file mode 100644
index 0000000..2fc3ae1
--- /dev/null
+++ b/gdb/sh3-rom.c
@@ -0,0 +1,201 @@
+/* Remote target glue for the Hitachi SH-3 ROM monitor.
+ Copyright 1995 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 "gdbcore.h"
+#include "target.h"
+#include "monitor.h"
+#include "serial.h"
+
+static void sh3_open PARAMS ((char *args, int from_tty));
+
+static void
+sh3_supply_register (regname, regnamelen, val, vallen)
+ char *regname;
+ int regnamelen;
+ char *val;
+ int vallen;
+{
+ int numregs;
+ int regno;
+
+ numregs = 1;
+ regno = -1;
+
+ if (regnamelen == 2)
+ switch (regname[0])
+ {
+ case 'S':
+ if (regname[1] == 'R')
+ regno = SR_REGNUM;
+ break;
+ case 'P':
+ if (regname[1] == 'C')
+ regno = PC_REGNUM;
+ else if (regname[1] == 'R')
+ regno = PR_REGNUM;
+ break;
+ }
+ else if (regnamelen == 3)
+ switch (regname[0])
+ {
+ case 'G':
+ case 'V':
+ if (regname[1] == 'B' && regname[2] == 'R')
+ if (regname[0] == 'G')
+ regno = VBR_REGNUM;
+ else
+ regno = GBR_REGNUM;
+ break;
+#if 0
+ case 'S':
+ if (regname[1] == 'S' && regname[2] == 'R')
+ regno = SSR_REGNUM;
+ else if (regname[1] == 'P' && regname[2] == 'C')
+ regno = SPC_REGNUM;
+ break;
+#endif
+ }
+ else if (regnamelen == 4)
+ switch (regname[0])
+ {
+ case 'M':
+ if (regname[1] == 'A' && regname[2] == 'C')
+ if (regname[3] == 'H')
+ regno = MACH_REGNUM;
+ else if (regname[3] == 'L')
+ regno = MACL_REGNUM;
+ break;
+ case 'R':
+ if (regname[1] == '0' && regname[2] == '-' && regname[3] == '7')
+ {
+ regno = R0_REGNUM;
+ numregs = 8;
+ }
+ }
+ else if (regnamelen == 5)
+ if (regname[1] == '8' && regname[2] == '-' && regname[3] == '1'
+ && regname[4] =='5')
+ {
+ regno = R0_REGNUM + 8;
+ numregs = 8;
+ }
+
+ if (regno >= 0)
+ while (numregs-- > 0)
+ val = monitor_supply_register (regno++, val);
+}
+
+/* This array of registers need to match the indexes used by GDB.
+ This exists because the various ROM monitors use different strings
+ than does GDB, and don't necessarily support all the registers
+ either. So, typing "info reg sp" becomes a "r30". */
+
+static char *sh3_regnames[NUM_REGS] = {
+ "R0", "R1", "R2", "R3", "R4", "R5", "R6", "R7",
+ "R8", "R9", "R10","R11","R12","R13","R14","R15",
+ "PC", "PR", "GBR","VBR","MACH","MACL","SR",NULL,
+ NULL, NULL, NULL, NULL};
+
+/* Define the monitor command strings. Since these are passed directly
+ through to a printf style function, we may include formatting
+ strings. We also need a CR or LF on the end. */
+
+static struct target_ops sh3_ops;
+
+static char *sh3_inits[] = {"\003", NULL}; /* Exits sub-command mode & download cmds */
+
+static struct monitor_ops sh3_cmds =
+{
+ 0, /* flags */
+ sh3_inits, /* monitor init string */
+ "g\r", /* continue command */
+ "s\r", /* single step */
+ "\003", /* Interrupt program */
+ "b %x\r", /* set a breakpoint */
+ "b -%x\r", /* clear a breakpoint */
+ "b -\r", /* clear all breakpoints */
+ "f %x @%x %x\r", /* fill (start len val) */
+ {
+ "m %x %x\r", /* setmem.cmdb (addr, value) */
+ "m %x %x;w\r", /* setmem.cmdw (addr, value) */
+ "m %x %x;l\r", /* setmem.cmdl (addr, value) */
+ NULL, /* setmem.cmdll (addr, value) */
+ NULL, /* setreg.resp_delim */
+ NULL, /* setreg.term */
+ NULL, /* setreg.term_cmd */
+ },
+ {
+ "d %x@%x;b\r", /* getmem.cmdb (addr, len) */
+ "d %x@%x;w\r", /* getmem.cmdw (addr, len) */
+ "d %x@%x;l\r", /* getmem.cmdl (addr, len) */
+ NULL, /* getmem.cmdll (addr, len) */
+ "^[0-9A-F]+ ", /* getmem.resp_delim */
+ NULL, /* getmem.term */
+ NULL, /* getmem.term_cmd */
+ },
+ {
+ ".%s %x\r", /* setreg.cmd (name, value) */
+ NULL, /* setreg.resp_delim */
+ NULL, /* setreg.term */
+ NULL /* setreg.term_cmd */
+ },
+ {
+ ".%s\r", /* getreg.cmd (name) */
+ "=", /* getreg.resp_delim */
+ "? ", /* getreg.term */
+ ".\r" /* getreg.term_cmd */
+ },
+ "r\r", /* dump_registers */
+ /* register_pattern */
+ "\\(\\w+\\)=\\([0-9a-fA-F]+\\( +[0-9a-fA-F]+\\b\\)*\\)",
+ sh3_supply_register, /* supply_register */
+ NULL, /* load_routine (defaults to SRECs) */
+ "l\r", /* download command */
+ NULL, /* Load response */
+ "\n:", /* monitor command prompt */
+ "\r", /* end-of-line terminator */
+ ".\r", /* optional command terminator */
+ &sh3_ops, /* target operations */
+ SERIAL_1_STOPBITS, /* number of stop bits */
+ sh3_regnames, /* registers names */
+ MONITOR_OPS_MAGIC /* magic */
+};
+
+static void
+sh3_open (args, from_tty)
+ char *args;
+ int from_tty;
+{
+ monitor_open (args, &sh3_cmds, from_tty);
+}
+
+void
+_initialize_sh3 ()
+{
+ init_monitor_ops (&sh3_ops);
+
+ sh3_ops.to_shortname = "sh3";
+ sh3_ops.to_longname = "Hitachi SH-3 rom monitor";
+ sh3_ops.to_doc = "Debug on a Hitachi eval board running the SH-3 rom monitor.\n\
+Specify the serial device it is connected to (e.g. /dev/ttya).";
+ sh3_ops.to_open = sh3_open;
+
+ add_target (&sh3_ops);
+}
generated by cgit v1.1 at 2024-10-18 09:29:26 +0000