Skip to content

Factor out show_vcc from bmct #2884

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2018
Merged

Factor out show_vcc from bmct #2884

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion jbmc/src/jbmc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ OBJ += ../$(CPROVER_DIR)/src/ansi-c/ansi-c$(LIBEXT) \
../$(CPROVER_DIR)/src/cbmc/cbmc_solvers$(OBJEXT) \
../$(CPROVER_DIR)/src/cbmc/counterexample_beautification$(OBJEXT) \
../$(CPROVER_DIR)/src/cbmc/fault_localization$(OBJEXT) \
../$(CPROVER_DIR)/src/cbmc/show_vcc$(OBJEXT) \
../$(CPROVER_DIR)/src/cbmc/symex_bmc$(OBJEXT) \
../$(CPROVER_DIR)/src/cbmc/symex_coverage$(OBJEXT) \
# Empty last line
Expand Down
1 change: 0 additions & 1 deletion jbmc/unit/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,6 @@ BMC_DEPS =$(CPROVER_DIR)/src/cbmc/all_properties$(OBJEXT) \
$(CPROVER_DIR)/src/cbmc/cbmc_solvers$(OBJEXT) \
$(CPROVER_DIR)/src/cbmc/counterexample_beautification$(OBJEXT) \
$(CPROVER_DIR)/src/cbmc/fault_localization$(OBJEXT) \
$(CPROVER_DIR)/src/cbmc/show_vcc$(OBJEXT) \
$(CPROVER_DIR)/src/cbmc/symex_bmc$(OBJEXT) \
$(CPROVER_DIR)/src/cbmc/symex_coverage$(OBJEXT) \
$(CPROVER_DIR)/src/cbmc/xml_interface$(OBJEXT) \
Expand Down
1 change: 0 additions & 1 deletion src/cbmc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ SRC = all_properties.cpp \
cbmc_solvers.cpp \
counterexample_beautification.cpp \
fault_localization.cpp \
show_vcc.cpp \
symex_bmc.cpp \
symex_coverage.cpp \
xml_interface.cpp \
Expand Down
5 changes: 3 additions & 2 deletions src/cbmc/bmc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ Author: Daniel Kroening, [email protected]
#include <goto-symex/build_goto_trace.h>
#include <goto-symex/memory_model_pso.h>
#include <goto-symex/show_program.h>
#include <goto-symex/show_vcc.h>
#include <goto-symex/slice.h>
#include <goto-symex/slice_by_trace.h>

Expand Down Expand Up @@ -293,7 +294,7 @@ safety_checkert::resultt bmct::execute(

if(options.get_bool_option("show-vcc"))
{
show_vcc();
show_vcc(options, get_message_handler(), ui, ns, equation);
return safety_checkert::resultt::SAFE; // to indicate non-error
}

Expand Down Expand Up @@ -419,7 +420,7 @@ void bmct::show()
{
if(options.get_bool_option("show-vcc"))
{
show_vcc();
show_vcc(options, get_message_handler(), ui, ns, equation);
}

if(options.get_bool_option("program-only"))
Expand Down
4 changes: 0 additions & 4 deletions src/cbmc/bmc.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,6 @@ class bmct:public safety_checkert

virtual void freeze_program_variables();

virtual void show_vcc();
virtual void show_vcc_plain(std::ostream &out);
virtual void show_vcc_json(std::ostream &out);

trace_optionst trace_options()
{
return trace_optionst(options);
Expand Down
180 changes: 0 additions & 180 deletions src/cbmc/show_vcc.cpp
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/goto-symex/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ SRC = auto_objects.cpp \
precondition.cpp \
rewrite_union.cpp \
show_program.cpp \
show_vcc.cpp \
slice.cpp \
slice_by_trace.cpp \
symex_assign.cpp \
Expand Down
Loading