From 71a9f134da16fda6094f7cbab121ea62dbfb78d9 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Dec 2013 21:31:27 -0700 Subject: [PATCH] Add target_ops argument to to_load 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. * target.c (target_load): Add argument. (debug_to_load): Add argument. (update_current_target): Update. * remote.c (remote_load): Add 'self' argument. * remote-sim.c (gdbsim_load): Add 'self' argument. * remote-mips.c (mips_load): Add 'self' argument. * remote-m32r-sdi.c (m32r_load): Add 'self' argument. * monitor.c (monitor_load): Add 'self' argument. * m32r-rom.c (m32r_load_gen): Add 'self' argument. --- gdb/ChangeLog | 13 +++++++++++++ gdb/m32r-rom.c | 2 +- gdb/monitor.c | 2 +- gdb/remote-m32r-sdi.c | 2 +- gdb/remote-mips.c | 4 ++-- gdb/remote-sim.c | 4 ++-- gdb/remote.c | 2 +- gdb/target.c | 10 +++++----- gdb/target.h | 2 +- 9 files changed, 27 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index e53c7e602be..3db2aa636ab 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,16 @@ +2014-02-19 Tom Tromey + + * target.h (struct target_ops) : Add argument. + * target.c (target_load): Add argument. + (debug_to_load): Add argument. + (update_current_target): Update. + * remote.c (remote_load): Add 'self' argument. + * remote-sim.c (gdbsim_load): Add 'self' argument. + * remote-mips.c (mips_load): Add 'self' argument. + * remote-m32r-sdi.c (m32r_load): Add 'self' argument. + * monitor.c (monitor_load): Add 'self' argument. + * m32r-rom.c (m32r_load_gen): Add 'self' argument. + 2014-02-19 Tom Tromey * target.h (struct target_ops) : Add argument. diff --git a/gdb/m32r-rom.c b/gdb/m32r-rom.c index 6219891959b..2ca23ae247c 100644 --- a/gdb/m32r-rom.c +++ b/gdb/m32r-rom.c @@ -196,7 +196,7 @@ m32r_load (char *filename, int from_tty) } static void -m32r_load_gen (char *filename, int from_tty) +m32r_load_gen (struct target_ops *self, char *filename, int from_tty) { generic_load (filename, from_tty); } diff --git a/gdb/monitor.c b/gdb/monitor.c index e88b28cf854..6061a85e01d 100644 --- a/gdb/monitor.c +++ b/gdb/monitor.c @@ -2199,7 +2199,7 @@ monitor_wait_srec_ack (void) /* monitor_load -- download a file. */ static void -monitor_load (char *args, int from_tty) +monitor_load (struct target_ops *self, char *args, int from_tty) { CORE_ADDR load_offset = 0; char **argv; diff --git a/gdb/remote-m32r-sdi.c b/gdb/remote-m32r-sdi.c index 37649e4a5d7..0af8cfc6418 100644 --- a/gdb/remote-m32r-sdi.c +++ b/gdb/remote-m32r-sdi.c @@ -1213,7 +1213,7 @@ m32r_remove_breakpoint (struct target_ops *ops, } static void -m32r_load (char *args, int from_tty) +m32r_load (struct target_ops *self, char *args, int from_tty) { struct cleanup *old_chain; asection *section; diff --git a/gdb/remote-mips.c b/gdb/remote-mips.c index e8ef4494104..4338ffa6972 100644 --- a/gdb/remote-mips.c +++ b/gdb/remote-mips.c @@ -128,7 +128,7 @@ static void pmon_download (char *buffer, int length); static void pmon_load_fast (char *file); -static void mips_load (char *file, int from_tty); +static void mips_load (struct target_ops *self, char *file, int from_tty); static int mips_make_srec (char *buffer, int type, CORE_ADDR memaddr, unsigned char *myaddr, int len); @@ -3530,7 +3530,7 @@ pmon_load_fast (char *file) /* mips_load -- download a file. */ static void -mips_load (char *file, int from_tty) +mips_load (struct target_ops *self, char *file, int from_tty) { struct regcache *regcache; diff --git a/gdb/remote-sim.c b/gdb/remote-sim.c index 1855f39ec55..65da8f73b44 100644 --- a/gdb/remote-sim.c +++ b/gdb/remote-sim.c @@ -72,7 +72,7 @@ static void gdb_os_error (host_callback *, const char *, ...) static void gdbsim_kill (struct target_ops *); -static void gdbsim_load (char *prog, int fromtty); +static void gdbsim_load (struct target_ops *self, char *prog, int fromtty); static void gdbsim_open (char *args, int from_tty); @@ -561,7 +561,7 @@ gdbsim_kill (struct target_ops *ops) GDB's symbol tables to match. */ static void -gdbsim_load (char *args, int fromtty) +gdbsim_load (struct target_ops *self, char *args, int fromtty) { char **argv; char *prog; diff --git a/gdb/remote.c b/gdb/remote.c index f6163a9dcb7..0c9de6d4dc3 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -11352,7 +11352,7 @@ remote_augmented_libraries_svr4_read (void) /* Implementation of to_load. */ static void -remote_load (char *name, int from_tty) +remote_load (struct target_ops *self, char *name, int from_tty) { generic_load (name, from_tty); } diff --git a/gdb/target.c b/gdb/target.c index 97764267c94..b1ad4db63dd 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -142,7 +142,7 @@ static void debug_to_terminal_save_ours (struct target_ops *self); static void debug_to_terminal_ours (struct target_ops *self); -static void debug_to_load (char *, int); +static void debug_to_load (struct target_ops *self, char *, int); static int debug_to_can_run (void); @@ -462,7 +462,7 @@ void target_load (char *arg, int from_tty) { target_dcache_invalidate (); - (*current_target.to_load) (arg, from_tty); + (*current_target.to_load) (¤t_target, arg, from_tty); } void @@ -786,7 +786,7 @@ update_current_target (void) de_fault (to_terminal_info, default_terminal_info); de_fault (to_load, - (void (*) (char *, int)) + (void (*) (struct target_ops *, char *, int)) tcomplain); de_fault (to_post_startup_inferior, (void (*) (ptid_t)) @@ -4849,9 +4849,9 @@ debug_to_terminal_info (struct target_ops *self, } static void -debug_to_load (char *args, int from_tty) +debug_to_load (struct target_ops *self, char *args, int from_tty) { - debug_target.to_load (args, from_tty); + debug_target.to_load (&debug_target, args, from_tty); fprintf_unfiltered (gdb_stdlog, "target_load (%s, %d)\n", args, from_tty); } diff --git a/gdb/target.h b/gdb/target.h index 884716a24e4..60e0e163680 100644 --- a/gdb/target.h +++ b/gdb/target.h @@ -494,7 +494,7 @@ struct target_ops void (*to_terminal_save_ours) (struct target_ops *); void (*to_terminal_info) (struct target_ops *, const char *, int); void (*to_kill) (struct target_ops *); - void (*to_load) (char *, int); + void (*to_load) (struct target_ops *, char *, int); void (*to_create_inferior) (struct target_ops *, char *, char *, char **, int); void (*to_post_startup_inferior) (ptid_t); -- 2.30.2