Removed the Internal directory from include/klee

huanglei3 · Apr 30, 2020 · 7d85ee8 · 7d85ee8
1 parent e6d3f65
commit 7d85ee8
Show file tree

Hide file tree

Showing 93 changed files with 134 additions and 137 deletions.
diff --git a/include/klee/Internal/ADT/DiscretePDF.h → include/klee/ADT/DiscretePDF.h b/include/klee/Internal/ADT/DiscretePDF.h → include/klee/ADT/DiscretePDF.h
diff --git a/include/klee/Internal/ADT/DiscretePDF.inc → include/klee/ADT/DiscretePDF.inc b/include/klee/Internal/ADT/DiscretePDF.inc → include/klee/ADT/DiscretePDF.inc
diff --git a/include/klee/Internal/ADT/ImmutableMap.h → include/klee/ADT/ImmutableMap.h b/include/klee/Internal/ADT/ImmutableMap.h → include/klee/ADT/ImmutableMap.h
diff --git a/include/klee/Internal/ADT/ImmutableSet.h → include/klee/ADT/ImmutableSet.h b/include/klee/Internal/ADT/ImmutableSet.h → include/klee/ADT/ImmutableSet.h
diff --git a/include/klee/Internal/ADT/ImmutableTree.h → include/klee/ADT/ImmutableTree.h b/include/klee/Internal/ADT/ImmutableTree.h → include/klee/ADT/ImmutableTree.h
diff --git a/include/klee/Internal/ADT/KTest.h → include/klee/ADT/KTest.h b/include/klee/Internal/ADT/KTest.h → include/klee/ADT/KTest.h
diff --git a/include/klee/Internal/ADT/MapOfSets.h → include/klee/ADT/MapOfSets.h b/include/klee/Internal/ADT/MapOfSets.h → include/klee/ADT/MapOfSets.h
diff --git a/include/klee/Internal/ADT/RNG.h → include/klee/ADT/RNG.h b/include/klee/Internal/ADT/RNG.h → include/klee/ADT/RNG.h
diff --git a/include/klee/Internal/ADT/TreeStream.h → include/klee/ADT/TreeStream.h b/include/klee/Internal/ADT/TreeStream.h → include/klee/ADT/TreeStream.h
diff --git 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
diff --git a/include/klee/Internal/Module/Cell.h → include/klee/Module/Cell.h b/include/klee/Internal/Module/Cell.h → include/klee/Module/Cell.h
diff --git a/...ee/Internal/Module/InstructionInfoTable.h → include/klee/Module/InstructionInfoTable.h b/...ee/Internal/Module/InstructionInfoTable.h → include/klee/Module/InstructionInfoTable.h
diff --git a/include/klee/Internal/Module/KInstIterator.h → include/klee/Module/KInstIterator.h b/include/klee/Internal/Module/KInstIterator.h → include/klee/Module/KInstIterator.h
diff --git a/include/klee/Internal/Module/KInstruction.h → include/klee/Module/KInstruction.h b/include/klee/Internal/Module/KInstruction.h → 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 → include/klee/Module/KModule.h b/include/klee/Internal/Module/KModule.h → include/klee/Module/KModule.h
diff --git 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
@@ -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/...klee/Internal/Support/CompressionStream.h → include/klee/Support/CompressionStream.h b/...klee/Internal/Support/CompressionStream.h → include/klee/Support/CompressionStream.h
diff --git a/include/klee/Internal/Support/Debug.h → include/klee/Support/Debug.h b/include/klee/Internal/Support/Debug.h → include/klee/Support/Debug.h
diff --git a/...ude/klee/Internal/Support/ErrorHandling.h → include/klee/Support/ErrorHandling.h b/...ude/klee/Internal/Support/ErrorHandling.h → include/klee/Support/ErrorHandling.h
diff --git a/include/klee/Internal/Support/FileHandling.h → include/klee/Support/FileHandling.h b/include/klee/Internal/Support/FileHandling.h → include/klee/Support/FileHandling.h
diff --git a/...e/klee/Internal/Support/FloatEvaluation.h → include/klee/Support/FloatEvaluation.h b/...e/klee/Internal/Support/FloatEvaluation.h → include/klee/Support/FloatEvaluation.h
diff --git a/...ude/klee/Internal/Support/IntEvaluation.h → include/klee/Support/IntEvaluation.h b/...ude/klee/Internal/Support/IntEvaluation.h → include/klee/Support/IntEvaluation.h
diff --git a/include/klee/Internal/Support/ModuleUtil.h → include/klee/Support/ModuleUtil.h b/include/klee/Internal/Support/ModuleUtil.h → include/klee/Support/ModuleUtil.h
diff --git a/include/klee/Internal/Support/PrintVersion.h → include/klee/Support/PrintVersion.h b/include/klee/Internal/Support/PrintVersion.h → include/klee/Support/PrintVersion.h
diff --git a/include/klee/Internal/Support/Timer.h → include/klee/Support/Timer.h b/include/klee/Internal/Support/Timer.h → 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 → include/klee/System/MemoryUsage.h b/include/klee/Internal/System/MemoryUsage.h → include/klee/System/MemoryUsage.h
diff --git a/include/klee/Internal/System/Time.h → include/klee/System/Time.h b/include/klee/Internal/System/Time.h → include/klee/System/Time.h
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"