OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Garbage collect struct monitor_ops::load_routine. 

While touching monitor_load in a previous patch, I noticed this method
is no longer set to anything other than NULL in the tree, so we can
remove it.

Tested by building with --enable-targets=all.

2013-02-19  Pedro Alves  <palves@redhat.com>

	Garbage collect 'struct monitor_ops'::load_routine.

	* monitor.h (struct monitor_ops) <load_routine>: Remove field.
	* monitor.c (monitor_load): No longer call
	current_monitor->load_routine.
	* dbug-rom.c (init_dbug_cmds): Don't set 'load_routine'.
	* m32r-rom.c (init_m32r_cmds): Don't set 'load_routine'.
	* ppcbug-rom.c (init_ppc_cmds): Don't set 'load_routine'.
This commit is contained in:
Pedro Alves 2013-02-19 19:41:28 +00:00
parent 40e397df34
commit 61a672f17d
6 changed files with 46 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gdb/ChangeLog
View File

@ -1,3 +1,14 @@
2013-02-19 Pedro Alves <palves@redhat.com>
Garbage collect 'struct monitor_ops'::load_routine.
* monitor.h (struct monitor_ops) <load_routine>: Remove field.
* monitor.c (monitor_load): No longer call
current_monitor->load_routine.
* dbug-rom.c (init_dbug_cmds): Don't set 'load_routine'.
* m32r-rom.c (init_m32r_cmds): Don't set 'load_routine'.
* ppcbug-rom.c (init_ppc_cmds): Don't set 'load_routine'.
2013-02-19 Pedro Alves <palves@redhat.com>
PR gdb/15161

1
gdb/dbug-rom.c
View File

@ -142,7 +142,6 @@ init_dbug_cmds (void)
/* register_pattern */
dbug_cmds.register_pattern = "\\(\\w+\\) +:\\([0-9a-fA-F]+\\b\\)";
dbug_cmds.supply_register = dbug_supply_register;
dbug_cmds.load_routine = NULL; /* load_routine (defaults to SRECs) */
dbug_cmds.load = "dl\r"; /* download command */
dbug_cmds.loadresp = "\n"; /* load response */
dbug_cmds.prompt = "dBUG>"; /* monitor command prompt */

2
gdb/m32r-rom.c
View File

@ -348,7 +348,6 @@ init_m32r_cmds (void)
/* register_pattern */
m32r_cmds.register_pattern = "\\(\\w+\\) += \\([0-9a-fA-F]+\\b\\)";
m32r_cmds.supply_register = m32r_supply_register;
m32r_cmds.load_routine = NULL; /* load_routine (defaults to SRECs) */
m32r_cmds.load = NULL; /* download command */
m32r_cmds.loadresp = NULL; /* load response */
m32r_cmds.prompt = "ok "; /* monitor command prompt */
@ -409,7 +408,6 @@ init_mon2000_cmds (void)
/* register_pattern */
mon2000_cmds.register_pattern = "\\(\\w+\\) += \\([0-9a-fA-F]+\\b\\)";
mon2000_cmds.supply_register = m32r_supply_register;
mon2000_cmds.load_routine = NULL; /* load_routine (defaults to SRECs) */
mon2000_cmds.load = NULL; /* download command */
mon2000_cmds.loadresp = NULL; /* load response */
mon2000_cmds.prompt = "Mon2000>"; /* monitor command prompt */

75
gdb/monitor.c
View File

@ -2178,56 +2178,51 @@ monitor_wait_srec_ack (void)
static void
monitor_load (char *args, int from_tty)
{
CORE_ADDR load_offset = 0;
char **argv;
struct cleanup *old_cleanups;
char *filename;
monitor_debug ("MON load\n");
if (current_monitor->load_routine)
current_monitor->load_routine (monitor_desc, args, hashmark);
else
{ /* The default is ascii S-records. */
CORE_ADDR load_offset = 0;
char **argv;
struct cleanup *old_cleanups;
char *filename;
if (args == NULL)
error_no_arg (_("file to load"));
if (args == NULL)
error_no_arg (_("file to load"));
argv = gdb_buildargv (args);
old_cleanups = make_cleanup_freeargv (argv);
argv = gdb_buildargv (args);
old_cleanups = make_cleanup_freeargv (argv);
filename = tilde_expand (argv[0]);
make_cleanup (xfree, filename);
filename = tilde_expand (argv[0]);
make_cleanup (xfree, filename);
/* Enable user to specify address for downloading as 2nd arg to load. */
if (argv[1] != NULL)
{
const char *endptr;
/* Enable user to specify address for downloading as 2nd arg to load. */
if (argv[1] != NULL)
{
const char *endptr;
load_offset = strtoulst (argv[1], &endptr, 0);
load_offset = strtoulst (argv[1], &endptr, 0);
/* If the last word was not a valid number then
treat it as a file name with spaces in. */
if (argv[1] == endptr)
error (_("Invalid download offset:%s."), argv[1]);
/* If the last word was not a valid number then
treat it as a file name with spaces in. */
if (argv[1] == endptr)
error (_("Invalid download offset:%s."), argv[1]);
if (argv[2] != NULL)
error (_("Too many parameters."));
}
monitor_printf (current_monitor->load);
if (current_monitor->loadresp)
monitor_expect (current_monitor->loadresp, NULL, 0);
load_srec (monitor_desc, filename, load_offset,
32, SREC_ALL, hashmark,
current_monitor->flags & MO_SREC_ACK ?
monitor_wait_srec_ack : NULL);
monitor_expect_prompt (NULL, 0);
do_cleanups (old_cleanups);
if (argv[2] != NULL)
error (_("Too many parameters."));
}
monitor_printf (current_monitor->load);
if (current_monitor->loadresp)
monitor_expect (current_monitor->loadresp, NULL, 0);
load_srec (monitor_desc, filename, load_offset,
32, SREC_ALL, hashmark,
current_monitor->flags & MO_SREC_ACK ?
monitor_wait_srec_ack : NULL);
monitor_expect_prompt (NULL, 0);
do_cleanups (old_cleanups);
/* Finally, make the PC point at the start address. */
if (exec_bfd)
regcache_write_pc (get_current_regcache (),

2
gdb/monitor.h
View File

@ -102,8 +102,6 @@ struct monitor_ops
from reg dump */
void (*supply_register) (struct regcache *regcache, char *name,
int namelen, char *val, int vallen);
void (*load_routine) (struct serial *desc, char *file,
int hashmark); /* Download routine */
int (*dumpregs) (struct regcache *); /* Dump all registers */
int (*continue_hook) (void); /* Emit the continue command */
int (*wait_filter) (char *buf, /* Maybe contains registers */

1
gdb/ppcbug-rom.c
View File

@ -168,7 +168,6 @@ init_ppc_cmds (char *LOAD_CMD,
OPS->register_pattern = "\\(\\w+\\) +=\\([0-9a-fA-F]+\\b\\)";
OPS->supply_register = ppcbug_supply_register;
OPS->dump_registers = "rd\r"; /* dump all registers */
OPS->load_routine = NULL; /* load_routine (defaults to SRECs) */
OPS->load = LOAD_CMD; /* download command */
OPS->loadresp = NULL; /* load response */
OPS->prompt = "PPC1-Bug>"; /* monitor command prompt */