diff options
23 files changed, 24 insertions, 22 deletions
diff --git a/include/klee/util/BitArray.h b/include/klee/ADT/BitArray.h index 029e130f..029e130f 100644 --- a/include/klee/util/BitArray.h +++ b/include/klee/ADT/BitArray.h diff --git a/include/klee/util/Bits.h b/include/klee/ADT/Bits.h index 5f64e244..5f64e244 100644 --- a/include/klee/util/Bits.h +++ b/include/klee/ADT/Bits.h diff --git a/include/klee/util/Ref.h b/include/klee/ADT/Ref.h index 92fd1740..92fd1740 100644 --- a/include/klee/util/Ref.h +++ b/include/klee/ADT/Ref.h diff --git a/include/klee/Expr/ArrayExprOptimizer.h b/include/klee/Expr/ArrayExprOptimizer.h index 8fc040e5..015ed1a2 100644 --- a/include/klee/Expr/ArrayExprOptimizer.h +++ b/include/klee/Expr/ArrayExprOptimizer.h @@ -17,9 +17,9 @@ #include <utility> #include <vector> +#include "klee/ADT/Ref.h" #include "klee/Expr/Expr.h" #include "klee/Expr/ExprHashMap.h" -#include "klee/util/Ref.h" namespace klee { diff --git a/include/klee/Expr/ArrayExprRewriter.h b/include/klee/Expr/ArrayExprRewriter.h index 098cb0a6..11627906 100644 --- a/include/klee/Expr/ArrayExprRewriter.h +++ b/include/klee/Expr/ArrayExprRewriter.h @@ -14,8 +14,8 @@ #include <map> #include <vector> +#include "klee/ADT/Ref.h" #include "klee/Expr/Expr.h" -#include "klee/util/Ref.h" namespace klee { diff --git a/include/klee/Expr/AssignmentGenerator.h b/include/klee/Expr/AssignmentGenerator.h index 173b863e..cf656d91 100644 --- a/include/klee/Expr/AssignmentGenerator.h +++ b/include/klee/Expr/AssignmentGenerator.h @@ -10,8 +10,8 @@ #ifndef KLEE_ASSIGNMENTGENERATOR_H #define KLEE_ASSIGNMENTGENERATOR_H +#include "klee/ADT/Ref.h" #include "klee/Expr/Expr.h" -#include "klee/util/Ref.h" #include <vector> diff --git a/include/klee/Expr/Expr.h b/include/klee/Expr/Expr.h index 374fc541..c5d1e7bb 100644 --- a/include/klee/Expr/Expr.h +++ b/include/klee/Expr/Expr.h @@ -10,9 +10,8 @@ #ifndef KLEE_EXPR_H #define KLEE_EXPR_H -#include "klee/util/Bits.h" -#include "klee/util/Ref.h" - +#include "klee/ADT/Bits.h" +#include "klee/ADT/Ref.h" #include "llvm/ADT/APFloat.h" #include "llvm/ADT/APInt.h" #include "llvm/ADT/DenseSet.h" diff --git a/include/klee/Expr/ExprRangeEvaluator.h b/include/klee/Expr/ExprRangeEvaluator.h index 540ccafd..a8a0f6b8 100644 --- a/include/klee/Expr/ExprRangeEvaluator.h +++ b/include/klee/Expr/ExprRangeEvaluator.h @@ -10,8 +10,8 @@ #ifndef KLEE_EXPRRANGEEVALUATOR_H #define KLEE_EXPRRANGEEVALUATOR_H +#include "klee/ADT/Bits.h" #include "klee/Expr/Expr.h" -#include "klee/util/Bits.h" namespace klee { diff --git a/include/klee/Expr/ExprSMTLIBPrinter.h b/include/klee/Expr/ExprSMTLIBPrinter.h index 38ae2fa1..290caf7b 100644 --- a/include/klee/Expr/ExprSMTLIBPrinter.h +++ b/include/klee/Expr/ExprSMTLIBPrinter.h @@ -14,7 +14,7 @@ #include "klee/Expr/Constraints.h" #include "klee/Expr/Expr.h" #include "klee/Solver/Solver.h" -#include "klee/util/PrintContext.h" +#include "klee/Support/PrintContext.h" #include <map> #include <set> diff --git a/include/klee/Support/FloatEvaluation.h b/include/klee/Support/FloatEvaluation.h index 37392576..d6fcc73c 100644 --- a/include/klee/Support/FloatEvaluation.h +++ b/include/klee/Support/FloatEvaluation.h @@ -12,8 +12,9 @@ #ifndef KLEE_FLOATEVALUATION_H #define KLEE_FLOATEVALUATION_H -#include "klee/util/Bits.h" //bits64::truncateToNBits -#include "IntEvaluation.h" //ints::sext +#include "IntEvaluation.h" // ints::sext + +#include "klee/ADT/Bits.h" // bits64::truncateToNBits #include "llvm/Support/ErrorHandling.h" #include "llvm/Support/MathExtras.h" diff --git a/include/klee/Support/IntEvaluation.h b/include/klee/Support/IntEvaluation.h index 27a8daf0..0e9a40d6 100644 --- a/include/klee/Support/IntEvaluation.h +++ b/include/klee/Support/IntEvaluation.h @@ -10,7 +10,7 @@ #ifndef KLEE_INTEVALUATION_H #define KLEE_INTEVALUATION_H -#include "klee/util/Bits.h" +#include "klee/ADT/Bits.h" #define MAX_BITS (sizeof(uint64_t) * 8) diff --git a/include/klee/util/PrintContext.h b/include/klee/Support/PrintContext.h index de9094da..de9094da 100644 --- a/include/klee/util/PrintContext.h +++ b/include/klee/Support/PrintContext.h diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 693ac006..0664e606 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -13,6 +13,7 @@ #include "CoreStats.h" #include "ExecutionState.h" #include "ExternalDispatcher.h" +#include "GetElementPtrTypeIterator.h" #include "ImpliedValue.h" #include "Memory.h" #include "MemoryManager.h" @@ -49,7 +50,6 @@ #include "klee/System/MemoryUsage.h" #include "klee/System/Time.h" #include "klee/TimerStatIncrementer.h" -#include "klee/util/GetElementPtrTypeIterator.h" #include "llvm/ADT/SmallPtrSet.h" #include "llvm/ADT/StringExtras.h" diff --git a/include/klee/util/GetElementPtrTypeIterator.h b/lib/Core/GetElementPtrTypeIterator.h index cdbc36bc..cdbc36bc 100644 --- a/include/klee/util/GetElementPtrTypeIterator.h +++ b/lib/Core/GetElementPtrTypeIterator.h diff --git a/lib/Core/Memory.cpp b/lib/Core/Memory.cpp index b93373b8..35b09011 100644 --- a/lib/Core/Memory.cpp +++ b/lib/Core/Memory.cpp @@ -18,7 +18,6 @@ #include "klee/OptionCategories.h" #include "klee/Solver/Solver.h" #include "klee/Support/ErrorHandling.h" -#include "klee/util/BitArray.h" #include "llvm/IR/Function.h" #include "llvm/IR/Instruction.h" diff --git a/lib/Core/MergeHandler.h b/lib/Core/MergeHandler.h index 48b67467..f7380415 100644 --- a/lib/Core/MergeHandler.h +++ b/lib/Core/MergeHandler.h @@ -69,8 +69,10 @@ #ifndef KLEE_MERGEHANDLER_H #define KLEE_MERGEHANDLER_H -#include "klee/util/Ref.h" +#include "klee/ADT/Ref.h" + #include "llvm/Support/CommandLine.h" + #include <map> #include <stdint.h> #include <vector> diff --git a/lib/Expr/ArrayExprOptimizer.cpp b/lib/Expr/ArrayExprOptimizer.cpp index 6e10461f..bb949fac 100644 --- a/lib/Expr/ArrayExprOptimizer.cpp +++ b/lib/Expr/ArrayExprOptimizer.cpp @@ -9,6 +9,7 @@ #include "klee/Expr/ArrayExprOptimizer.h" +#include "klee/ADT/BitArray.h" #include "klee/Config/Version.h" #include "klee/Expr/ArrayExprRewriter.h" #include "klee/Expr/ArrayExprVisitor.h" @@ -17,7 +18,6 @@ #include "klee/Expr/ExprBuilder.h" #include "klee/OptionCategories.h" #include "klee/Support/ErrorHandling.h" -#include "klee/util/BitArray.h" #include <llvm/ADT/APInt.h> #include <llvm/Support/Casting.h> diff --git a/lib/Expr/ArrayExprRewriter.cpp b/lib/Expr/ArrayExprRewriter.cpp index 32851679..4de76d43 100644 --- a/lib/Expr/ArrayExprRewriter.cpp +++ b/lib/Expr/ArrayExprRewriter.cpp @@ -9,8 +9,8 @@ #include "klee/Expr/ArrayExprRewriter.h" +#include "klee/ADT/BitArray.h" #include "klee/Expr/ArrayExprVisitor.h" -#include "klee/util/BitArray.h" #include <llvm/ADT/APInt.h> #include <llvm/Support/Casting.h> diff --git a/lib/Expr/ExprPPrinter.cpp b/lib/Expr/ExprPPrinter.cpp index 9d34e356..50a61cfd 100644 --- a/lib/Expr/ExprPPrinter.cpp +++ b/lib/Expr/ExprPPrinter.cpp @@ -11,7 +11,7 @@ #include "klee/Expr/Constraints.h" #include "klee/OptionCategories.h" -#include "klee/util/PrintContext.h" +#include "klee/Support/PrintContext.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Solver/ConstantDivision.cpp b/lib/Solver/ConstantDivision.cpp index 8ebf39ad..d822de1a 100644 --- a/lib/Solver/ConstantDivision.cpp +++ b/lib/Solver/ConstantDivision.cpp @@ -9,7 +9,7 @@ #include "ConstantDivision.h" -#include "klee/util/Bits.h" +#include "klee/ADT/Bits.h" #include <algorithm> #include <cassert> diff --git a/lib/Solver/STPBuilder.cpp b/lib/Solver/STPBuilder.cpp index 5857e6f0..9fd9dc8e 100644 --- a/lib/Solver/STPBuilder.cpp +++ b/lib/Solver/STPBuilder.cpp @@ -10,10 +10,10 @@ #ifdef ENABLE_STP #include "STPBuilder.h" +#include "klee/ADT/Bits.h" #include "klee/Expr/Expr.h" #include "klee/Solver/Solver.h" #include "klee/Solver/SolverStats.h" -#include "klee/util/Bits.h" #include "ConstantDivision.h" diff --git a/lib/Solver/Z3Builder.cpp b/lib/Solver/Z3Builder.cpp index 7db377eb..ce584175 100644 --- a/lib/Solver/Z3Builder.cpp +++ b/lib/Solver/Z3Builder.cpp @@ -10,11 +10,11 @@ #ifdef ENABLE_Z3 #include "Z3Builder.h" +#include "klee/ADT/Bits.h" #include "klee/Expr/Expr.h" -#include "klee/Support/ErrorHandling.h" #include "klee/Solver/Solver.h" #include "klee/Solver/SolverStats.h" -#include "klee/util/Bits.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/ADT/StringExtras.h" #include "llvm/Support/CommandLine.h" diff --git a/unittests/Ref/RefTest.cpp b/unittests/Ref/RefTest.cpp index 17ab88e5..bf313513 100644 --- a/unittests/Ref/RefTest.cpp +++ b/unittests/Ref/RefTest.cpp @@ -11,9 +11,10 @@ More details at http://keeda.stanford.edu/pipermail/klee-commits/2012-February/000904.html */ -#include "klee/util/Ref.h" +#include "klee/ADT/Ref.h" #include "gtest/gtest.h" #include <iostream> + using klee::ref; int finished = 0; |