diff options
| -rw-r--r-- | sim/ChangeLog | 4 | ||||
| -rw-r--r-- | sim/cris/sim-if.c | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/sim/ChangeLog b/sim/ChangeLog index c4b5ead..4398077 100644 --- a/sim/ChangeLog +++ b/sim/ChangeLog @@ -1,5 +1,9 @@ 2008-12-30 Hans-Peter Nilsson <hp@axis.com> + * cris/sim-if.c (sim_open): If sim_analyze_program fails, emit + just a short CRIS-specific notice. Tweak the wording for a + failing architecture test. + * cris/traps.c (TARGET_SYS_writev): New macro. (is_mapped_only, cris_dump_map): New functions. (cris_break_13_handler) <case TARGET_SYS_mmap2>: Handle more flags diff --git a/sim/cris/sim-if.c b/sim/cris/sim-if.c index 323c40e..29e796e 100644 --- a/sim/cris/sim-if.c +++ b/sim/cris/sim-if.c @@ -688,12 +688,10 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, : NULL), abfd) != SIM_RC_OK) { - if (STATE_PROG_ARGV (sd) != NULL) - sim_io_eprintf (sd, "%s: invalid executable `%s'\n", - STATE_MY_NAME (sd), *STATE_PROG_ARGV (sd)); - else - sim_io_eprintf (sd, "%s: invalid executable\n", - STATE_MY_NAME (sd)); + /* When there's an error, sim_analyze_program has already output + a message. Let's just clarify it, as "not an object file" + perhaps doesn't ring a bell. */ + sim_io_eprintf (sd, "(not a CRIS program)\n"); free_state (sd); return 0; } @@ -707,7 +705,7 @@ sim_open (SIM_OPEN_KIND kind, host_callback *callback, struct bfd *abfd, if (bfd_get_arch (abfd) == bfd_arch_unknown) { if (STATE_PROG_ARGV (sd) != NULL) - sim_io_eprintf (sd, "%s: not a CRIS program `%s'\n", + sim_io_eprintf (sd, "%s: `%s' is not a CRIS program\n", STATE_MY_NAME (sd), *STATE_PROG_ARGV (sd)); else sim_io_eprintf (sd, "%s: program to be run is not a CRIS program\n", |