Rename --simulation-hints as --sim-hints for brevity.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@5099 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 3cb80f7..ca67c3d 100644
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -879,7 +879,7 @@
"\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 @@
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 94d78fa..e7555a5 100644
--- a/coregrind/m_options.c
+++ b/coregrind/m_options.c
@@ -67,7 +67,7 @@
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 af08fb2..0612174 100644
--- a/coregrind/m_syswrap/syswrap-generic.c
+++ b/coregrind/m_syswrap/syswrap-generic.c
@@ -3857,7 +3857,7 @@
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_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 c51f856..b685625 100644
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -122,7 +122,7 @@
/* 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);