diff options
93 files changed, 134 insertions, 137 deletions
diff --git a/include/klee/Internal/ADT/DiscretePDF.h b/include/klee/ADT/DiscretePDF.h index 74a1ce9e..74a1ce9e 100644 --- a/include/klee/Internal/ADT/DiscretePDF.h +++ b/include/klee/ADT/DiscretePDF.h diff --git a/include/klee/Internal/ADT/DiscretePDF.inc b/include/klee/ADT/DiscretePDF.inc index 743a69b5..743a69b5 100644 --- a/include/klee/Internal/ADT/DiscretePDF.inc +++ b/include/klee/ADT/DiscretePDF.inc diff --git a/include/klee/Internal/ADT/ImmutableMap.h b/include/klee/ADT/ImmutableMap.h index a7a18a89..a7a18a89 100644 --- a/include/klee/Internal/ADT/ImmutableMap.h +++ b/include/klee/ADT/ImmutableMap.h diff --git a/include/klee/Internal/ADT/ImmutableSet.h b/include/klee/ADT/ImmutableSet.h index 1618e559..1618e559 100644 --- a/include/klee/Internal/ADT/ImmutableSet.h +++ b/include/klee/ADT/ImmutableSet.h diff --git a/include/klee/Internal/ADT/ImmutableTree.h b/include/klee/ADT/ImmutableTree.h index ada3c211..ada3c211 100644 --- a/include/klee/Internal/ADT/ImmutableTree.h +++ b/include/klee/ADT/ImmutableTree.h diff --git a/include/klee/Internal/ADT/KTest.h b/include/klee/ADT/KTest.h index 5b5c45ef..5b5c45ef 100644 --- a/include/klee/Internal/ADT/KTest.h +++ b/include/klee/ADT/KTest.h diff --git a/include/klee/Internal/ADT/MapOfSets.h b/include/klee/ADT/MapOfSets.h index b30934d8..b30934d8 100644 --- a/include/klee/Internal/ADT/MapOfSets.h +++ b/include/klee/ADT/MapOfSets.h diff --git a/include/klee/Internal/ADT/RNG.h b/include/klee/ADT/RNG.h index 5ea375b5..5ea375b5 100644 --- a/include/klee/Internal/ADT/RNG.h +++ b/include/klee/ADT/RNG.h diff --git a/include/klee/Internal/ADT/TreeStream.h b/include/klee/ADT/TreeStream.h index 32c856c9..32c856c9 100644 --- a/include/klee/Internal/ADT/TreeStream.h +++ b/include/klee/ADT/TreeStream.h diff --git a/include/klee/ExecutionState.h b/include/klee/ExecutionState.h index e647d0ab..b5625a00 100644 --- a/include/klee/ExecutionState.h +++ b/include/klee/ExecutionState.h @@ -12,13 +12,13 @@ #include "klee/Expr/Constraints.h" #include "klee/Expr/Expr.h" -#include "klee/Internal/ADT/TreeStream.h" -#include "klee/Internal/System/Time.h" +#include "klee/ADT/TreeStream.h" +#include "klee/System/Time.h" #include "klee/MergeHandler.h" // FIXME: We do not want to be exposing these? :( #include "../../lib/Core/AddressSpace.h" -#include "klee/Internal/Module/KInstIterator.h" +#include "klee/Module/KInstIterator.h" #include <map> #include <set> diff --git a/include/klee/Internal/README.txt b/include/klee/Internal/README.txt deleted file mode 100644 index 9cedb653..00000000 --- a/include/klee/Internal/README.txt +++ /dev/null @@ -1,3 +0,0 @@ -This directory holds header files for things which are exposed as part -of the internal API of a library, but shouldn't be exposed to -externally. diff --git a/include/klee/Internal/Module/Cell.h b/include/klee/Module/Cell.h index c7d9ae18..c7d9ae18 100644 --- a/include/klee/Internal/Module/Cell.h +++ b/include/klee/Module/Cell.h diff --git a/include/klee/Internal/Module/InstructionInfoTable.h b/include/klee/Module/InstructionInfoTable.h index e3684802..e3684802 100644 --- a/include/klee/Internal/Module/InstructionInfoTable.h +++ b/include/klee/Module/InstructionInfoTable.h diff --git a/include/klee/Internal/Module/KInstIterator.h b/include/klee/Module/KInstIterator.h index e5bd37f8..e5bd37f8 100644 --- a/include/klee/Internal/Module/KInstIterator.h +++ b/include/klee/Module/KInstIterator.h diff --git a/include/klee/Internal/Module/KInstruction.h b/include/klee/Module/KInstruction.h index d641b4e3..2873db45 100644 --- a/include/klee/Internal/Module/KInstruction.h +++ b/include/klee/Module/KInstruction.h @@ -11,7 +11,7 @@ #define KLEE_KINSTRUCTION_H #include "klee/Config/Version.h" -#include "klee/Internal/Module/InstructionInfoTable.h" +#include "klee/Module/InstructionInfoTable.h" #include "llvm/Support/DataTypes.h" #include "llvm/Support/raw_ostream.h" diff --git a/include/klee/Internal/Module/KModule.h b/include/klee/Module/KModule.h index 89606e2e..89606e2e 100644 --- a/include/klee/Internal/Module/KModule.h +++ b/include/klee/Module/KModule.h diff --git a/include/klee/Solver/Solver.h b/include/klee/Solver/Solver.h index fe4d7e88..ec107c20 100644 --- a/include/klee/Solver/Solver.h +++ b/include/klee/Solver/Solver.h @@ -11,7 +11,7 @@ #define KLEE_SOLVER_H #include "klee/Expr/Expr.h" -#include "klee/Internal/System/Time.h" +#include "klee/System/Time.h" #include "klee/Solver/SolverCmdLine.h" #include <vector> diff --git a/include/klee/Solver/SolverImpl.h b/include/klee/Solver/SolverImpl.h index 90d5af24..f03db964 100644 --- a/include/klee/Solver/SolverImpl.h +++ b/include/klee/Solver/SolverImpl.h @@ -10,7 +10,7 @@ #ifndef KLEE_SOLVERIMPL_H #define KLEE_SOLVERIMPL_H -#include "klee/Internal/System/Time.h" +#include "klee/System/Time.h" #include "Solver.h" #include <vector> diff --git a/include/klee/Internal/Support/CompressionStream.h b/include/klee/Support/CompressionStream.h index bc9119dd..bc9119dd 100644 --- a/include/klee/Internal/Support/CompressionStream.h +++ b/include/klee/Support/CompressionStream.h diff --git a/include/klee/Internal/Support/Debug.h b/include/klee/Support/Debug.h index 0fe7906a..0fe7906a 100644 --- a/include/klee/Internal/Support/Debug.h +++ b/include/klee/Support/Debug.h diff --git a/include/klee/Internal/Support/ErrorHandling.h b/include/klee/Support/ErrorHandling.h index 92762c03..92762c03 100644 --- a/include/klee/Internal/Support/ErrorHandling.h +++ b/include/klee/Support/ErrorHandling.h diff --git a/include/klee/Internal/Support/FileHandling.h b/include/klee/Support/FileHandling.h index 90ce20b3..90ce20b3 100644 --- a/include/klee/Internal/Support/FileHandling.h +++ b/include/klee/Support/FileHandling.h diff --git a/include/klee/Internal/Support/FloatEvaluation.h b/include/klee/Support/FloatEvaluation.h index 37392576..37392576 100644 --- a/include/klee/Internal/Support/FloatEvaluation.h +++ b/include/klee/Support/FloatEvaluation.h diff --git a/include/klee/Internal/Support/IntEvaluation.h b/include/klee/Support/IntEvaluation.h index 27a8daf0..27a8daf0 100644 --- a/include/klee/Internal/Support/IntEvaluation.h +++ b/include/klee/Support/IntEvaluation.h diff --git a/include/klee/Internal/Support/ModuleUtil.h b/include/klee/Support/ModuleUtil.h index e80fc673..e80fc673 100644 --- a/include/klee/Internal/Support/ModuleUtil.h +++ b/include/klee/Support/ModuleUtil.h diff --git a/include/klee/Internal/Support/PrintVersion.h b/include/klee/Support/PrintVersion.h index fbd20e39..fbd20e39 100644 --- a/include/klee/Internal/Support/PrintVersion.h +++ b/include/klee/Support/PrintVersion.h diff --git a/include/klee/Internal/Support/Timer.h b/include/klee/Support/Timer.h index 30b1b758..48cbbdea 100644 --- a/include/klee/Internal/Support/Timer.h +++ b/include/klee/Support/Timer.h @@ -10,7 +10,7 @@ #ifndef KLEE_TIMER_H #define KLEE_TIMER_H -#include "klee/Internal/System/Time.h" +#include "klee/System/Time.h" #include "llvm/ADT/SmallVector.h" diff --git a/include/klee/Internal/System/MemoryUsage.h b/include/klee/System/MemoryUsage.h index c3cf3c74..c3cf3c74 100644 --- a/include/klee/Internal/System/MemoryUsage.h +++ b/include/klee/System/MemoryUsage.h diff --git a/include/klee/Internal/System/Time.h b/include/klee/System/Time.h index 2ebebdfd..2ebebdfd 100644 --- a/include/klee/Internal/System/Time.h +++ b/include/klee/System/Time.h diff --git a/include/klee/TimerStatIncrementer.h b/include/klee/TimerStatIncrementer.h index c467c82b..26ead0e6 100644 --- a/include/klee/TimerStatIncrementer.h +++ b/include/klee/TimerStatIncrementer.h @@ -11,7 +11,7 @@ #define KLEE_TIMERSTATINCREMENTER_H #include "klee/Statistics.h" -#include "klee/Internal/Support/Timer.h" +#include "klee/Support/Timer.h" namespace klee { diff --git a/lib/Basic/KTest.cpp b/lib/Basic/KTest.cpp index 0e8c545c..978a15db 100644 --- a/lib/Basic/KTest.cpp +++ b/lib/Basic/KTest.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "klee/Internal/ADT/KTest.h" +#include "klee/ADT/KTest.h" #include <stdlib.h> #include <string.h> diff --git a/lib/Core/AddressSpace.h b/lib/Core/AddressSpace.h index 10310a1e..bcd4b13d 100644 --- a/lib/Core/AddressSpace.h +++ b/lib/Core/AddressSpace.h @@ -12,8 +12,8 @@ #include "Memory.h" #include "klee/Expr/Expr.h" -#include "klee/Internal/ADT/ImmutableMap.h" -#include "klee/Internal/System/Time.h" +#include "klee/ADT/ImmutableMap.h" +#include "klee/System/Time.h" namespace klee { class ExecutionState; diff --git a/lib/Core/ExecutionState.cpp b/lib/Core/ExecutionState.cpp index eadf7e11..e526a5fa 100644 --- a/lib/Core/ExecutionState.cpp +++ b/lib/Core/ExecutionState.cpp @@ -12,10 +12,10 @@ #include "klee/ExecutionState.h" #include "klee/Expr/Expr.h" -#include "klee/Internal/Module/Cell.h" -#include "klee/Internal/Module/InstructionInfoTable.h" -#include "klee/Internal/Module/KInstruction.h" -#include "klee/Internal/Module/KModule.h" +#include "klee/Module/Cell.h" +#include "klee/Module/InstructionInfoTable.h" +#include "klee/Module/KInstruction.h" +#include "klee/Module/KModule.h" #include "klee/OptionCategories.h" #include "llvm/IR/Function.h" diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp index 8845f11d..a3e84486 100644 --- a/lib/Core/Executor.cpp +++ b/lib/Core/Executor.cpp @@ -32,18 +32,18 @@ #include "klee/Expr/ExprPPrinter.h" #include "klee/Expr/ExprSMTLIBPrinter.h" #include "klee/Expr/ExprUtil.h" -#include "klee/Internal/ADT/KTest.h" -#include "klee/Internal/ADT/RNG.h" -#include "klee/Internal/Module/Cell.h" -#include "klee/Internal/Module/InstructionInfoTable.h" -#include "klee/Internal/Module/KInstruction.h" -#include "klee/Internal/Module/KModule.h" -#include "klee/Internal/Support/ErrorHandling.h" -#include "klee/Internal/Support/FileHandling.h" -#include "klee/Internal/Support/FloatEvaluation.h" -#include "klee/Internal/Support/ModuleUtil.h" -#include "klee/Internal/System/MemoryUsage.h" -#include "klee/Internal/System/Time.h" +#include "klee/ADT/KTest.h" +#include "klee/ADT/RNG.h" +#include "klee/Module/Cell.h" +#include "klee/Module/InstructionInfoTable.h" +#include "klee/Module/KInstruction.h" +#include "klee/Module/KModule.h" +#include "klee/Support/ErrorHandling.h" +#include "klee/Support/FileHandling.h" +#include "klee/Support/FloatEvaluation.h" +#include "klee/Support/ModuleUtil.h" +#include "klee/System/MemoryUsage.h" +#include "klee/System/Time.h" #include "klee/Interpreter.h" #include "klee/OptionCategories.h" #include "klee/Solver/SolverCmdLine.h" diff --git a/lib/Core/Executor.h b/lib/Core/Executor.h index bf81a1d7..374dd30b 100644 --- a/lib/Core/Executor.h +++ b/lib/Core/Executor.h @@ -17,10 +17,10 @@ #include "klee/ExecutionState.h" #include "klee/Expr/ArrayCache.h" -#include "klee/Internal/Module/Cell.h" -#include "klee/Internal/Module/KInstruction.h" -#include "klee/Internal/Module/KModule.h" -#include "klee/Internal/System/Time.h" +#include "klee/Module/Cell.h" +#include "klee/Module/KInstruction.h" +#include "klee/Module/KModule.h" +#include "klee/System/Time.h" #include "klee/Interpreter.h" #include "llvm/ADT/Twine.h" diff --git a/lib/Core/ExecutorUtil.cpp b/lib/Core/ExecutorUtil.cpp index 9cd74355..1e5fc7b0 100644 --- a/lib/Core/ExecutorUtil.cpp +++ b/lib/Core/ExecutorUtil.cpp @@ -13,8 +13,8 @@ #include "klee/Config/Version.h" #include "klee/Expr/Expr.h" -#include "klee/Internal/Module/KModule.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Module/KModule.h" +#include "klee/Support/ErrorHandling.h" #include "klee/Interpreter.h" #include "klee/Solver/Solver.h" diff --git a/lib/Core/ImpliedValue.cpp b/lib/Core/ImpliedValue.cpp index 6a17c870..8be796d1 100644 --- a/lib/Core/ImpliedValue.cpp +++ b/lib/Core/ImpliedValue.cpp @@ -14,7 +14,7 @@ #include "klee/Expr/Constraints.h" #include "klee/Expr/Expr.h" #include "klee/Expr/ExprUtil.h" -#include "klee/Internal/Support/IntEvaluation.h" // FIXME: Use APInt +#include "klee/Support/IntEvaluation.h" // FIXME: Use APInt #include "klee/Solver/Solver.h" #include <map> diff --git a/lib/Core/Memory.cpp b/lib/Core/Memory.cpp index ce537a4c..e369dd1a 100644 --- a/lib/Core/Memory.cpp +++ b/lib/Core/Memory.cpp @@ -14,7 +14,7 @@ #include "klee/Expr/ArrayCache.h" #include "klee/Expr/Expr.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "klee/OptionCategories.h" #include "klee/Solver/Solver.h" #include "klee/util/BitArray.h" diff --git a/lib/Core/MemoryManager.cpp b/lib/Core/MemoryManager.cpp index af3a2f26..e3fffd9b 100644 --- a/lib/Core/MemoryManager.cpp +++ b/lib/Core/MemoryManager.cpp @@ -13,7 +13,7 @@ #include "Memory.h" #include "klee/Expr/Expr.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/MathExtras.h" diff --git a/lib/Core/Searcher.cpp b/lib/Core/Searcher.cpp index 1e9e5b9b..87ef98ad 100644 --- a/lib/Core/Searcher.cpp +++ b/lib/Core/Searcher.cpp @@ -17,14 +17,14 @@ #include "klee/ExecutionState.h" #include "klee/MergeHandler.h" #include "klee/Statistics.h" -#include "klee/Internal/Module/InstructionInfoTable.h" -#include "klee/Internal/Module/KInstruction.h" -#include "klee/Internal/Module/KModule.h" -#include "klee/Internal/ADT/DiscretePDF.h" -#include "klee/Internal/ADT/RNG.h" -#include "klee/Internal/Support/ModuleUtil.h" -#include "klee/Internal/System/Time.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Module/InstructionInfoTable.h" +#include "klee/Module/KInstruction.h" +#include "klee/Module/KModule.h" +#include "klee/ADT/DiscretePDF.h" +#include "klee/ADT/RNG.h" +#include "klee/Support/ModuleUtil.h" +#include "klee/System/Time.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/IR/CallSite.h" #include "llvm/IR/Constants.h" #include "llvm/IR/Instructions.h" diff --git a/lib/Core/Searcher.h b/lib/Core/Searcher.h index f1e093db..b369057b 100644 --- a/lib/Core/Searcher.h +++ b/lib/Core/Searcher.h @@ -10,7 +10,7 @@ #ifndef KLEE_SEARCHER_H #define KLEE_SEARCHER_H -#include "klee/Internal/System/Time.h" +#include "klee/System/Time.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Core/SeedInfo.cpp b/lib/Core/SeedInfo.cpp index a896197b..7c3957d2 100644 --- a/lib/Core/SeedInfo.cpp +++ b/lib/Core/SeedInfo.cpp @@ -14,8 +14,8 @@ #include "klee/ExecutionState.h" #include "klee/Expr/Expr.h" #include "klee/Expr/ExprUtil.h" -#include "klee/Internal/ADT/KTest.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/ADT/KTest.h" +#include "klee/Support/ErrorHandling.h" using namespace klee; diff --git a/lib/Core/SpecialFunctionHandler.cpp b/lib/Core/SpecialFunctionHandler.cpp index f1a11212..1d6db7e0 100644 --- a/lib/Core/SpecialFunctionHandler.cpp +++ b/lib/Core/SpecialFunctionHandler.cpp @@ -16,10 +16,10 @@ #include "TimingSolver.h" #include "klee/ExecutionState.h" -#include "klee/Internal/Module/KInstruction.h" -#include "klee/Internal/Module/KModule.h" -#include "klee/Internal/Support/Debug.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Module/KInstruction.h" +#include "klee/Module/KModule.h" +#include "klee/Support/Debug.h" +#include "klee/Support/ErrorHandling.h" #include "klee/MergeHandler.h" #include "klee/OptionCategories.h" #include "klee/Solver/SolverCmdLine.h" diff --git a/lib/Core/StatsTracker.cpp b/lib/Core/StatsTracker.cpp index 0c2886b8..fba20cdd 100644 --- a/lib/Core/StatsTracker.cpp +++ b/lib/Core/StatsTracker.cpp @@ -12,12 +12,12 @@ #include "klee/ExecutionState.h" #include "klee/Statistics.h" #include "klee/Config/Version.h" -#include "klee/Internal/Module/InstructionInfoTable.h" -#include "klee/Internal/Module/KModule.h" -#include "klee/Internal/Module/KInstruction.h" -#include "klee/Internal/Support/ModuleUtil.h" -#include "klee/Internal/System/MemoryUsage.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Module/InstructionInfoTable.h" +#include "klee/Module/KModule.h" +#include "klee/Module/KInstruction.h" +#include "klee/Support/ModuleUtil.h" +#include "klee/System/MemoryUsage.h" +#include "klee/Support/ErrorHandling.h" #include "klee/Solver/SolverStats.h" #include "CallPathManager.h" diff --git a/lib/Core/StatsTracker.h b/lib/Core/StatsTracker.h index 98041464..e0234413 100644 --- a/lib/Core/StatsTracker.h +++ b/lib/Core/StatsTracker.h @@ -11,7 +11,7 @@ #define KLEE_STATSTRACKER_H #include "CallPathManager.h" -#include "klee/Internal/System/Time.h" +#include "klee/System/Time.h" #include <memory> #include <set> diff --git a/lib/Core/TimingSolver.h b/lib/Core/TimingSolver.h index d74572b8..f6dfd5b9 100644 --- a/lib/Core/TimingSolver.h +++ b/lib/Core/TimingSolver.h @@ -12,7 +12,7 @@ #include "klee/Expr/Expr.h" #include "klee/Solver/Solver.h" -#include "klee/Internal/System/Time.h" +#include "klee/System/Time.h" #include <vector> diff --git a/lib/Core/UserSearcher.cpp b/lib/Core/UserSearcher.cpp index 22098231..a7982115 100644 --- a/lib/Core/UserSearcher.cpp +++ b/lib/Core/UserSearcher.cpp @@ -12,7 +12,7 @@ #include "Searcher.h" #include "Executor.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "klee/MergeHandler.h" #include "klee/Solver/SolverCmdLine.h" diff --git a/lib/Expr/ArrayExprOptimizer.cpp b/lib/Expr/ArrayExprOptimizer.cpp index d80cc3bc..c3be0690 100644 --- a/lib/Expr/ArrayExprOptimizer.cpp +++ b/lib/Expr/ArrayExprOptimizer.cpp @@ -15,7 +15,7 @@ #include "klee/Config/Version.h" #include "klee/Expr/Assignment.h" #include "klee/Expr/ExprBuilder.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "klee/OptionCategories.h" #include "klee/util/BitArray.h" diff --git a/lib/Expr/ArrayExprVisitor.cpp b/lib/Expr/ArrayExprVisitor.cpp index 986360f7..dd82c4d6 100644 --- a/lib/Expr/ArrayExprVisitor.cpp +++ b/lib/Expr/ArrayExprVisitor.cpp @@ -9,7 +9,7 @@ #include "ArrayExprVisitor.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include <algorithm> diff --git a/lib/Expr/AssignmentGenerator.cpp b/lib/Expr/AssignmentGenerator.cpp index acb2dc13..0301b702 100644 --- a/lib/Expr/AssignmentGenerator.cpp +++ b/lib/Expr/AssignmentGenerator.cpp @@ -10,7 +10,7 @@ #include "AssignmentGenerator.h" #include "klee/Expr/Assignment.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "klee/klee.h" #include <llvm/ADT/APInt.h> diff --git a/lib/Expr/Constraints.cpp b/lib/Expr/Constraints.cpp index 2b5adc4c..abf3eafe 100644 --- a/lib/Expr/Constraints.cpp +++ b/lib/Expr/Constraints.cpp @@ -11,7 +11,7 @@ #include "klee/Expr/ExprPPrinter.h" #include "klee/Expr/ExprVisitor.h" -#include "klee/Internal/Module/KModule.h" +#include "klee/Module/KModule.h" #include "klee/OptionCategories.h" #include "llvm/IR/Function.h" diff --git a/lib/Expr/Expr.cpp b/lib/Expr/Expr.cpp index b798bc37..1deda550 100644 --- a/lib/Expr/Expr.cpp +++ b/lib/Expr/Expr.cpp @@ -13,7 +13,7 @@ #include "klee/Expr/ExprPPrinter.h" // FIXME: We shouldn't need this once fast constant support moves into // Core. If we need to do arithmetic, we probably want to use APInt. -#include "klee/Internal/Support/IntEvaluation.h" +#include "klee/Support/IntEvaluation.h" #include "klee/OptionCategories.h" #include "llvm/ADT/Hashing.h" diff --git a/lib/Module/FunctionAlias.cpp b/lib/Module/FunctionAlias.cpp index 83b763f7..b0cf5032 100644 --- a/lib/Module/FunctionAlias.cpp +++ b/lib/Module/FunctionAlias.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// #include "Passes.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "klee/OptionCategories.h" #include "llvm/IR/GlobalAlias.h" diff --git a/lib/Module/InstructionInfoTable.cpp b/lib/Module/InstructionInfoTable.cpp index 90b0e022..44c7a294 100644 --- a/lib/Module/InstructionInfoTable.cpp +++ b/lib/Module/InstructionInfoTable.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "klee/Internal/Module/InstructionInfoTable.h" +#include "klee/Module/InstructionInfoTable.h" #include "klee/Config/Version.h" #include "llvm/Analysis/ValueTracking.h" diff --git a/lib/Module/InstructionOperandTypeCheckPass.cpp b/lib/Module/InstructionOperandTypeCheckPass.cpp index 39222d0f..5f428471 100644 --- a/lib/Module/InstructionOperandTypeCheckPass.cpp +++ b/lib/Module/InstructionOperandTypeCheckPass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// #include "Passes.h" #include "klee/Config/Version.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/Support/raw_ostream.h" using namespace llvm; diff --git a/lib/Module/KInstruction.cpp b/lib/Module/KInstruction.cpp index ee54b67c..07ff70ac 100644 --- a/lib/Module/KInstruction.cpp +++ b/lib/Module/KInstruction.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "klee/Internal/Module/KInstruction.h" +#include "klee/Module/KInstruction.h" #include <string> using namespace llvm; diff --git a/lib/Module/KModule.cpp b/lib/Module/KModule.cpp index c4fd980f..4377d4af 100644 --- a/lib/Module/KModule.cpp +++ b/lib/Module/KModule.cpp @@ -12,13 +12,13 @@ #include "Passes.h" #include "klee/Config/Version.h" -#include "klee/Internal/Module/Cell.h" -#include "klee/Internal/Module/InstructionInfoTable.h" -#include "klee/Internal/Module/KInstruction.h" -#include "klee/Internal/Module/KModule.h" -#include "klee/Internal/Support/Debug.h" -#include "klee/Internal/Support/ErrorHandling.h" -#include "klee/Internal/Support/ModuleUtil.h" +#include "klee/Module/Cell.h" +#include "klee/Module/InstructionInfoTable.h" +#include "klee/Module/KInstruction.h" +#include "klee/Module/KModule.h" +#include "klee/Support/Debug.h" +#include "klee/Support/ErrorHandling.h" +#include "klee/Support/ModuleUtil.h" #include "klee/Interpreter.h" #include "klee/OptionCategories.h" diff --git a/lib/Module/ModuleUtil.cpp b/lib/Module/ModuleUtil.cpp index 6adaee6d..f369258a 100644 --- a/lib/Module/ModuleUtil.cpp +++ b/lib/Module/ModuleUtil.cpp @@ -7,11 +7,11 @@ // //===----------------------------------------------------------------------===// -#include "klee/Internal/Support/ModuleUtil.h" +#include "klee/Support/ModuleUtil.h" #include "klee/Config/Version.h" -#include "klee/Internal/Support/Debug.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/Debug.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/Analysis/ValueTracking.h" #if LLVM_VERSION_CODE >= LLVM_VERSION(5, 0) diff --git a/lib/Module/RaiseAsm.cpp b/lib/Module/RaiseAsm.cpp index 51d9b020..acb7d0cf 100644 --- a/lib/Module/RaiseAsm.cpp +++ b/lib/Module/RaiseAsm.cpp @@ -9,7 +9,7 @@ #include "Passes.h" #include "klee/Config/Version.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/IR/IRBuilder.h" #include "llvm/IR/InlineAsm.h" #include "llvm/IR/LLVMContext.h" diff --git a/lib/Module/WorkaroundLLVMPR39177.cpp b/lib/Module/WorkaroundLLVMPR39177.cpp index 23eeb932..92458847 100644 --- a/lib/Module/WorkaroundLLVMPR39177.cpp +++ b/lib/Module/WorkaroundLLVMPR39177.cpp @@ -12,7 +12,7 @@ // cmake/workaround_llvm_pr39177.cmake #include "Passes.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/Transforms/Utils/Cloning.h" diff --git a/lib/Solver/CexCachingSolver.cpp b/lib/Solver/CexCachingSolver.cpp index a7d8148d..75aba7ec 100644 --- a/lib/Solver/CexCachingSolver.cpp +++ b/lib/Solver/CexCachingSolver.cpp @@ -14,8 +14,8 @@ #include "klee/Expr/Expr.h" #include "klee/Expr/ExprUtil.h" #include "klee/Expr/ExprVisitor.h" -#include "klee/Internal/ADT/MapOfSets.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/ADT/MapOfSets.h" +#include "klee/Support/ErrorHandling.h" #include "klee/OptionCategories.h" #include "klee/Solver/SolverImpl.h" #include "klee/Solver/SolverStats.h" diff --git a/lib/Solver/ConstructSolverChain.cpp b/lib/Solver/ConstructSolverChain.cpp index ed6a77dd..1459e90a 100644 --- a/lib/Solver/ConstructSolverChain.cpp +++ b/lib/Solver/ConstructSolverChain.cpp @@ -12,8 +12,8 @@ */ #include "klee/Common.h" -#include "klee/Internal/Support/ErrorHandling.h" -#include "klee/Internal/System/Time.h" +#include "klee/Support/ErrorHandling.h" +#include "klee/System/Time.h" #include "klee/Solver/SolverCmdLine.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Solver/CoreSolver.cpp b/lib/Solver/CoreSolver.cpp index e22f0471..fbf29747 100644 --- a/lib/Solver/CoreSolver.cpp +++ b/lib/Solver/CoreSolver.cpp @@ -12,7 +12,7 @@ #include "MetaSMTSolver.h" #include "klee/Solver/SolverCmdLine.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "klee/Solver/Solver.h" #include "llvm/Support/ErrorHandling.h" diff --git a/lib/Solver/FastCexSolver.cpp b/lib/Solver/FastCexSolver.cpp index 722f624f..d3062407 100644 --- a/lib/Solver/FastCexSolver.cpp +++ b/lib/Solver/FastCexSolver.cpp @@ -16,8 +16,8 @@ #include "klee/Expr/ExprRangeEvaluator.h" #include "klee/Expr/ExprVisitor.h" #include "klee/Solver/IncompleteSolver.h" -#include "klee/Internal/Support/Debug.h" -#include "klee/Internal/Support/IntEvaluation.h" // FIXME: Use APInt +#include "klee/Support/Debug.h" +#include "klee/Support/IntEvaluation.h" // FIXME: Use APInt #include "llvm/Support/raw_ostream.h" diff --git a/lib/Solver/IndependentSolver.cpp b/lib/Solver/IndependentSolver.cpp index cd59c741..72623645 100644 --- a/lib/Solver/IndependentSolver.cpp +++ b/lib/Solver/IndependentSolver.cpp @@ -14,7 +14,7 @@ #include "klee/Expr/Constraints.h" #include "klee/Expr/Expr.h" #include "klee/Expr/ExprUtil.h" -#include "klee/Internal/Support/Debug.h" +#include "klee/Support/Debug.h" #include "klee/Solver/SolverImpl.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Solver/KQueryLoggingSolver.cpp b/lib/Solver/KQueryLoggingSolver.cpp index 27e8ad0b..fccdd615 100644 --- a/lib/Solver/KQueryLoggingSolver.cpp +++ b/lib/Solver/KQueryLoggingSolver.cpp @@ -11,7 +11,7 @@ #include "klee/Expr/Expr.h" #include "klee/Expr/ExprPPrinter.h" -#include "klee/Internal/System/Time.h" +#include "klee/System/Time.h" using namespace klee; diff --git a/lib/Solver/MetaSMTSolver.cpp b/lib/Solver/MetaSMTSolver.cpp index 6817c47a..fbb7da61 100644 --- a/lib/Solver/MetaSMTSolver.cpp +++ b/lib/Solver/MetaSMTSolver.cpp @@ -15,7 +15,7 @@ #include "klee/Expr/Assignment.h" #include "klee/Expr/Constraints.h" #include "klee/Expr/ExprUtil.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "klee/Solver/Solver.h" #include "klee/Solver/SolverImpl.h" diff --git a/lib/Solver/QueryLoggingSolver.cpp b/lib/Solver/QueryLoggingSolver.cpp index 19716e84..d24de556 100644 --- a/lib/Solver/QueryLoggingSolver.cpp +++ b/lib/Solver/QueryLoggingSolver.cpp @@ -9,9 +9,9 @@ #include "QueryLoggingSolver.h" #include "klee/Config/config.h" -#include "klee/Internal/Support/ErrorHandling.h" -#include "klee/Internal/Support/FileHandling.h" -#include "klee/Internal/System/Time.h" +#include "klee/Support/ErrorHandling.h" +#include "klee/Support/FileHandling.h" +#include "klee/System/Time.h" #include "klee/OptionCategories.h" #include "klee/Statistics.h" diff --git a/lib/Solver/QueryLoggingSolver.h b/lib/Solver/QueryLoggingSolver.h index 3c012cc2..65494498 100644 --- a/lib/Solver/QueryLoggingSolver.h +++ b/lib/Solver/QueryLoggingSolver.h @@ -13,7 +13,7 @@ #include "klee/Solver/Solver.h" #include "klee/Solver/SolverImpl.h" -#include "klee/Internal/System/Time.h" +#include "klee/System/Time.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Solver/STPSolver.cpp b/lib/Solver/STPSolver.cpp index ebb67254..82a00d53 100644 --- a/lib/Solver/STPSolver.cpp +++ b/lib/Solver/STPSolver.cpp @@ -16,7 +16,7 @@ #include "klee/Expr/Assignment.h" #include "klee/Expr/Constraints.h" #include "klee/Expr/ExprUtil.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "klee/OptionCategories.h" #include "klee/Solver/SolverImpl.h" diff --git a/lib/Solver/Z3Builder.cpp b/lib/Solver/Z3Builder.cpp index 29f55b31..7db377eb 100644 --- a/lib/Solver/Z3Builder.cpp +++ b/lib/Solver/Z3Builder.cpp @@ -11,7 +11,7 @@ #include "Z3Builder.h" #include "klee/Expr/Expr.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "klee/Solver/Solver.h" #include "klee/Solver/SolverStats.h" #include "klee/util/Bits.h" diff --git a/lib/Solver/Z3Solver.cpp b/lib/Solver/Z3Solver.cpp index e95ad7f4..325a4dc9 100644 --- a/lib/Solver/Z3Solver.cpp +++ b/lib/Solver/Z3Solver.cpp @@ -8,8 +8,8 @@ //===----------------------------------------------------------------------===// #include "klee/Config/config.h" -#include "klee/Internal/Support/ErrorHandling.h" -#include "klee/Internal/Support/FileHandling.h" +#include "klee/Support/ErrorHandling.h" +#include "klee/Support/FileHandling.h" #include "klee/OptionCategories.h" #ifdef ENABLE_Z3 diff --git a/lib/Support/CompressionStream.cpp b/lib/Support/CompressionStream.cpp index 4f818897..95dbe006 100644 --- a/lib/Support/CompressionStream.cpp +++ b/lib/Support/CompressionStream.cpp @@ -9,7 +9,7 @@ #include "klee/Config/config.h" #include "klee/Config/Version.h" #ifdef HAVE_ZLIB_H -#include "klee/Internal/Support/CompressionStream.h" +#include "klee/Support/CompressionStream.h" #include "llvm/Support/FileSystem.h" diff --git a/lib/Support/ErrorHandling.cpp b/lib/Support/ErrorHandling.cpp index d1dd6a15..5c7b69dd 100644 --- a/lib/Support/ErrorHandling.cpp +++ b/lib/Support/ErrorHandling.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/ADT/StringRef.h" #include "llvm/Support/raw_ostream.h" #include "llvm/Support/CommandLine.h" diff --git a/lib/Support/FileHandling.cpp b/lib/Support/FileHandling.cpp index af532a0e..bc65a641 100644 --- a/lib/Support/FileHandling.cpp +++ b/lib/Support/FileHandling.cpp @@ -6,16 +6,16 @@ // License. See LICENSE.TXT for details. // //===----------------------------------------------------------------------===// -#include "klee/Internal/Support/FileHandling.h" +#include "klee/Support/FileHandling.h" #include "klee/Config/Version.h" #include "klee/Config/config.h" -#include "klee/Internal/Support/ErrorHandling.h" +#include "klee/Support/ErrorHandling.h" #include "llvm/Support/FileSystem.h" #ifdef HAVE_ZLIB_H -#include "klee/Internal/Support/CompressionStream.h" +#include "klee/Support/CompressionStream.h" #endif namespace klee { diff --git a/lib/Support/MemoryUsage.cpp b/lib/Support/MemoryUsage.cpp index 2f62dc80..e2b4bbf7 100644 --- a/lib/Support/MemoryUsage.cpp +++ b/lib/Support/MemoryUsage.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "klee/Internal/System/MemoryUsage.h" +#include "klee/System/MemoryUsage.h" #include "klee/Config/config.h" diff --git a/lib/Support/PrintVersion.cpp b/lib/Support/PrintVersion.cpp index b7f2b6ff..1cb80864 100644 --- a/lib/Support/PrintVersion.cpp +++ b/lib/Support/PrintVersion.cpp @@ -7,7 +7,7 @@ // //===----------------------------------------------------------------------===// -#include "klee/Internal/Support/PrintVersion.h" +#include "klee/Support/PrintVersion.h" #include "klee/Config/config.h" #include "klee/Config/Version.h" #include "llvm/Support/raw_ostream.h" diff --git a/lib/Support/RNG.cpp b/lib/Support/RNG.cpp index fef7e489..9f0824ad 100644 --- a/lib/Support/RNG.cpp +++ b/lib/Support/RNG.cpp @@ -42,7 +42,7 @@ email: m-mat @ math.sci.hiroshima-u.ac.jp (remove space) */ -#include "klee/Internal/ADT/RNG.h" +#include "klee/ADT/RNG.h" using namespace klee; diff --git a/lib/Support/Time.cpp b/lib/Support/Time.cpp index 219b07b0..93d77de1 100644 --- a/lib/Support/Time.cpp +++ b/lib/Support/Time.cpp @@ -7,8 +7,8 @@ // //===----------------------------------------------------------------------===// -#include "klee/Internal/Support/ErrorHandling.h" -#include "klee/Internal/System/Time.h" +#include "klee/Support/ErrorHandling.h" +#include "klee/System/Time.h" #include <cstdint> diff --git a/lib/Support/Timer.cpp b/lib/Support/Timer.cpp index 8a0b4ecc..1948449c 100644 --- a/lib/Support/Timer.cpp +++ b/lib/Support/Timer.cpp @@ -7,9 +7,9 @@ // //===----------------------------------------------------------------------===// -#include "klee/Internal/Support/ErrorHandling.h" -#include "klee/Internal/Support/Timer.h" -#include "klee/Internal/System/Time.h" +#include "klee/Support/ErrorHandling.h" +#include "klee/Support/Timer.h" +#include "klee/System/Time.h" using namespace klee; diff --git a/lib/Support/TreeStream.cpp b/lib/Support/TreeStream.cpp index 8681245b..4571861d 100644 --- a/lib/Support/TreeStream.cpp +++ b/lib/Support/TreeStream.cpp @@ -8,9 +8,9 @@ //===----------------------------------------------------------------------===// #define DEBUG_TYPE "TreeStreamWriter" -#include "klee/Internal/ADT/TreeStream.h" +#include "klee/ADT/TreeStream.h" -#include "klee/Internal/Support/Debug.h" +#include "klee/Support/Debug.h" #include <cassert> #include <iomanip> diff --git a/runtime/Runtest/intrinsics.c b/runtime/Runtest/intrinsics.c index 2f9243f0..cdc8c9d6 100644 --- a/runtime/Runtest/intrinsics.c +++ b/runtime/Runtest/intrinsics.c @@ -20,7 +20,7 @@ #include "klee/klee.h" -#include "klee/Internal/ADT/KTest.h" +#include "klee/ADT/KTest.h" static KTest *testData = 0; static unsigned testPosition = 0; diff --git a/test/Dogfood/ImmutableSet.cpp b/test/Dogfood/ImmutableSet.cpp index c654ed4e..4fe793d0 100644 --- a/test/Dogfood/ImmutableSet.cpp +++ b/test/Dogfood/ImmutableSet.cpp @@ -3,7 +3,7 @@ // RUN: %klee --output-dir=%t.klee-out --libc=klee --max-forks=25 --write-no-tests --exit-on-error --optimize --disable-inlining --search=nurs:depth --use-cex-cache %t1.bc #include "klee/klee.h" -#include "klee/Internal/ADT/ImmutableSet.h" +#include "klee/ADT/ImmutableSet.h" using namespace klee; diff --git a/test/regression/2019-09-06-make-const-symbolic.c b/test/regression/2019-09-06-make-const-symbolic.c index 52d430a5..46e39cdc 100644 --- a/test/regression/2019-09-06-make-const-symbolic.c +++ b/test/regression/2019-09-06-make-const-symbolic.c @@ -12,4 +12,4 @@ int main(int argc, char **argv) { return 0; else return 1; -} \ No newline at end of file +} diff --git a/tools/gen-bout/gen-bout.cpp b/tools/gen-bout/gen-bout.cpp index a415d400..0d7360bc 100644 --- a/tools/gen-bout/gen-bout.cpp +++ b/tools/gen-bout/gen-bout.cpp @@ -16,7 +16,7 @@ #include <time.h> #include <unistd.h> -#include "klee/Internal/ADT/KTest.h" +#include "klee/ADT/KTest.h" #if defined(__FreeBSD__) || defined(__minix) || defined(__APPLE__) #define stat64 stat diff --git a/tools/gen-random-bout/gen-random-bout.cpp b/tools/gen-random-bout/gen-random-bout.cpp index 7d539606..dfa121d2 100644 --- a/tools/gen-random-bout/gen-random-bout.cpp +++ b/tools/gen-random-bout/gen-random-bout.cpp @@ -19,7 +19,7 @@ #include <time.h> #include <unistd.h> -#include "klee/Internal/ADT/KTest.h" +#include "klee/ADT/KTest.h" #if defined(__FreeBSD__) || defined(__minix) #define stat64 stat diff --git a/tools/kleaver/main.cpp b/tools/kleaver/main.cpp index 7e44a70a..ed606a77 100644 --- a/tools/kleaver/main.cpp +++ b/tools/kleaver/main.cpp @@ -17,7 +17,7 @@ #include "klee/Expr/ExprVisitor.h" #include "klee/Expr/Parser/Lexer.h" #include "klee/Expr/Parser/Parser.h" -#include "klee/Internal/Support/PrintVersion.h" +#include "klee/Support/PrintVersion.h" #include "klee/OptionCategories.h" #include "klee/Solver/Solver.h" #include "klee/Solver/SolverCmdLine.h" diff --git a/tools/klee-replay/klee-replay.c b/tools/klee-replay/klee-replay.c index efc101b3..e1c7b7b2 100644 --- a/tools/klee-replay/klee-replay.c +++ b/tools/klee-replay/klee-replay.c @@ -9,7 +9,7 @@ #include "klee-replay.h" -#include "klee/Internal/ADT/KTest.h" +#include "klee/ADT/KTest.h" #include <assert.h> #include <errno.h> diff --git a/tools/klee/main.cpp b/tools/klee/main.cpp index 197ed6cf..209f67b2 100644 --- a/tools/klee/main.cpp +++ b/tools/klee/main.cpp @@ -12,14 +12,14 @@ #include "klee/Config/Version.h" #include "klee/ExecutionState.h" #include "klee/Expr/Expr.h" -#include "klee/Internal/ADT/KTest.h" -#include "klee/Internal/ADT/TreeStream.h" -#include "klee/Internal/Support/Debug.h" -#include "klee/Internal/Support/ErrorHandling.h" -#include "klee/Internal/Support/FileHandling.h" -#include "klee/Internal/Support/ModuleUtil.h" -#include "klee/Internal/Support/PrintVersion.h" -#include "klee/Internal/System/Time.h" +#include "klee/ADT/KTest.h" +#include "klee/ADT/TreeStream.h" +#include "klee/Support/Debug.h" +#include "klee/Support/ErrorHandling.h" +#include "klee/Support/FileHandling.h" +#include "klee/Support/ModuleUtil.h" +#include "klee/Support/PrintVersion.h" +#include "klee/System/Time.h" #include "klee/Interpreter.h" #include "klee/OptionCategories.h" #include "klee/Solver/SolverCmdLine.h" diff --git a/unittests/DiscretePDF/DiscretePDFTest.cpp b/unittests/DiscretePDF/DiscretePDFTest.cpp index 2180360c..502a43ab 100644 --- a/unittests/DiscretePDF/DiscretePDFTest.cpp +++ b/unittests/DiscretePDF/DiscretePDFTest.cpp @@ -1,4 +1,4 @@ -#include "klee/Internal/ADT/DiscretePDF.h" +#include "klee/ADT/DiscretePDF.h" #include "gtest/gtest.h" #include <iostream> #include <vector> diff --git a/unittests/Ref/RefTest.cpp b/unittests/Ref/RefTest.cpp index 066ecc58..17ab88e5 100644 --- a/unittests/Ref/RefTest.cpp +++ b/unittests/Ref/RefTest.cpp @@ -170,4 +170,4 @@ TEST(RefTest, SelfRef) { r_root = r_root->next_; EXPECT_EQ(2u, r_e_1->_refCount.getCount()); -} \ No newline at end of file +} diff --git a/unittests/Time/TimeTest.cpp b/unittests/Time/TimeTest.cpp index a05c41b4..98d61e7d 100644 --- a/unittests/Time/TimeTest.cpp +++ b/unittests/Time/TimeTest.cpp @@ -1,4 +1,4 @@ -#include "klee/Internal/System/Time.h" +#include "klee/System/Time.h" #include "gtest/gtest.h" #include "gtest/gtest-death-test.h" @@ -182,4 +182,4 @@ TEST(TimeTest, ImplicitArithmeticConversions) { t1 *= 2.2; d = t1.toSeconds(); ASSERT_EQ(d, 2200.0); -} \ No newline at end of file +} diff --git a/unittests/TreeStream/TreeStreamTest.cpp b/unittests/TreeStream/TreeStreamTest.cpp index ceebf775..82102834 100644 --- a/unittests/TreeStream/TreeStreamTest.cpp +++ b/unittests/TreeStream/TreeStreamTest.cpp @@ -1,4 +1,4 @@ -#include "klee/Internal/ADT/TreeStream.h" +#include "klee/ADT/TreeStream.h" #include <vector> #include <cstring> |