From cb1cc9c67ab42392913b61d630a3f72369e1c9ac Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Tue, 13 Apr 2010 20:28:20 +0000 Subject: [PATCH] sim: constify sim_write source buffer Most the sim write functions declare their source buffer const because they only ever read from it. The global sim_write() function does not follow this convention though which causes some warnings when trying to pass it const strings or buffers. Signed-off-by: Mike Frysinger --- include/gdb/ChangeLog | 4 ++++ include/gdb/remote-sim.h | 2 +- sim/common/ChangeLog | 5 +++++ sim/common/sim-hrw.c | 2 +- sim/common/sim-utils.h | 2 +- 5 files changed, 12 insertions(+), 3 deletions(-) diff --git a/include/gdb/ChangeLog b/include/gdb/ChangeLog index 3b84cad1879..119264eb34c 100644 --- a/include/gdb/ChangeLog +++ b/include/gdb/ChangeLog @@ -1,3 +1,7 @@ +2010-04-13 Mike Frysinger + + * remote-sim.h (sim_write): Add const to buf arg. + 2009-11-24 DJ Delorie * sim-rx.h: New. diff --git a/include/gdb/remote-sim.h b/include/gdb/remote-sim.h index cfb1c1141d6..37f029ad743 100644 --- a/include/gdb/remote-sim.h +++ b/include/gdb/remote-sim.h @@ -175,7 +175,7 @@ int sim_read PARAMS ((SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length) memory. Store bytes starting at virtual address MEM. Result is number of bytes write, or zero if error. */ -int sim_write PARAMS ((SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length)); +int sim_write PARAMS ((SIM_DESC sd, SIM_ADDR mem, const unsigned char *buf, int length)); /* Fetch register REGNO storing its raw (target endian) value in the diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 71f4613ce94..2a386d700a3 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,8 @@ +2010-04-13 Mike Frysinger + + * sim-hrw.c (sim_write): Add const to buf arg. + * sim-utils.h (sim_write_fn): Likewise. + 2010-04-12 Mike Frysinger * sim-profile.h (PROFILE_BRANCH_TAKEN, PROFILE_BRANCH_UNTAKEN): New diff --git a/sim/common/sim-hrw.c b/sim/common/sim-hrw.c index e76a1962da5..cedae87a7e9 100644 --- a/sim/common/sim-hrw.c +++ b/sim/common/sim-hrw.c @@ -32,7 +32,7 @@ sim_read (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length) } int -sim_write (SIM_DESC sd, SIM_ADDR mem, unsigned char *buf, int length) +sim_write (SIM_DESC sd, SIM_ADDR mem, const unsigned char *buf, int length) { SIM_ASSERT (STATE_MAGIC (sd) == SIM_MAGIC_NUMBER); return sim_core_write_buffer (sd, NULL, write_map, diff --git a/sim/common/sim-utils.h b/sim/common/sim-utils.h index 75d2fb45026..e3ff63afe7e 100644 --- a/sim/common/sim-utils.h +++ b/sim/common/sim-utils.h @@ -63,7 +63,7 @@ SIM_RC sim_analyze_program (SIM_DESC sd, char *prog_name, This is still accommodated for backward compatibility reasons. */ typedef int sim_write_fn PARAMS ((SIM_DESC sd, SIM_ADDR mem, - unsigned char *buf, int length)); + const unsigned char *buf, int length)); struct bfd *sim_load_file (SIM_DESC sd, const char *myname, host_callback *callback, char *prog, struct bfd *prog_bfd, int verbose_p, -- 2.30.2