replica
/
diffblue-cbmc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix include order in goto-symex

This commit is contained in:
reuk 2017-05-07 13:53:00 +01:00
parent 70b352c30e
commit a5c8a5fabd
27 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/goto-symex/adjust_float_expressions.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "adjust_float_expressions.h"
#include <util/cprover_prefix.h>
#include <util/expr_util.h>
#include <util/std_expr.h>
@ -18,8 +20,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <goto-programs/goto_model.h>
#include "adjust_float_expressions.h"
static bool have_to_adjust_float_expressions(
const exprt &expr,
const namespacet &ns)

4
src/goto-symex/auto_objects.cpp
View File

@ -9,13 +9,13 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution of ANSI-C
#include "goto_symex.h"
#include <util/prefix.h>
#include <util/cprover_prefix.h>
#include <util/symbol_table.h>
#include <util/std_expr.h>
#include "goto_symex.h"
exprt goto_symext::make_auto_object(const typet &type)
{
dynamic_counter++;

4
src/goto-symex/build_goto_trace.cpp
View File

@ -11,6 +11,8 @@ Author: Daniel Kroening
/// \file
/// Traces of GOTO Programs
#include "build_goto_trace.h"
#include <cassert>
#include <util/threeval.h>
@ -22,8 +24,6 @@ Author: Daniel Kroening
#include "partial_order_concurrency.h"
#include "build_goto_trace.h"
exprt build_full_lhs_rec(
const prop_convt &prop_conv,
const namespacet &ns,

4
src/goto-symex/goto_symex.cpp
View File

@ -9,10 +9,10 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include <util/simplify_expr.h>
#include "goto_symex.h"
#include <util/simplify_expr.h>
unsigned goto_symext::nondet_count=0;
unsigned goto_symext::dynamic_counter=0;

4
src/goto-symex/goto_symex_state.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "goto_symex_state.h"
#include <cstdlib>
#include <cassert>
#include <iostream>
@ -18,8 +20,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <analyses/dirty.h>
#include "goto_symex_state.h"
goto_symex_statet::goto_symex_statet():
depth(0),
symex_target(NULL),

4
src/goto-symex/memory_model.cpp
View File

@ -9,10 +9,10 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk
/// \file
/// Memory model for partial order concurrency
#include <util/std_expr.h>
#include "memory_model.h"
#include <util/std_expr.h>
memory_model_baset::memory_model_baset(const namespacet &_ns):
partial_order_concurrencyt(_ns),
var_cnt(0)

4
src/goto-symex/memory_model_sc.cpp
View File

@ -9,10 +9,10 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk
/// \file
/// Memory model for partial order concurrency
#include <util/std_expr.h>
#include "memory_model_sc.h"
#include <util/std_expr.h>
void memory_model_sct::operator()(symex_target_equationt &equation)
{
statistics() << "Adding SC constraints" << eom;

4
src/goto-symex/memory_model_tso.cpp
View File

@ -9,11 +9,11 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk
/// \file
/// Memory model for partial order concurrency
#include "memory_model_tso.h"
#include <util/std_expr.h>
#include <util/simplify_expr.h>
#include "memory_model_tso.h"
void memory_model_tsot::operator()(symex_target_equationt &equation)
{
statistics() << "Adding TSO constraints" << eom;

4
src/goto-symex/partial_order_concurrency.cpp
View File

@ -9,13 +9,13 @@ Author: Michael Tautschnig, michael.tautschnig@cs.ox.ac.uk
/// \file
/// Add constraints to equation encoding partial orders on events
#include "partial_order_concurrency.h"
#include <limits>
#include <util/arith_tools.h>
#include <util/simplify_expr.h>
#include "partial_order_concurrency.h"
partial_order_concurrencyt::partial_order_concurrencyt(
const namespacet &_ns):ns(_ns)
{

3
src/goto-symex/postcondition.cpp
View File

@ -9,11 +9,12 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "postcondition.h"
#include <util/find_symbols.h>
#include <util/std_expr.h>
#include "goto_symex_state.h"
#include "postcondition.h"
class postconditiont
{

3
src/goto-symex/precondition.cpp
View File

@ -9,12 +9,13 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "precondition.h"
#include <util/find_symbols.h>
#include <pointer-analysis/goto_program_dereference.h>
#include "goto_symex_state.h"
#include "precondition.h"
class preconditiont
{

4
src/goto-symex/rewrite_union.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution of ANSI-C
#include "rewrite_union.h"
#include <util/arith_tools.h>
#include <util/std_expr.h>
#include <util/std_code.h>
@ -18,8 +20,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <util/c_types.h>
#include "rewrite_union.h"
static bool have_to_rewrite_union(
const exprt &expr,
const namespacet &ns)

3
src/goto-symex/slice.cpp
View File

@ -9,9 +9,10 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Slicer for symex traces
#include "slice.h"
#include <util/std_expr.h>
#include "slice.h"
#include "symex_slice_class.h"
void symex_slicet::get_symbols(const exprt &expr)

4
src/goto-symex/slice_by_trace.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Slicer for symex traces
#include "slice_by_trace.h"
#include <cstring>
#include <set>
#include <fstream>
@ -22,8 +24,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <langapi/language_util.h>
#include "slice_by_trace.h"
void symex_slice_by_tracet::slice_by_trace(
std::string trace_files,
symex_target_equationt &equation)

3
src/goto-symex/symex_assign.cpp
View File

@ -9,12 +9,13 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "goto_symex.h"
#include <util/byte_operators.h>
#include <util/cprover_prefix.h>
#include <util/c_types.h>
#include "goto_symex.h"
#include "goto_symex_state.h"
// #define USE_UPDATE

3
src/goto-symex/symex_builtin_functions.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution of ANSI-C
#include "goto_symex.h"
#include <cassert>
#include <util/arith_tools.h>
@ -26,7 +28,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <linking/zero_initializer.h>
#include "goto_symex.h"
#include "goto_symex_state.h"
inline static typet c_sizeof_type_rec(const exprt &expr)

4
src/goto-symex/symex_clean_expr.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution of ANSI-C
#include "goto_symex.h"
#include <util/arith_tools.h>
#include <util/std_expr.h>
#include <util/cprover_prefix.h>
@ -16,8 +18,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <util/c_types.h>
#include "goto_symex.h"
void goto_symext::process_array_expr_rec(
exprt &expr,
const typet &type) const

4
src/goto-symex/symex_dead.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "goto_symex.h"
#include <cassert>
#include <util/rename.h>
@ -16,8 +18,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <pointer-analysis/add_failed_symbols.h>
#include "goto_symex.h"
void goto_symext::symex_dead(statet &state)
{
const goto_programt::instructiont &instruction=*state.source.pc;

4
src/goto-symex/symex_decl.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "goto_symex.h"
#include <cassert>
#include <util/rename.h>
@ -18,8 +20,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <analyses/dirty.h>
#include "goto_symex.h"
void goto_symext::symex_decl(statet &state)
{
const goto_programt::instructiont &instruction=*state.source.pc;

3
src/goto-symex/symex_dereference.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution of ANSI-C
#include "goto_symex.h"
#include <util/pointer_offset_size.h>
#include <util/arith_tools.h>
#include <util/base_type.h>
@ -20,7 +22,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <util/c_types.h>
#include "goto_symex.h"
#include "symex_dereference_state.h"
void goto_symext::dereference_rec_address_of(

4
src/goto-symex/symex_dereference_state.cpp
View File

@ -9,10 +9,10 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution of ANSI-C
#include <util/symbol_table.h>
#include "symex_dereference_state.h"
#include <util/symbol_table.h>
void symex_dereference_statet::dereference_failure(
const std::string &property,
const std::string &msg,

4
src/goto-symex/symex_function_call.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution of ANSI-C
#include "goto_symex.h"
#include <iostream>
#include <sstream>
#include <cassert>
@ -24,8 +26,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <analyses/dirty.h>
#include "goto_symex.h"
bool goto_symext::get_unwind_recursion(
const irep_idt &identifier,
const unsigned thread_nr,

4
src/goto-symex/symex_goto.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "goto_symex.h"
#include <cassert>
#include <algorithm>
@ -16,8 +18,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <analyses/dirty.h>
#include "goto_symex.h"
void goto_symext::symex_goto(statet &state)
{
const goto_programt::instructiont &instruction=*state.source.pc;

4
src/goto-symex/symex_main.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "goto_symex.h"
#include <cassert>
#include <util/std_expr.h>
@ -18,8 +20,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <analyses/dirty.h>
#include "goto_symex.h"
void goto_symext::symex_transition(
statet &state,
goto_programt::const_targett to,

4
src/goto-symex/symex_other.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "goto_symex.h"
#include <cassert>
#include <util/arith_tools.h>
@ -19,8 +21,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <util/c_types.h>
#include "goto_symex.h"
void goto_symext::symex_other(
const goto_functionst &goto_functions,
statet &state)

4
src/goto-symex/symex_start_thread.cpp
View File

@ -9,10 +9,10 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include <linking/zero_initializer.h>
#include "goto_symex.h"
#include <linking/zero_initializer.h>
void goto_symext::symex_start_thread(statet &state)
{
if(state.guard.is_false())

3
src/goto-symex/symex_target_equation.cpp
View File

@ -9,6 +9,8 @@ Author: Daniel Kroening, kroening@kroening.com
/// \file
/// Symbolic Execution
#include "symex_target_equation.h"
#include <cassert>
#include <util/std_expr.h>
@ -19,7 +21,6 @@ Author: Daniel Kroening, kroening@kroening.com
#include <solvers/prop/literal_expr.h>
#include "goto_symex_state.h"
#include "symex_target_equation.h"
symex_target_equationt::symex_target_equationt(
const namespacet &_ns):ns(_ns)