Rename --simulation-hints as --sim-hints for brevity.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5099

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 3cb80f71c80bea8d9ea2ca34b56fcb6f554da59b..ca67c3dfba1e1be435d616f6c8ced738ee812e84 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -879,7 +879,7 @@ static void usage_NORETURN ( Bool debug_help )
 "\n"
 "  uncommon user options for all Valgrind tools:\n"
 "    --run-libc-freeres=no|yes free up glibc memory at exit? [yes]\n"
-"    --simulation-hints=hint1,hint2,...  known hints:\n"
+"    --sim-hints=hint1,hint2,...  known hints:\n"
 "                                 lax-ioctls, enable-outer [none]\n"
 "    --show-emwarns=no|yes     show warnings about emulation limits? [no]\n"
 "    --smc-check=none|stack|all  checks for self-modifying code: none,\n"
@@ -1109,7 +1109,7 @@ static Bool process_cmd_line_options( UInt* client_auxv, const char* toolname )
       else VG_BOOL_CLO(arg, "--model-pthreads",   VG_(clo_model_pthreads))
 
       else VG_STR_CLO (arg, "--db-command",       VG_(clo_db_command))
-      else VG_STR_CLO (arg, "--simulation-hints", VG_(clo_simulation_hints))
+      else VG_STR_CLO (arg, "--sim-hints",        VG_(clo_sim_hints))
 
       else VG_NUM_CLO (arg, "--dump-error",       VG_(clo_dump_error))
       else VG_NUM_CLO (arg, "--input-fd",         VG_(clo_input_fd))

diff --git a/coregrind/m_options.c b/coregrind/m_options.c
index 94d78fab36225f9ab3ca5217a6ed423fbbcb1da6..e7555a5e5c0e5087a797ac8c7f93e789610f68ab 100644 (file)
--- a/coregrind/m_options.c
+++ b/coregrind/m_options.c
@@ -67,7 +67,7 @@ Bool   VG_(clo_trace_sched)    = False;
 Bool   VG_(clo_trace_pthreads) = False;
 Int    VG_(clo_dump_error)     = 0;
 Int    VG_(clo_backtrace_size) = 12;
-Char*  VG_(clo_simulation_hints) = NULL;
+Char*  VG_(clo_sim_hints)      = NULL;
 Bool   VG_(clo_run_libc_freeres) = True;
 Bool   VG_(clo_track_fds)      = False;
 Bool   VG_(clo_show_below_main)= False;

diff --git a/coregrind/m_syswrap/syswrap-generic.c b/coregrind/m_syswrap/syswrap-generic.c
index af08fb29fdf8fc39de46b8c34aff4ae3fd9ce4ab..06121746e55eeb0499e70c1cef02f22cedcfdfd0 100644 (file)
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -3857,7 +3857,7 @@ PRE(sys_ioctl)
    default: {
       UInt dir  = _VKI_IOC_DIR(ARG2);
       UInt size = _VKI_IOC_SIZE(ARG2);
-      if (VG_(strstr)(VG_(clo_simulation_hints), "lax-ioctls") != NULL) {
+      if (VG_(strstr)(VG_(clo_sim_hints), "lax-ioctls") != NULL) {
         /* 
          * Be very lax about ioctl handling; the only
          * assumption is that the size is correct. Doesn't
@@ -4763,10 +4763,10 @@ PRE(sys_write)
    PRE_REG_READ3(ssize_t, "write",
                  unsigned int, fd, const char *, buf, vki_size_t, count);
    /* check to see if it is allowed.  If not, try for an exemption from
-      --simulation-hints=enable-outer (used for self hosting). */
+      --sim-hints=enable-outer (used for self hosting). */
    ok = ML_(fd_allowed)(ARG1, "write", tid, False);
    if (!ok && ARG1 == 2/*stderr*/ 
-           && VG_(strstr)(VG_(clo_simulation_hints),"enable-outer"))
+           && VG_(strstr)(VG_(clo_sim_hints),"enable-outer"))
       ok = True;
    if (!ok)
       SET_STATUS_Failure( VKI_EBADF );

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index c51f8567dd9f74863a3842e76be135602c42ddb5..b685625904f4c78412500a8e0650f83222f0e691 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -122,7 +122,7 @@ extern Int   VG_(clo_dump_error);
 /* Number of parents of a backtrace.  Default: 8.  */
 extern Int   VG_(clo_backtrace_size);
 /* Engage miscellaneous weird hacks needed for some progs. */
-extern Char* VG_(clo_simulation_hints);
+extern Char* VG_(clo_sim_hints);
 
 /* Track open file descriptors? */
 extern Bool  VG_(clo_track_fds);

diff --git a/docs/valgrind.1 b/docs/valgrind.1
index f106382365c77f77115796088cd83ad860f86253..f74900535f927143d50320a20b1a70377d7caba6 100644 (file)
--- a/docs/valgrind.1
+++ b/docs/valgrind.1
@@ -513,7 +513,7 @@ although at the cost of possibly falsely reporting space leaks in libc.so.
 
 .TP
 .B
---simulation-hints=hint1,hint2,\.\.\.
+--sim-hints=hint1,hint2,\.\.\.
 Pass miscellaneous hints to \fBvalgrind\fP which slightly modify the
 simulated behaviour in nonstandard or dangerous ways, possibly to help
 the simulation of strange features. By default no hints are enabled. Use

diff --git a/docs/xml/manual-core.xml b/docs/xml/manual-core.xml
index dba9ba4db834fc0fe74a8962364f4d661a65ad14..b8809a657f51fd693ebeb15a7e5fdfba0f382daa 100644 (file)
--- a/docs/xml/manual-core.xml
+++ b/docs/xml/manual-core.xml
@@ -1012,7 +1012,7 @@ Addrcheck), the following options apply.</para>
    </listitem>
 
    <listitem id="simulation_hints">
-    <para><computeroutput>--simulation-hints=hint1,hint2,...</computeroutput></para>
+    <para><computeroutput>--sim-hints=hint1,hint2,...</computeroutput></para>
     <para>Pass miscellaneous hints to Valgrind which slightly
     modify the simulated behaviour in nonstandard or dangerous
     ways, possibly to help the simulation of strange features.

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 6263bdc7e7c435b2633d6f810b4bf98386279107..dffd8509eacc76a508c381d4c445cf3c1506303f 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -18,7 +18,7 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
 
   uncommon user options for all Valgrind tools:
     --run-libc-freeres=no|yes free up glibc memory at exit? [yes]
-    --simulation-hints=hint1,hint2,...  known hints:
+    --sim-hints=hint1,hint2,...  known hints:
                                  lax-ioctls, enable-outer [none]
     --show-emwarns=no|yes     show warnings about emulation limits? [no]
     --smc-check=none|stack|all  checks for self-modifying code: none,

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index d686f75cce71fffa2692e5778de970f7536c036d..d0cfa744ea9776ed153035d6c7be587cf07922a4 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -18,7 +18,7 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
 
   uncommon user options for all Valgrind tools:
     --run-libc-freeres=no|yes free up glibc memory at exit? [yes]
-    --simulation-hints=hint1,hint2,...  known hints:
+    --sim-hints=hint1,hint2,...  known hints:
                                  lax-ioctls, enable-outer [none]
     --show-emwarns=no|yes     show warnings about emulation limits? [no]
     --smc-check=none|stack|all  checks for self-modifying code: none,