diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2016-01-03 01:51:44 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2016-01-06 21:48:59 -0500 |
| commit | 2e3d4f4d5d386995e99d035354a9e411d1dc0331 (patch) | |
| tree | 6d149d58208966cc50be708fccc5d5273a702de5 /sim/bfin | |
| parent | 23ad6f3ec4b1086a987ba05e6ea77c131d72875c (diff) | |
| download | gdb-2e3d4f4d5d386995e99d035354a9e411d1dc0331.zip gdb-2e3d4f4d5d386995e99d035354a9e411d1dc0331.tar.gz gdb-2e3d4f4d5d386995e99d035354a9e411d1dc0331.tar.bz2 | |
sim: sim_{create_inferior,open,parse_args}: constify argv/env slightly
2016-01-03 Mike Frysinger <vapier@gentoo.org>
* sim-options.c (sim_parse_args): Mark argv array const.
* sim-options.h (sim_parse_args): Likewise.
Diffstat (limited to 'sim/bfin')
| -rw-r--r-- | sim/bfin/ChangeLog | 10 | ||||
| -rw-r--r-- | sim/bfin/interp.c | 16 |
2 files changed, 18 insertions, 8 deletions
diff --git a/sim/bfin/ChangeLog b/sim/bfin/ChangeLog index 4f1f93d..62f70e3 100644 --- a/sim/bfin/ChangeLog +++ b/sim/bfin/ChangeLog @@ -1,3 +1,13 @@ +2016-01-06 Mike Frysinger <vapier@gentoo.org> + + * interp.c (bfin_syscall): Remove first const from argv. + (sim_open): Mark argv const. + (simple_env): Remove first const. + (bfin_user_init): Remove first const from argv and and env + (bfin_os_init): Remove first const from argv. + (sim_create_inferior): Mark argv and env const. + Drop casts from bfin_user_init and bfin_os_init calls. + 2016-01-05 Mike Frysinger <vapier@gentoo.org> * interp.c (step_once): Call TRACE_DISASM. diff --git a/sim/bfin/interp.c b/sim/bfin/interp.c index ccd6a8a..0875b51 100644 --- a/sim/bfin/interp.c +++ b/sim/bfin/interp.c @@ -119,7 +119,7 @@ void bfin_syscall (SIM_CPU *cpu) { SIM_DESC sd = CPU_STATE (cpu); - const char * const *argv = (void *)STATE_PROG_ARGV (sd); + char * const *argv = (void *)STATE_PROG_ARGV (sd); host_callback *cb = STATE_CALLBACK (sd); bu32 args[6]; CB_SYSCALL sc; @@ -716,7 +716,7 @@ bfin_initialize_cpu (SIM_DESC sd, SIM_CPU *cpu) SIM_DESC sim_open (SIM_OPEN_KIND kind, host_callback *callback, - struct bfd *abfd, char **argv) + struct bfd *abfd, char * const *argv) { char c; int i; @@ -807,7 +807,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, } /* Some utils don't like having a NULL environ. */ -static const char * const simple_env[] = { "HOME=/", "PATH=/bin", NULL }; +static char * const simple_env[] = { "HOME=/", "PATH=/bin", NULL }; static bu32 fdpic_load_offset; @@ -965,7 +965,7 @@ bfin_fdpic_load (SIM_DESC sd, SIM_CPU *cpu, struct bfd *abfd, bu32 *sp, static void bfin_user_init (SIM_DESC sd, SIM_CPU *cpu, struct bfd *abfd, - const char * const *argv, const char * const *env) + char * const *argv, char * const *env) { /* XXX: Missing host -> target endian ... */ /* Linux starts the user app with the stack: @@ -1147,7 +1147,7 @@ bfin_user_init (SIM_DESC sd, SIM_CPU *cpu, struct bfd *abfd, } static void -bfin_os_init (SIM_DESC sd, SIM_CPU *cpu, const char * const *argv) +bfin_os_init (SIM_DESC sd, SIM_CPU *cpu, char * const *argv) { /* Pass the command line via a string in R0 like Linux expects. */ int i; @@ -1184,7 +1184,7 @@ bfin_virtual_init (SIM_DESC sd, SIM_CPU *cpu) SIM_RC sim_create_inferior (SIM_DESC sd, struct bfd *abfd, - char **argv, char **env) + char * const *argv, char * const *env) { SIM_CPU *cpu = STATE_CPU (sd, 0); SIM_ADDR addr; @@ -1209,10 +1209,10 @@ sim_create_inferior (SIM_DESC sd, struct bfd *abfd, switch (STATE_ENVIRONMENT (sd)) { case USER_ENVIRONMENT: - bfin_user_init (sd, cpu, abfd, (void *)argv, (void *)env); + bfin_user_init (sd, cpu, abfd, argv, env); break; case OPERATING_ENVIRONMENT: - bfin_os_init (sd, cpu, (void *)argv); + bfin_os_init (sd, cpu, argv); break; default: bfin_virtual_init (sd, cpu); |