Rename --smc-support= to --smc-check=.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 6f4fee92b0c1d72bcb9542351c8b3fea72cd058f..f3dc4da559e61592adf63f7c06af95a22390d05b 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -1270,8 +1270,8 @@ static void usage ( Bool debug_help )
 "    --pointercheck=no|yes     enforce client address space limits [yes]\n"
 "    --support-elan3=no|yes    hacks for Quadrics Elan3 support [no]\n"
 "    --show-emwarns=no|yes     show warnings about emulation limits? [no]\n"
-"    --smc-support=none|stack|all   support for self-modifying code:\n"
-"                              none, for code found in stacks, or all [stack]\n"
+"    --smc-check=none|stack|all  checks for self-modifying code: none,\n"
+"                              only for code found in stacks, or all [stack]\n"
 "\n"
 "  user options for Valgrind tools that report errors:\n"
 "    --xml=yes                 all output is in XML (Memcheck only)\n"
@@ -1509,12 +1509,12 @@ static void process_cmd_line_options( UInt* client_auxv, const char* toolname )
       else VG_BNUM_CLO(arg, "--num-callers",      VG_(clo_backtrace_size), 1,
                                                   VG_DEEPEST_BACKTRACE)
 
-      else if (VG_CLO_STREQ(arg, "--smc-support=none"))
-         VG_(clo_smc_support) = Vg_SmcNone;
-      else if (VG_CLO_STREQ(arg, "--smc-support=stack"))
-         VG_(clo_smc_support) = Vg_SmcStack;
-      else if (VG_CLO_STREQ(arg, "--smc-support=all"))
-         VG_(clo_smc_support) = Vg_SmcAll;
+      else if (VG_CLO_STREQ(arg, "--smc-check=none"))
+         VG_(clo_smc_check) = Vg_SmcNone;
+      else if (VG_CLO_STREQ(arg, "--smc-check=stack"))
+         VG_(clo_smc_check) = Vg_SmcStack;
+      else if (VG_CLO_STREQ(arg, "--smc-check=all"))
+         VG_(clo_smc_check) = Vg_SmcAll;
 
       else VG_BNUM_CLO(arg, "--vex-iropt-verbosity",
                        VG_(clo_vex_control).iropt_verbosity, 0, 10)

diff --git a/coregrind/m_options.c b/coregrind/m_options.c
index caed24422c4a9266d047532395b3a60266a681a9..0621d5053fc55586a738d1194805b3fc2d74351f 100644 (file)
--- a/coregrind/m_options.c
+++ b/coregrind/m_options.c
@@ -78,7 +78,7 @@ Bool   VG_(clo_model_pthreads) = False;
 Bool   VG_(clo_show_emwarns)   = False;
 Int    VG_(clo_max_stackframe) = 2000000;
 Bool   VG_(clo_wait_for_gdb)   = False;
-VgSmc  VG_(clo_smc_support)    = Vg_SmcStack;
+VgSmc  VG_(clo_smc_check)      = Vg_SmcStack;
 
 
 /*--------------------------------------------------------------------*/

diff --git a/coregrind/m_translate.c b/coregrind/m_translate.c
index 6ca68bc87d79e0894993688b32cea6ede6fe45e7..3d13fc971e6af57e048185b47577bb37c78f90a8 100644 (file)
--- a/coregrind/m_translate.c
+++ b/coregrind/m_translate.c
@@ -392,13 +392,13 @@ static Bool chase_into_ok ( Addr64 addr64 )
    Addr addr = (Addr)addr64;
 
    /* All chasing disallowed if all bbs require self-checks. */
-   if (VG_(clo_smc_support) == Vg_SmcAll)
+   if (VG_(clo_smc_check) == Vg_SmcAll)
       goto dontchase;
 
    /* AAABBBCCC: if default self-checks are in force, reject if we
       would choose to have a self-check for the dest.  Note, this must
       match the logic at XXXYYYZZZ below. */
-   if (VG_(clo_smc_support) == Vg_SmcStack) {
+   if (VG_(clo_smc_check) == Vg_SmcStack) {
       Segment* seg = VG_(find_segment)(addr);
       if (seg && (seg->flags & SF_GROWDOWN))
          goto dontchase;
@@ -533,14 +533,14 @@ Bool VG_(translate) ( ThreadId tid,
 
    /* Do we want a self-checking translation? */
    do_self_check = False;
-   switch (VG_(clo_smc_support)) {
+   switch (VG_(clo_smc_check)) {
       case Vg_SmcNone:  do_self_check = False; break;
       case Vg_SmcAll:   do_self_check = True;  break;
       case Vg_SmcStack: 
          /* XXXYYYZZZ: must match the logic at AAABBBCCC above */
          do_self_check = seg ? toBool(seg->flags & SF_GROWDOWN) : False;
          break;
-      default: vg_assert2(0, "unknown VG_(clo_smc_support) value");
+      default: vg_assert2(0, "unknown VG_(clo_smc_check) value");
    }
 
    /* True if a debug trans., or if bit N set in VG_(clo_trace_codegen). */

diff --git a/coregrind/pub_core_options.h b/coregrind/pub_core_options.h
index b24ad94ffe18d8c264fb27cc7336c6729c94ea8d..108e01c68dad32d4cbd47107cff68eabf9b8d618 100644 (file)
--- a/coregrind/pub_core_options.h
+++ b/coregrind/pub_core_options.h
@@ -171,7 +171,7 @@ typedef
    } 
    VgSmc;
 
-extern VgSmc VG_(clo_smc_support);
+extern VgSmc VG_(clo_smc_check);
 
 
 #endif   // __PUB_CORE_OPTIONS_H

diff --git a/none/tests/amd64/smc1.vgtest b/none/tests/amd64/smc1.vgtest
index 1e57f2e30c3bb8efc6de819b6caefae98b7bd155..d3b6dfc2c0f0b48052c318a9cbabdb7b66e38b0a 100644 (file)
--- a/none/tests/amd64/smc1.vgtest
+++ b/none/tests/amd64/smc1.vgtest
@@ -1,2 +1,2 @@
 prog: smc1
-vgopts: --smc-support=all
+vgopts: --smc-check=all

diff --git a/none/tests/cmdline1.stdout.exp b/none/tests/cmdline1.stdout.exp
index 8805661c250a022768057f164f6f2ed8c7a918a6..a6f8b8d1c97a8f749f940d25ada37b0198c73b10 100644 (file)
--- a/none/tests/cmdline1.stdout.exp
+++ b/none/tests/cmdline1.stdout.exp
@@ -17,8 +17,8 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --pointercheck=no|yes     enforce client address space limits [yes]
     --support-elan3=no|yes    hacks for Quadrics Elan3 support [no]
     --show-emwarns=no|yes     show warnings about emulation limits? [no]
-    --smc-support=none|stack|all   support for self-modifying code:
-                              none, for code found in stacks, or all [stack]
+    --smc-check=none|stack|all  checks for self-modifying code: none,
+                              only for code found in stacks, or all [stack]
 
   user options for Valgrind tools that report errors:
     --xml=yes                 all output is in XML (Memcheck only)

diff --git a/none/tests/cmdline2.stdout.exp b/none/tests/cmdline2.stdout.exp
index 7c7d9e421aa8682abc273f3c245d71f74c4c3f15..ca620faaf51f061885b5c2647d149cbdb16faded 100644 (file)
--- a/none/tests/cmdline2.stdout.exp
+++ b/none/tests/cmdline2.stdout.exp
@@ -17,8 +17,8 @@ usage: valgrind --tool=<toolname> [options] prog-and-args
     --pointercheck=no|yes     enforce client address space limits [yes]
     --support-elan3=no|yes    hacks for Quadrics Elan3 support [no]
     --show-emwarns=no|yes     show warnings about emulation limits? [no]
-    --smc-support=none|stack|all   support for self-modifying code:
-                              none, for code found in stacks, or all [stack]
+    --smc-check=none|stack|all  checks for self-modifying code: none,
+                              only for code found in stacks, or all [stack]
 
   user options for Valgrind tools that report errors:
     --xml=yes                 all output is in XML (Memcheck only)

diff --git a/none/tests/x86/smc1.vgtest b/none/tests/x86/smc1.vgtest
index 1e57f2e30c3bb8efc6de819b6caefae98b7bd155..d3b6dfc2c0f0b48052c318a9cbabdb7b66e38b0a 100644 (file)
--- a/none/tests/x86/smc1.vgtest
+++ b/none/tests/x86/smc1.vgtest
@@ -1,2 +1,2 @@
 prog: smc1
-vgopts: --smc-support=all
+vgopts: --smc-check=all