Remove all user-visible traces of the --smc-check flag.

MERGE TO HEAD (I think this is already done, but still)

git-svn-id: svn://svn.valgrind.org/valgrind/branches/VALGRIND_1_0_BRANCH@1132

diff --git a/cachegrind.in b/cachegrind.in
index 5c22cb4e8ff069579074699875caaa2a6c33aea7..c632f34b4f09766917400d653ae53285c462e047 100755 (executable)
--- a/cachegrind.in
+++ b/cachegrind.in
@@ -55,9 +55,6 @@ do
     --instrument=no)        vgopts="$vgopts $arg"; shift;;
     --cleanup=yes)          vgopts="$vgopts $arg"; shift;;
     --cleanup=no)           vgopts="$vgopts $arg"; shift;;
-    --smc-check=none)       vgopts="$vgopts $arg"; shift;;
-    --smc-check=some)       vgopts="$vgopts $arg"; shift;;
-    --smc-check=all)        vgopts="$vgopts $arg"; shift;;
     --trace-syscalls=yes)   vgopts="$vgopts $arg"; shift;;
     --trace-syscalls=no)    vgopts="$vgopts $arg"; shift;;
     --trace-signals=yes)    vgopts="$vgopts $arg"; shift;;
@@ -106,7 +103,6 @@ if [ $# = 0 ] || [ z"$dousage" = z1 ]; then
    echo "    --optimise=no|yes         improve intermediate code? [yes]"
    echo "    --instrument=no|yes       actually do memory checks? [yes]"
    echo "    --cleanup=no|yes          improve after instrumentation? [yes]"
-   echo "    --smc-check=none|some|all check writes for s-m-c? [some]"
    echo "    --trace-syscalls=no|yes   show all system calls? [no]"
    echo "    --trace-signals=no|yes    show signal handling details? [no]"
    echo "    --trace-symtab=no|yes     show symbol table details? [no]"

diff --git a/valgrind.in b/valgrind.in
index 7b99277254c15c5c5c98d9ada50d8519487a6e3e..27c2c5eb53a880afb7849517b9cf8b9d9ca2066d 100755 (executable)
--- a/valgrind.in
+++ b/valgrind.in
@@ -84,9 +84,6 @@ do
     --instrument=no)        vgopts="$vgopts $arg"; shift;;
     --cleanup=yes)          vgopts="$vgopts $arg"; shift;;
     --cleanup=no)           vgopts="$vgopts $arg"; shift;;
-    --smc-check=none)       vgopts="$vgopts $arg"; shift;;
-    --smc-check=some)       vgopts="$vgopts $arg"; shift;;
-    --smc-check=all)        vgopts="$vgopts $arg"; shift;;
     --trace-syscalls=yes)   vgopts="$vgopts $arg"; shift;;
     --trace-syscalls=no)    vgopts="$vgopts $arg"; shift;;
     --trace-signals=yes)    vgopts="$vgopts $arg"; shift;;
@@ -154,7 +151,6 @@ if [ $# = 0 ] || [ z"$dousage" = z1 ]; then
    echo "    --optimise=no|yes         improve intermediate code? [yes]"
    echo "    --instrument=no|yes       actually do memory checks? [yes]"
    echo "    --cleanup=no|yes          improve after instrumentation? [yes]"
-   echo "    --smc-check=none|some|all check writes for s-m-c? [some]"
    echo "    --trace-syscalls=no|yes   show all system calls? [no]"
    echo "    --trace-signals=no|yes    show signal handling details? [no]"
    echo "    --trace-symtab=no|yes     show symbol table details? [no]"

diff --git a/vg_main.c b/vg_main.c
index 4dfc7a4dff86ffdd85a4e441524238168a7de332..cfe618185ff08b01a3d2c634f41be3c96b662f7b 100644 (file)
--- a/vg_main.c
+++ b/vg_main.c
@@ -577,7 +577,7 @@ static void process_cmd_line_options ( void )
    VG_(clo_D1_cache)         = UNDEFINED_CACHE;
    VG_(clo_L2_cache)         = UNDEFINED_CACHE;
    VG_(clo_cleanup)          = True;
-   VG_(clo_smc_check)        = /* VG_CLO_SMC_SOME */ VG_CLO_SMC_NONE;
+   VG_(clo_smc_check)        = VG_CLO_SMC_NONE; /* note UNUSED ! */
    VG_(clo_trace_syscalls)   = False;
    VG_(clo_trace_signals)    = False;
    VG_(clo_trace_symtab)     = False;
@@ -862,13 +862,6 @@ static void process_cmd_line_options ( void )
       else if (0 == VG_(strncmp)(argv[i], "--L2=",    5))
          parse_cache_opt(&VG_(clo_L2_cache), argv[i], 5);
 
-      else if (STREQ(argv[i], "--smc-check=none"))
-         VG_(clo_smc_check) = VG_CLO_SMC_NONE;
-      else if (STREQ(argv[i], "--smc-check=some"))
-         VG_(clo_smc_check) = VG_CLO_SMC_SOME;
-      else if (STREQ(argv[i], "--smc-check=all"))
-         VG_(clo_smc_check) = VG_CLO_SMC_ALL;
-
       else if (STREQ(argv[i], "--trace-syscalls=yes"))
          VG_(clo_trace_syscalls) = True;
       else if (STREQ(argv[i], "--trace-syscalls=no"))