ppc sim: Improve invalid option error message

This patch improves the error message when an invalid option is
detected, by also printing the option that actually caused the error.
For instance, from GDB:

        (gdb) target sim --hello
        Invalid option: --hello
        Usage:
        [...]

We also added the usage after an invalid long-name option (Eg: --hello)
to be in line with what's being done for all other invalid options
being detected.

sim/ppc/ChangeLog:

        * psim.c (psim_options): Add option that cause the error
        in invalid-option error messages. Print the usage when
        detecting an invalid long-name option.

diff --git a/sim/ppc/ChangeLog b/sim/ppc/ChangeLog
index 2536fa4272cca1a15ab088be3097c3d5ff48516b..047126aacf730c7fc87ec395f6707eb552aeda7a 100644 (file)
--- a/sim/ppc/ChangeLog
+++ b/sim/ppc/ChangeLog
@@ -1,4 +1,10 @@
-2011-06-08  Joel Brobecker  <brobecker@adacore.com>
+2011-06-08  joel brobecker  <brobecker@adacore.com>
+
+       * psim.c (psim_options): Add option that cause the error
+       in invalid-option error messages. Print the usage when
+       detecting an invalid long-name option.
+
+2011-06-08  joel brobecker  <brobecker@adacore.com>
 
        * psim.c (psim_options): Accept and ignore `--sysroot=...'.
 

diff --git a/sim/ppc/psim.c b/sim/ppc/psim.c
index 076a50c8d2ecee0abfaa5d589633d3a99ff6bc40..d814486be330206de34f0afc1966f731a859fa60 100644 (file)
--- a/sim/ppc/psim.c
+++ b/sim/ppc/psim.c
@@ -261,6 +261,7 @@ psim_options(device *root,
     while (*p != '\0') {
       switch (*p) {
       default:
+       printf_filtered ("Invalid Option: %s\n", argv[argp]);
        psim_usage(0, 0);
        error ("");
        break;
@@ -368,7 +369,11 @@ psim_options(device *root,
            exit (0);
          }
        else
-         error("Unrecognized option");
+         {
+           printf_filtered ("Invalid option: %s\n", argv[argp]);
+           psim_usage (0, 0);
+           error ("");
+         }
        break;
       }
       p += 1;