X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fmonitor.h;h=84ad95eaee56ddf0e13be49fc749f32753a38652;hb=cc7ef3c3063a4e6bd6799d418b1bfbd37bc5d927;hp=93e104f15e72433b5c77c27eef9ac9cb40131a1d;hpb=1265e2d82361cdf254aade96eb9840d81a36a8fd;p=deliverable%2Fbinutils-gdb.git diff --git a/gdb/monitor.h b/gdb/monitor.h index 93e104f15e..84ad95eaee 100644 --- a/gdb/monitor.h +++ b/gdb/monitor.h @@ -19,14 +19,10 @@ * * 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. + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -struct rom_cmd_data { - char *cmd; /* command to send */ - char *delim; /* the delimiter */ - char *result; /* the result */ -}; +#include "serial.h" /* This structure describes the strings necessary to give small command sequences to the monitor, and parse the response. @@ -56,50 +52,86 @@ struct rom_cmd_data { ignored if TERM is NULL. */ -struct cmd_resp { - char *cmd; /* Command to send */ +struct memrw_cmd +{ + char *cmdb; /* Command to send for byte read/write */ + char *cmdw; /* Command for word (16 bit) read/write */ + char *cmdl; /* Command for long (32 bit) read/write */ + char *cmdll; /* Command for long long (64 bit) read/write */ char *resp_delim; /* String just prior to the desired value */ char *term; /* Terminating string to search for */ char *term_cmd; /* String to get out of sub-mode (if necessary) */ }; -struct monitor_ops { - int type; /* 1 is ascii, 0 is GDB remote protocol */ - char *init; /* initialize to the monitor */ - char *execute; /* execute or usually GO command */ - char *resume; /* continue command */ - char *step; /* single step */ - char *set_break; /* set a breakpoint */ - char *clr_break; /* clear a breakpoint */ - int clr_type; /* number or address for clearing */ - struct cmd_resp setmem; /* set memory to a value */ - struct cmd_resp getmem; /* display memory */ - struct cmd_resp setreg; /* set a register */ - struct cmd_resp getreg; /* get a register */ - char *load; /* load command */ - char *prompt; /* monitor command prompt */ - char *cmd_delim; /* end-of-command delimitor */ - char *cmd_end; /* optional command terminator */ +struct regrw_cmd +{ + char *cmd; /* Command to send for reg read/write */ + char *resp_delim; /* String (actually a regexp if getmem) just + prior to the desired value */ + char *term; /* Terminating string to search for */ + char *term_cmd; /* String to get out of sub-mode (if necessary) */ +}; + +struct monitor_ops +{ + int flags; /* See below */ + char **init; /* List of init commands. NULL terminated. */ + char *cont; /* continue command */ + char *step; /* single step */ + char *stop; /* Interrupt program string */ + char *set_break; /* set a breakpoint */ + char *clr_break; /* clear a breakpoint */ + char *clr_all_break; /* Clear all breakpoints */ + char *fill; /* Memory fill cmd (addr len val) */ + struct memrw_cmd setmem; /* set memory to a value */ + struct memrw_cmd getmem; /* display memory */ + struct regrw_cmd setreg; /* set a register */ + struct regrw_cmd getreg; /* get a register */ + /* Some commands can dump a bunch of registers + at once. This comes as a set of REG=VAL + pairs. This should be called for each pair + of registers that we can parse to supply + GDB with the value of a register. */ + char *dump_registers; /* Command to dump all regs at once */ + char *register_pattern; /* Pattern that picks out register from reg dump */ + void (*supply_register) PARAMS ((char *name, int namelen, char *val, int vallen)); + void (*load_routine) PARAMS ((serial_t desc, char *file, int hashmark)); /* Download routine */ + char *load; /* load command */ + char *loadresp; /* Response to load command */ + char *prompt; /* monitor command prompt */ + char *line_term; /* end-of-command delimitor */ + char *cmd_end; /* optional command terminator */ struct target_ops *target; /* target operations */ - char **loadtypes; /* the load types that are supported */ - char **loadprotos; /* the load protocols that are supported */ - char *baudrates; /* supported baud rates */ - int stopbits; /* number of stop bits */ - char **regnames; /* array of register names in ascii */ + int stopbits; /* number of stop bits */ + char **regnames; /* array of register names in ascii */ + int magic; /* Check value */ }; +#define MONITOR_OPS_MAGIC 600925 + +/* Flag defintions */ + +#define MO_CLR_BREAK_USES_ADDR 0x1 /* If set, then clear breakpoint command + uses address, otherwise it uses an index + returned by the monitor. */ +#define MO_FILL_USES_ADDR 0x2 /* If set, then memory fill command uses + STARTADDR, ENDADDR+1, VALUE as args, else it + uses STARTADDR, LENGTH, VALUE as args. */ +#define MO_NEED_REGDUMP_AFTER_CONT 0x4 /* If set, then monitor doesn't auto- + matically supply register dump when + coming back after a continue. */ +#define MO_GETMEM_NEEDS_RANGE 0x8 /* getmem needs start addr and end addr */ +#define MO_GETMEM_READ_SINGLE 0x10 /* getmem can only read one loc at a time */ + extern struct monitor_ops *current_monitor; -#define PROTO_TYPE (current_monitor->type) #define LOADTYPES (current_monitor->loadtypes) #define LOADPROTOS (current_monitor->loadprotos) #define INIT_CMD (current_monitor->init) -#define GO_CMD (current_monitor->execute) -#define CONT_CMD (current_monitor->resume) +#define CONT_CMD (current_monitor->cont) #define STEP_CMD (current_monitor->step) #define SET_BREAK_CMD (current_monitor->set_break) #define CLR_BREAK_CMD (current_monitor->clr_break) -#define CLR_BREAK_ADDR (current_monitor->clr_type) #define SET_MEM (current_monitor->setmem) #define GET_MEM (current_monitor->getmem) #define LOAD_CMD (current_monitor->load) @@ -120,24 +152,6 @@ extern struct monitor_ops *current_monitor; #define push_monitor(x) current_monitor = x; #define SREC_SIZE 160 -#define GDBPROTO ((current_monitor->type) ? 0: 1) - -extern void monitor_open PARAMS ((char *args, struct monitor_ops *ops, int from_tty)); -extern void monitor_close PARAMS ((int quitting)); -extern void monitor_detach PARAMS ((char *args, int from_tty)); -extern void monitor_resume PARAMS ((int pid, int step, enum target_signal sig)); -extern int monitor_wait PARAMS ((int pid, struct target_waitstatus *status)); -extern void monitor_fetch_registers PARAMS ((int regno)); -extern void monitor_store_registers PARAMS ((int regno)); -extern void monitor_prepare_to_store(); -extern int monitor_xfer_memory PARAMS ((CORE_ADDR memaddr, char *myaddr, int len, int write, struct target_ops *target)); -extern void monitor_files_info(); -extern int monitor_insert_breakpoint(); -extern int monitor_remove_breakpoint(); -extern void monitor_kill(); -extern void monitor_load(); -extern void monitor_create_inferior(); -extern void monitor_mourn_inferior(); /* * FIXME: These are to temporarily maintain compatability with the @@ -148,3 +162,13 @@ extern void monitor_mourn_inferior(); #define MEM_SET_CMD (current_monitor->setmem) #define MEM_DIS_CMD (current_monitor->getmem) #define REG_DELIM (current_monitor->regset.delim) + +extern void monitor_open PARAMS ((char *args, struct monitor_ops *ops, int from_tty)); +extern char *monitor_supply_register PARAMS ((int regno, char *valstr)); +extern int monitor_expect PARAMS ((char *prompt, char *buf, int buflen)); +extern int monitor_expect_prompt PARAMS ((char *buf, int buflen)); +extern void monitor_printf PARAMS ((char *, ...)) + ATTR_FORMAT(printf, 1, 2); +extern void monitor_printf_noecho PARAMS ((char *, ...)) + ATTR_FORMAT(printf, 1, 2); +extern void init_monitor_ops PARAMS ((struct target_ops *));