Skip to content

Graphml correctness witnesses #369

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 9 commits into from
Dec 29, 2016
Merged

Graphml correctness witnesses #369

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4542653
stub for correctness witness generation
peterschrammel Nov 27, 2016
ab25eea
Add_node_if_not_exists for graphml
peterschrammel Nov 27, 2016
db1e12d
Generate nodes for graphml correctness witness
peterschrammel Nov 27, 2016
1ed64d3
generate graph attributes from key value pairs
peterschrammel Nov 27, 2016
9b4ce66
Invariants must be added to nodes
peterschrammel Dec 4, 2016
4156c4f
Fix bugs in witness output of struct assignments
tautschnig Dec 18, 2016
375a2a8
Filter out duplicate source locations in witness
peterschrammel Dec 18, 2016
3679aee
Fix linter warnings
peterschrammel Dec 27, 2016
dd2d3b0
Code formatting in bmc.cpp (using string_utils)
tautschnig Dec 28, 2016
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
21 changes: 11 additions & 10 deletions src/cbmc/bmc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ Author: Daniel Kroening, [email protected]
#include <util/string2int.h>
#include <util/i2string.h>
#include <util/source_location.h>
#include <util/string_utils.h>
#include <util/time_stopping.h>
#include <util/message.h>
#include <util/json.h>
Expand Down Expand Up @@ -131,6 +132,8 @@ void bmct::output_graphml(
graphml_witnesst graphml_witness(ns);
if(result==UNSAFE)
graphml_witness(safety_checkert::error_trace);
else if(result==SAFE)
graphml_witness(equation);
else
return;

Expand Down Expand Up @@ -379,8 +382,9 @@ void bmct::show_program()
{
std::string string_value;
languages.from_expr(step.ssa_lhs, string_value);
std::cout << "(" << count << ") SHARED_" << (step.is_shared_write()?"WRITE":"READ") << "("
<< string_value <<") " << "\n";
std::cout << "(" << count << ") SHARED_"
<< (step.is_shared_write()?"WRITE":"READ")
<< "(" << string_value <<")\n";

if(!step.guard.is_true())
{
Expand Down Expand Up @@ -544,6 +548,7 @@ safety_checkert::resultt bmct::run(
symex.remaining_vccs==0)
{
report_success();
output_graphml(SAFE, goto_functions);
return safety_checkert::SAFE;
}

Expand Down Expand Up @@ -619,6 +624,7 @@ safety_checkert::resultt bmct::stop_on_fail(
{
case decision_proceduret::D_UNSATISFIABLE:
report_success();
output_graphml(SAFE, goto_functions);
return SAFE;

case decision_proceduret::D_SATISFIABLE:
Expand Down Expand Up @@ -661,13 +667,11 @@ Function: bmct::setup_unwind
void bmct::setup_unwind()
{
const std::string &set=options.get_option("unwindset");
std::string::size_type length=set.length();
std::vector<std::string> unwindset_loops;
split_string(set, ',', unwindset_loops, true, true);

for(std::string::size_type idx=0; idx<length; idx++)
for(auto & val : unwindset_loops)
{
std::string::size_type next=set.find(",", idx);
std::string val=set.substr(idx, next-idx);

unsigned thread_nr;
bool thread_nr_set=false;

Expand All @@ -691,9 +695,6 @@ void bmct::setup_unwind()
else
symex.set_unwind_loop_limit(id, uw);
}

if(next==std::string::npos) break;
idx=next;
}

if(options.get_option("unwind")!="")
Expand Down
Loading