Merge pull request #953 from martin-cs/goto-analyzer-5-part1

Goto analyzer 5 part1

Author: Daniel Kroening

regression/Makefile

@@ -12,3 +12,10 @@ DIRS = ansi-c \
 
 test:
 	$(foreach var,$(DIRS), $(MAKE) -C $(var) test || exit 1;)
+
+clean:
+	@for dir in *; do \
+		if [ -d "$$dir" ]; then \
+			$(MAKE) -C "$$dir" clean; \
+		fi; \
+	done;

regression/goto-analyzer/constant_propagation_10/constant_propagation_10.c

@@ -4,7 +4,7 @@ int main()
   signed int i;
   signed int j;
   i = 0;
-   if(!(i >= 2))
+  if(!(i >= 2))
   {
     j = j + 1;
     i = i + 1;

src/analyses/dependence_graph.cpp

@@ -11,6 +11,9 @@ Date: August 2013
 
 #include <cassert>
 
+#include <util/json.h>
+#include <util/json_expr.h>
+
 #include "goto_rw.h"
 
 #include "dependence_graph.h"
@@ -347,6 +350,46 @@ void dep_graph_domaint::output(
 
 /*******************************************************************\
 
+Function: dep_graph_domaint::output_json
+
+  Inputs: The abstract interpreter and the namespace.
+
+ Outputs: The domain, formatted as a JSON object.
+
+ Purpose: Outputs the current value of the domain.
+
+\*******************************************************************/
+
+jsont dep_graph_domaint::output_json(
+  const ai_baset &ai,
+  const namespacet &ns) const
+{
+  json_arrayt graph;
+
+  for(const auto &cd : control_deps)
+  {
+    json_objectt &link=graph.push_back().make_object();
+    link["locationNumber"]=
+      json_numbert(std::to_string(cd->location_number));
+    link["sourceLocation"]=json(cd->source_location);
+    link["type"]=json_stringt("control");
+  }
+
+  for(const auto &dd : data_deps)
+  {
+    json_objectt &link=graph.push_back().make_object();
+    link["locationNumber"]=
+      json_numbert(std::to_string(dd->location_number));
+    link["sourceLocation"]=json(dd->source_location);
+      json_stringt(dd->source_location.as_string());
+    link["type"]=json_stringt("data");
+  }
+
+  return graph;
+}
+
+/*******************************************************************\
+
 Function: dependence_grapht::add_dep
 
   Inputs:

src/analyses/dependence_graph.h

@@ -87,7 +87,11 @@ class dep_graph_domaint:public ai_domain_baset
     const ai_baset &ai,
     const namespacet &ns) const final;
 
-  void make_top() final
+  jsont output_json(
+    const ai_baset &ai,
+    const namespacet &ns) const override;
+
+  void make_top() final override
   {
     assert(node_id!=std::numeric_limits<node_indext>::max());
 

src/analyses/interval_domain.cpp

@@ -157,8 +157,8 @@ bool interval_domaint::merge(
   for(int_mapt::iterator it=int_map.begin();
       it!=int_map.end(); ) // no it++
   {
-    //search for the variable that needs to be merged
-    //containers have different size and variable order
+    // search for the variable that needs to be merged
+    // containers have different size and variable order
     const int_mapt::const_iterator b_it=b.int_map.find(it->first);
     if(b_it==b.int_map.end())
     {

src/goto-instrument/goto_instrument_parse_options.cpp

@@ -506,16 +506,7 @@ int goto_instrument_parse_optionst::doit()
       reaching_definitions_analysist rd_analysis(ns);
       rd_analysis(goto_functions, ns);
 
-      forall_goto_functions(f_it, goto_functions)
-      {
-        if(f_it->second.body_available())
-        {
-          std::cout << "////\n";
-          std::cout << "//// Function: " << f_it->first << '\n';
-          std::cout << "////\n\n";
-          rd_analysis.output(ns, f_it->second.body, std::cout);
-        }
-      }
+      rd_analysis.output(ns, goto_functions, std::cout);
 
       return 0;
     }
@@ -528,17 +519,7 @@ int goto_instrument_parse_optionst::doit()
       dependence_grapht dependence_graph(ns);
       dependence_graph(goto_functions, ns);
 
-      forall_goto_functions(f_it, goto_functions)
-      {
-        if(f_it->second.body_available())
-        {
-          std::cout << "////\n";
-          std::cout << "//// Function: " << f_it->first << '\n';
-          std::cout << "////\n\n";
-          dependence_graph.output(ns, f_it->second.body, std::cout);
-        }
-      }
-
+      dependence_graph.output(ns, goto_functions, std::cout);
       dependence_graph.output_dot(std::cout);
 
       return 0;

src/goto-programs/remove_unreachable.cpp

@@ -55,3 +55,9 @@ void remove_unreachable(goto_programt &goto_program)
       it->make_skip();
   }
 }
+
+void remove_unreachable(goto_functionst &goto_functions)
+{
+  Forall_goto_functions(f_it, goto_functions)
+    remove_unreachable(f_it->second.body);
+}

src/goto-programs/remove_unreachable.h

@@ -12,5 +12,6 @@ Author: Daniel Kroening, [email protected]
 #include "goto_functions.h"
 
 void remove_unreachable(goto_programt &goto_program);
+void remove_unreachable(goto_functionst &goto_functions);
 
 #endif // CPROVER_GOTO_PROGRAMS_REMOVE_UNREACHABLE_H