[refactor, WIP] CodeEvents moved to lib directory.

S1eGa · S1eGa · commit 88c3be1c8936 · 2024-02-13T16:25:11.000+03:00
diff --git a/lib/Core/CodeEvent.h b/lib/Core/CodeEvent.h
diff --git a/lib/Core/CodeEvents/AllocEvent.h b/lib/Core/CodeEvents/AllocEvent.h
@@ -1,11 +1,10 @@
 #ifndef KLEE_ALLOC_EVENT_H
 #define KLEE_ALLOC_EVENT_H
 
-#include "klee/Core/CodeEvent.h"
+#include "../CodeEvent.h"
 #include "klee/Module/KValue.h"
 
 #include "klee/Support/CompilerWarning.h"
-
 DISABLE_WARNING_PUSH
 DISABLE_WARNING_DEPRECATED_DECLARATIONS
 #include "llvm/IR/Instruction.h"
diff --git a/lib/Core/CodeEvents/BrEvent.h b/lib/Core/CodeEvents/BrEvent.h
@@ -1,8 +1,8 @@
 #ifndef KLEE_BR_EVENT_H
 #define KLEE_BR_EVENT_H
 
+#include "../CodeEvent.h"
 #include "klee/ADT/Ref.h"
-#include "klee/Core/CodeEvent.h"
 
 #include <string>
 
diff --git a/lib/Core/CodeEvents/CallEvent.h b/lib/Core/CodeEvents/CallEvent.h
@@ -1,10 +1,10 @@
 #ifndef KLEE_CALL_EVENT_H
 #define KLEE_CALL_EVENT_H
 
-#include "klee/ADT/Ref.h"
-#include "klee/Core/CodeEvent.h"
+#include "../CodeEvent.h"
+#include "../CodeLocation.h"
 
-#include "klee/Core/CodeLocation.h"
+#include "klee/ADT/Ref.h"
 #include "klee/Module/KModule.h"
 
 #include <string>
diff --git a/lib/Core/CodeEvents/ErrorEvent.h b/lib/Core/CodeEvents/ErrorEvent.h
@@ -1,7 +1,7 @@
 #ifndef KLEE_ERROR_EVENT_H
 #define KLEE_ERROR_EVENT_H
 
-#include "klee/Core/CodeEvent.h"
+#include "../CodeEvent.h"
 #include "klee/Core/TerminationTypes.h"
 
 #include <optional>
diff --git a/lib/Core/CodeEvents/ReturnEvent.h b/lib/Core/CodeEvents/ReturnEvent.h
@@ -1,8 +1,8 @@
 #ifndef KLEE_RETURN_EVENT_H
 #define KLEE_RETURN_EVENT_H
 
-#include "klee/Core/CodeEvent.h"
-#include "klee/Core/CodeLocation.h"
+#include "../CodeEvent.h"
+#include "../CodeLocation.h"
 #include "klee/Module/KModule.h"
 
 #include <string>
diff --git a/lib/Core/CodeLocation.cpp b/lib/Core/CodeLocation.cpp
@@ -1,4 +1,4 @@
-#include "klee/Core/CodeLocation.h"
+#include "CodeLocation.h"
 
 #include "klee/Module/LocationInfo.h"
 #include "klee/Module/SarifReport.h"
diff --git a/lib/Core/CodeLocation.h b/lib/Core/CodeLocation.h
diff --git a/lib/Core/EventList.cpp b/lib/Core/EventList.cpp
@@ -1,6 +1,5 @@
-#include "klee/Core/EventList.h"
-
-#include "klee/Core/CodeEvent.h"
+#include "EventList.h"
+#include "CodeEvent.h"
 
 #include "klee/ADT/ImmutableList.h"
 #include "klee/ADT/Ref.h"
diff --git a/lib/Core/EventList.h b/lib/Core/EventList.h
diff --git a/lib/Core/ExecutionState.cpp b/lib/Core/ExecutionState.cpp
@@ -11,7 +11,7 @@
 
 #include "Memory.h"
 
-#include "klee/Core/CodeEvent.h"
+#include "CodeEvent.h"
 #include "klee/Expr/ArrayExprVisitor.h"
 #include "klee/Expr/Expr.h"
 #include "klee/Module/Cell.h"
diff --git a/lib/Core/ExecutionState.h b/lib/Core/ExecutionState.h
@@ -17,7 +17,6 @@
 #include "klee/ADT/PersistentMap.h"
 #include "klee/ADT/PersistentSet.h"
 #include "klee/ADT/TreeStream.h"
-#include "klee/Core/CodeLocation.h"
 #include "klee/Core/TerminationTypes.h"
 #include "klee/Expr/Assignment.h"
 #include "klee/Expr/Constraints.h"
@@ -32,7 +31,8 @@
 #include "klee/System/Time.h"
 #include "klee/Utilities/Math.h"
 
-#include "klee/Core/EventList.h"
+#include "CodeLocation.h"
+#include "EventList.h"
 
 #include "klee/Support/CompilerWarning.h"
 DISABLE_WARNING_PUSH
diff --git a/lib/Core/Executor.cpp b/lib/Core/Executor.cpp
@@ -71,14 +71,14 @@
 #include "klee/System/MemoryUsage.h"
 #include "klee/System/Time.h"
 
-#include "klee/Core/CodeEvent.h"
-#include "klee/Core/CodeEvents/AllocEvent.h"
-#include "klee/Core/CodeEvents/BrEvent.h"
-#include "klee/Core/CodeEvents/CallEvent.h"
-#include "klee/Core/CodeEvents/ErrorEvent.h"
-#include "klee/Core/CodeEvents/ReturnEvent.h"
-#include "klee/Core/CodeLocation.h"
-#include "klee/Core/EventList.h"
+#include "CodeEvent.h"
+#include "CodeEvents/AllocEvent.h"
+#include "CodeEvents/BrEvent.h"
+#include "CodeEvents/CallEvent.h"
+#include "CodeEvents/ErrorEvent.h"
+#include "CodeEvents/ReturnEvent.h"
+#include "CodeLocation.h"
+#include "EventList.h"
 
 #include "klee/Support/CompilerWarning.h"
 DISABLE_WARNING_PUSH
diff --git a/lib/Core/Memory.cpp b/lib/Core/Memory.cpp
@@ -13,8 +13,8 @@
 #include "MemoryManager.h"
 #include "klee/Core/Context.h"
 
+#include "CodeLocation.h"
 #include "klee/ADT/BitArray.h"
-#include "klee/Core/CodeLocation.h"
 #include "klee/Expr/ArrayCache.h"
 #include "klee/Expr/Assignment.h"
 #include "klee/Expr/Expr.h"
diff --git a/lib/Core/Memory.h b/lib/Core/Memory.h
@@ -10,11 +10,11 @@
 #ifndef KLEE_MEMORY_H
 #define KLEE_MEMORY_H
 
+#include "CodeLocation.h"
 #include "MemoryManager.h"
 #include "TimingSolver.h"
 #include "klee/ADT/Ref.h"
 #include "klee/ADT/SparseStorage.h"
-#include "klee/Core/CodeLocation.h"
 #include "klee/Core/Context.h"
 
 #include "klee/Expr/Assignment.h"
diff --git a/lib/Core/SpecialFunctionHandler.cpp b/lib/Core/SpecialFunctionHandler.cpp
@@ -18,9 +18,9 @@
 #include "TimingSolver.h"
 #include "TypeManager.h"
 
+#include "CodeEvents/AllocEvent.h"
+#include "CodeEvents/ErrorEvent.h"
 #include "klee/Config/config.h"
-#include "klee/Core/CodeEvents/AllocEvent.h"
-#include "klee/Core/CodeEvents/ErrorEvent.h"
 #include "klee/Module/KInstruction.h"
 #include "klee/Module/KModule.h"
 #include "klee/Solver/SolverCmdLine.h"

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#include "klee/Core/CodeLocation.h"`
	`1`	`+#include "CodeLocation.h"`
`2`	`2`
`3`	`3`	`#include "klee/Module/LocationInfo.h"`
`4`	`4`	`#include "klee/Module/SarifReport.h"`