X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=gdb%2From68k-rom.c;h=ec49f5d7177c581a6b80ed5ecb082c3ea206994b;hb=a8cdafbd4e8dbf81a28d98de6a046bd9bc5cc097;hp=b5dfe34d1a6d18b17e07319088363b7e0a863d45;hpb=7952bce6fcd75887c2601b63ed577c80388fa185;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/rom68k-rom.c b/gdb/rom68k-rom.c index b5dfe34d1a..ec49f5d717 100644 --- a/gdb/rom68k-rom.c +++ b/gdb/rom68k-rom.c @@ -1,38 +1,113 @@ -/* Remote target glue for the rom68k ROM monitor. This was running on a -Motorola IDP board. +/* Remote target glue for the ROM68K ROM monitor. + Copyright 1988, 1991, 1992, 1993, 1994, 1995, 1998, 1999, 2000, 2001 + Free Software Foundation, Inc. - Copyright 1988, 1991, 1992, 1993, 1994 Free Software Foundation, Inc. + This file is part of GDB. -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 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. -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., 675 Mass Ave, Cambridge, MA 02139, USA. */ + 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" +#include "regcache.h" +#include "value.h" + +static void rom68k_open (char *args, int from_tty); + +/* Return true if C is a hex digit. + We can't use isxdigit here: that is affected by the current locale; + ROM68K is not. */ +static int +is_hex_digit (int c) +{ + return (('0' <= c && c <= '9') + || ('a' <= c && c <= 'f') + || ('A' <= c && c <= 'F')); +} + + +/* Convert hex digit A to a number. */ +static int +hex_digit_value (int a) +{ + if (a >= '0' && a <= '9') + return a - '0'; + else if (a >= 'a' && a <= 'f') + return a - 'a' + 10; + else if (a >= 'A' && a <= 'F') + return a - 'A' + 10; + else + error ("Invalid hex digit %d", a); +} + + +/* Return true iff C is a whitespace character. + We can't use isspace here: that is affected by the current locale; + ROM68K is not. */ +static int +is_whitespace (int c) +{ + return (c == ' ' + || c == '\r' + || c == '\n' + || c == '\t' + || c == '\f'); +} + + +/* Parse a string of hex digits starting at HEX, supply them as the + value of register REGNO, skip any whitespace, and return a pointer + to the next character. + + There is a function in monitor.c, monitor_supply_register, which is + supposed to do this job. However, there is some rather odd stuff + in there (whitespace characters don't terminate numbers, for + example) that is incorrect for ROM68k. It's basically impossible + to safely tweak monitor_supply_register --- it's used by a zillion + other monitors; who knows what behaviors they're depending on. So + instead, we'll just use our own function, which can behave exactly + the way we want it to. */ +static char * +rom68k_supply_one_register (int regno, unsigned char *hex) +{ + ULONGEST value; + unsigned char regbuf[MAX_REGISTER_RAW_SIZE]; + + value = 0; + while (*hex != '\0') + if (is_hex_digit (*hex)) + value = (value * 16) + hex_digit_value (*hex++); + else + break; + + /* Skip any whitespace. */ + while (is_whitespace (*hex)) + hex++; + + store_unsigned_integer (regbuf, REGISTER_RAW_SIZE (regno), value); + supply_register (regno, regbuf); + + return hex; +} -static void rom68k_open PARAMS ((char *args, int from_tty)); static void -rom68k_supply_register (regname, regnamelen, val, vallen) - char *regname; - int regnamelen; - char *val; - int vallen; +rom68k_supply_register (char *regname, int regnamelen, char *val, int vallen) { int numregs; int regno; @@ -74,103 +149,91 @@ rom68k_supply_register (regname, regnamelen, val, vallen) if (regno >= 0) while (numregs-- > 0) - val = monitor_supply_register (regno++, val); + val = rom68k_supply_one_register (regno++, val); } -/* - * this array of registers need to match the indexes used by GDB. The - * whole reason this exists is cause the various ROM monitors use - * different strings than GDB does, and doesn't support all the - * registers either. So, typing "info reg sp" becomes a "r30". - */ -static char *rom68k_regnames[NUM_REGS] = { +/* 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 *rom68k_regnames[NUM_REGS] = +{ "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "ISP", - "SR", "PC" }; + "SR", "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. - */ +/* 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 rom68k_ops; -static char *rom68k_loadtypes[] = {"srec", NULL}; -static char *rom68k_loadprotos[] = {"none", NULL}; +static char *rom68k_inits[] = +{".\r\r", NULL}; /* Exits pm/pr & download cmds */ -static char *rom68k_inits[] = {".\r\r", NULL}; /* Exits pm/pr & download cmds */ +static struct monitor_ops rom68k_cmds; -static struct monitor_ops rom68k_cmds = +static void +init_rom68k_cmds (void) { - 0, /* flags */ - rom68k_inits, /* monitor init string */ - "go\r", /* continue command */ - "st\r", /* single step */ - NULL, /* No way to interrupt program */ - "db %x\r", /* set a breakpoint */ - "cb %x\r", /* clear a breakpoint */ - "cb *\r", /* clear all breakpoints */ - "fm %x %x %x\r", /* fill (start len val) */ - { - "pm %x %x\r", /* setmem.cmdb (addr, value) */ - "pm.w %x %x\r", /* setmem.cmdw (addr, value) */ - "pm.l %x %x\r", /* setmem.cmdl (addr, value) */ - NULL, /* setmem.cmdll (addr, value) */ - NULL, /* setreg.resp_delim */ - NULL, /* setreg.term */ - NULL, /* setreg.term_cmd */ - }, - { - "dm %x %x\r", /* getmem.cmdb (addr, len) */ - "dm.w %x %x\r", /* getmem.cmdw (addr, len) */ - "dm.l %x %x\r", /* getmem.cmdl (addr, len) */ - NULL, /* getmem.cmdll (addr, len) */ - " ", /* getmem.resp_delim */ - NULL, /* getmem.term */ - NULL, /* getmem.term_cmd */ - }, - { - "pr %s %x\r", /* setreg.cmd (name, value) */ - NULL, /* setreg.resp_delim */ - NULL, /* setreg.term */ - NULL /* setreg.term_cmd */ - }, - { - "pr %s\r", /* getreg.cmd (name) */ - ": ", /* getreg.resp_delim */ - "= ", /* getreg.term */ - ".\r" /* getreg.term_cmd */ - }, - "dr\r", /* dump_registers */ - /* register_pattern */ - "\\(\\w+\\)=\\([0-9a-fA-F]+\\( +[0-9a-fA-F]+\\b\\)*\\)", - rom68k_supply_register, /* supply_register */ - "dc\r", /* download command */ - "Waiting for S-records from host... ", /* Load response */ - "ROM68K :->", /* monitor command prompt */ - "=", /* end-of-command delimitor */ - ".\r", /* optional command terminator */ - &rom68k_ops, /* target operations */ - rom68k_loadtypes, /* loadtypes */ - rom68k_loadprotos, /* loadprotos */ - "9600", /* supported baud rates */ - SERIAL_1_STOPBITS, /* number of stop bits */ - rom68k_regnames, /* registers names */ - MONITOR_OPS_MAGIC /* magic */ - }; + rom68k_cmds.flags = MO_PRINT_PROGRAM_OUTPUT; + rom68k_cmds.init = rom68k_inits; /* monitor init string */ + rom68k_cmds.cont = "go\r"; + rom68k_cmds.step = "st\r"; + rom68k_cmds.stop = NULL; + rom68k_cmds.set_break = "db %x\r"; + rom68k_cmds.clr_break = "cb %x\r"; + rom68k_cmds.clr_all_break = "cb *\r"; + rom68k_cmds.fill = "fm %x %x %x\r"; + rom68k_cmds.setmem.cmdb = "pm %x %x\r"; + rom68k_cmds.setmem.cmdw = "pm.w %x %x\r"; + rom68k_cmds.setmem.cmdl = "pm.l %x %x\r"; + rom68k_cmds.setmem.cmdll = NULL; + rom68k_cmds.setmem.resp_delim = NULL; + rom68k_cmds.setmem.term = NULL; + rom68k_cmds.setmem.term_cmd = NULL; + rom68k_cmds.getmem.cmdb = "dm %x %x\r"; + rom68k_cmds.getmem.cmdw = "dm.w %x %x\r"; + rom68k_cmds.getmem.cmdl = "dm.l %x %x\r"; + rom68k_cmds.getmem.cmdll = NULL; + rom68k_cmds.getmem.resp_delim = " "; + rom68k_cmds.getmem.term = NULL; + rom68k_cmds.getmem.term_cmd = NULL; + rom68k_cmds.setreg.cmd = "pr %s %x\r"; + rom68k_cmds.setreg.resp_delim = NULL; + rom68k_cmds.setreg.term = NULL; + rom68k_cmds.setreg.term_cmd = NULL; + rom68k_cmds.getreg.cmd = "pr %s\r"; + rom68k_cmds.getreg.resp_delim = ": "; + rom68k_cmds.getreg.term = "= "; + rom68k_cmds.getreg.term_cmd = ".\r"; + rom68k_cmds.dump_registers = "dr\r"; + rom68k_cmds.register_pattern = + "\\(\\w+\\)=\\([0-9a-fA-F]+\\( +[0-9a-fA-F]+\\b\\)*\\)"; + rom68k_cmds.supply_register = rom68k_supply_register; + rom68k_cmds.load_routine = NULL; + rom68k_cmds.load = "dc\r"; + rom68k_cmds.loadresp = "Waiting for S-records from host... "; + rom68k_cmds.prompt = "ROM68K :-> "; + rom68k_cmds.line_term = "\r"; + rom68k_cmds.cmd_end = ".\r"; + rom68k_cmds.target = &rom68k_ops; + rom68k_cmds.stopbits = SERIAL_1_STOPBITS; + rom68k_cmds.regnames = rom68k_regnames; + rom68k_cmds.magic = MONITOR_OPS_MAGIC; +} /* init_rom68k_cmds */ -void -rom68k_open(args, from_tty) - char *args; - int from_tty; +static void +rom68k_open (char *args, int from_tty) { monitor_open (args, &rom68k_cmds, from_tty); } void -_initialize_rom68k () +_initialize_rom68k (void) { + init_rom68k_cmds (); init_monitor_ops (&rom68k_ops); rom68k_ops.to_shortname = "rom68k"; @@ -180,7 +243,4 @@ Specify the serial device it is connected to (e.g. /dev/ttya)."; rom68k_ops.to_open = rom68k_open; add_target (&rom68k_ops); - - /* this is the default, since it's the only baud rate supported by the hardware */ - baud_rate = 9600; }