Skip to content

Commit b8e1053

Browse files
authored
Merge pull request #6929 from tautschnig/cleanup/analyzers-help
Document all {goto-,j}analyzer options
2 parents c5d2e47 + 06350a0 commit b8e1053

File tree

4 files changed

+28
-10
lines changed

4 files changed

+28
-10
lines changed

jbmc/src/janalyzer/janalyzer_parse_options.cpp

+12-2
Original file line numberDiff line numberDiff line change
@@ -744,6 +744,8 @@ void janalyzer_parse_optionst::help()
744744
" --verify use the abstract domains to check assertions\n"
745745
// NOLINTNEXTLINE(whitespace/line_length)
746746
" --simplify file_name use the abstract domains to simplify the program\n"
747+
" --no-simplify-slicing do not remove instructions from which no\n"
748+
" property can be reached (use with --simplify)\n" // NOLINT(*)
747749
" --unreachable-instructions list dead code\n"
748750
// NOLINTNEXTLINE(whitespace/line_length)
749751
" --unreachable-functions list functions unreachable from the entry point\n"
@@ -757,8 +759,9 @@ void janalyzer_parse_optionst::help()
757759
"\n"
758760
"Domain options:\n"
759761
" --constants constant domain\n"
760-
" --intervals interval domain\n"
761-
" --non-null non-null domain\n"
762+
" --intervals, --show-intervals\n"
763+
" interval domain\n"
764+
" --non-null, --show-non-null non-null domain\n"
762765
" --dependence-graph data and control dependencies between instructions\n" // NOLINT(*)
763766
"\n"
764767
"Output options:\n"
@@ -771,10 +774,15 @@ void janalyzer_parse_optionst::help()
771774
"Specific analyses:\n"
772775
// NOLINTNEXTLINE(whitespace/line_length)
773776
" --taint file_name perform taint analysis using rules in given file\n"
777+
" --show-taint print taint analysis results on stdout\n"
778+
" --show-local-may-alias perform procedure-local may alias analysis\n"
774779
"\n"
775780
"Java Bytecode frontend options:\n"
776781
JAVA_BYTECODE_LANGUAGE_OPTIONS_HELP
777782
"\n"
783+
"Platform options:\n"
784+
HELP_CONFIG_PLATFORM
785+
"\n"
778786
"Program representations:\n"
779787
" --show-parse-tree show parse tree\n"
780788
" --show-symbol-table show loaded symbol table\n"
@@ -784,9 +792,11 @@ void janalyzer_parse_optionst::help()
784792
"Program instrumentation options:\n"
785793
" --no-assertions ignore user assertions\n"
786794
" --no-assumptions ignore user assumptions\n"
795+
" --property id enable selected properties only\n"
787796
"\n"
788797
"Other options:\n"
789798
" --version show version and exit\n"
799+
" --verbosity # verbosity level\n"
790800
HELP_TIMESTAMP
791801
"\n";
792802
// clang-format on

jbmc/src/janalyzer/janalyzer_parse_options.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,8 @@ class optionst;
128128
OPT_SHOW_GOTO_FUNCTIONS \
129129
OPT_SHOW_PROPERTIES \
130130
"(no-assertions)(no-assumptions)" \
131-
"(show-loops)" \
132131
"(show-symbol-table)(show-parse-tree)" \
133-
"(show-reachable-properties)(property):" \
132+
"(property):" \
134133
"(verbosity):(version)" \
135134
"(arch):" \
136135
"(taint):(show-taint)" \

src/goto-analyzer/goto_analyzer_parse_options.cpp

+14-4
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ void goto_analyzer_parse_optionst::help()
691691
"\n"
692692
"Usage: Purpose:\n"
693693
"\n"
694-
" goto-analyzer [-h] [--help] show help\n"
694+
" goto-analyzer [-?|-h|--help] show help\n"
695695
" goto-analyzer file.c ... source file names\n"
696696
"\n"
697697
"Task options:\n"
@@ -701,6 +701,8 @@ void goto_analyzer_parse_optionst::help()
701701
" --verify use the abstract domains to check assertions\n"
702702
// NOLINTNEXTLINE(whitespace/line_length)
703703
" --simplify file_name use the abstract domains to simplify the program\n"
704+
" --no-simplify-slicing do not remove instructions from which no\n"
705+
" property can be reached (use with --simplify)\n" // NOLINT(*)
704706
" --unreachable-instructions list dead code\n"
705707
// NOLINTNEXTLINE(whitespace/line_length)
706708
" --unreachable-functions list functions unreachable from the entry point\n"
@@ -716,6 +718,8 @@ void goto_analyzer_parse_optionst::help()
716718
" --legacy-ait recursion for function and one domain per location\n"
717719
// NOLINTNEXTLINE(whitespace/line_length)
718720
" --legacy-concurrent legacy-ait with an extended fixed-point for concurrency\n"
721+
// NOLINTNEXTLINE(whitespace/line_length)
722+
" --location-sensitive use location-sensitive abstract interpreter\n"
719723
"\n"
720724
"History options:\n"
721725
// NOLINTNEXTLINE(whitespace/line_length)
@@ -739,10 +743,12 @@ void goto_analyzer_parse_optionst::help()
739743
"\n"
740744
"Domain options:\n"
741745
" --constants a constant for each variable if possible\n"
742-
" --intervals an interval for each variable\n"
743-
" --non-null tracks which pointers are non-null\n"
746+
" --intervals, --show-intervals\n"
747+
" an interval for each variable\n"
748+
" --non-null, --show-non-null tracks which pointers are non-null\n"
744749
" --dependence-graph data and control dependencies between instructions\n" // NOLINT(*)
745-
" --vsd a configurable non-relational domain\n" // NOLINT(*)
750+
" --vsd, --variable-sensitivity\n"
751+
" a configurable non-relational domain\n"
746752
" --dependence-graph-vs dependencies between instructions using VSD\n" // NOLINT(*)
747753
"\n"
748754
"Variable sensitivity domain (VSD) options:\n"
@@ -763,6 +769,8 @@ void goto_analyzer_parse_optionst::help()
763769
"Specific analyses:\n"
764770
// NOLINTNEXTLINE(whitespace/line_length)
765771
" --taint file_name perform taint analysis using rules in given file\n"
772+
" --show-taint print taint analysis results on stdout\n"
773+
" --show-local-may-alias perform procedure-local may alias analysis\n"
766774
"\n"
767775
"C/C++ frontend options:\n"
768776
HELP_CONFIG_C_CPP
@@ -778,13 +786,15 @@ void goto_analyzer_parse_optionst::help()
778786
HELP_SHOW_PROPERTIES
779787
"\n"
780788
"Program instrumentation options:\n"
789+
" --property id enable selected properties only\n"
781790
HELP_GOTO_CHECK
782791
HELP_CONFIG_LIBRARY
783792
"\n"
784793
"Other options:\n"
785794
HELP_VALIDATE
786795
" --version show version and exit\n"
787796
HELP_FLUSH
797+
" --verbosity # verbosity level\n"
788798
HELP_TIMESTAMP
789799
"\n";
790800
// clang-format on

src/goto-analyzer/goto_analyzer_parse_options.h

+1-2
Original file line numberDiff line numberDiff line change
@@ -151,9 +151,8 @@ class optionst;
151151
OPT_SHOW_GOTO_FUNCTIONS \
152152
OPT_SHOW_PROPERTIES \
153153
OPT_GOTO_CHECK \
154-
"(show-loops)" \
155154
"(show-symbol-table)(show-parse-tree)" \
156-
"(show-reachable-properties)(property):" \
155+
"(property):" \
157156
"(verbosity):(version)" \
158157
OPT_FLUSH \
159158
OPT_TIMESTAMP \

0 commit comments

Comments
 (0)