Merge pull request diffblue#1419 from peterschrammel/refactor/cover-instrument

Refactor coverage instrumentation

Author: peterschrammel

src/cbmc/Makefile

@@ -34,6 +34,15 @@ OBJ += ../ansi-c/ansi-c$(LIBEXT) \
       ../goto-instrument/full_slicer$(OBJEXT) \
       ../goto-instrument/nondet_static$(OBJEXT) \
       ../goto-instrument/cover$(OBJEXT) \
+      ../goto-instrument/cover_basic_blocks$(OBJEXT) \
+      ../goto-instrument/cover_filter$(OBJEXT) \
+      ../goto-instrument/cover_instrument_branch$(OBJEXT) \
+      ../goto-instrument/cover_instrument_condition$(OBJEXT) \
+      ../goto-instrument/cover_instrument_decision$(OBJEXT) \
+      ../goto-instrument/cover_instrument_location$(OBJEXT) \
+      ../goto-instrument/cover_instrument_mcdc$(OBJEXT) \
+      ../goto-instrument/cover_instrument_other$(OBJEXT) \
+      ../goto-instrument/cover_util$(OBJEXT) \
       ../analyses/analyses$(LIBEXT) \
       ../langapi/langapi$(LIBEXT) \
       ../xmllang/xmllang$(LIBEXT) \

src/cbmc/cbmc_parse_options.cpp

@@ -117,7 +117,7 @@ void cbmc_parse_optionst::get_command_line_options(optionst &options)
     options.set_option("show-vcc", true);
 
   if(cmdline.isset("cover"))
-    options.set_option("cover", cmdline.get_values("cover"));
+    parse_cover_options(cmdline, options);
 
   if(cmdline.isset("mm"))
     options.set_option("mm", cmdline.get_value("mm"));
@@ -810,10 +810,7 @@ bool cbmc_parse_optionst::process_goto_program(
     // instrument cover goals
     if(cmdline.isset("cover"))
     {
-      if(instrument_cover_goals(
-           cmdline,
-           goto_model,
-           get_message_handler()))
+      if(instrument_cover_goals(options, goto_model, get_message_handler()))
         return true;
     }
 

src/goto-instrument/Makefile

@@ -19,6 +19,15 @@ SRC = accelerate/accelerate.cpp \
       concurrency.cpp \
       count_eloc.cpp \
       cover.cpp \
+      cover_basic_blocks.cpp \
+      cover_filter.cpp \
+      cover_instrument_branch.cpp \
+      cover_instrument_condition.cpp \
+      cover_instrument_decision.cpp \
+      cover_instrument_location.cpp \
+      cover_instrument_mcdc.cpp \
+      cover_instrument_other.cpp \
+      cover_util.cpp \
       document_properties.cpp \
       dot.cpp \
       dump_c.cpp \