Renamed some leftover files.

VTIL-Compiler/CMakeLists.txt

@@ -2,15 +2,15 @@ project(VTIL-Compiler)
 
 add_library(${PROJECT_NAME} STATIC
     common/auxiliaries.cpp
-    passes/stack_pinning_pass.cpp
-    passes/istack_ref_substitution_pass.cpp
-    passes/bblock_extension_pass.cpp
-    passes/stack_propagation_pass.cpp
-    passes/dead_code_elimination_pass.cpp
-    passes/mov_propagation_pass.cpp
-    passes/symbolic_rewrite_pass.cpp
-    passes/branch_correction_pass.cpp
-    passes/register_renaming_pass.cpp
+    optimization/stack_pinning_pass.cpp
+    optimization/istack_ref_substitution_pass.cpp
+    optimization/bblock_extension_pass.cpp
+    optimization/stack_propagation_pass.cpp
+    optimization/dead_code_elimination_pass.cpp
+    optimization/mov_propagation_pass.cpp
+    optimization/symbolic_rewrite_pass.cpp
+    optimization/branch_correction_pass.cpp
+    optimization/register_renaming_pass.cpp
 )
 
 target_include_directories(${PROJECT_NAME} PUBLIC includes)

VTIL-Compiler/VTIL-Compiler.vcxproj

@@ -107,32 +107,32 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="common\auxiliaries.cpp" />
-    <ClCompile Include="passes\bblock_extension_pass.cpp" />
-    <ClCompile Include="passes\dead_code_elimination_pass.cpp" />
-    <ClCompile Include="passes\istack_ref_substitution_pass.cpp" />
-    <ClCompile Include="passes\mov_propagation_pass.cpp" />
-    <ClCompile Include="passes\branch_correction_pass.cpp" />
-    <ClCompile Include="passes\register_renaming_pass.cpp" />
-    <ClCompile Include="passes\stack_pinning_pass.cpp" />
-    <ClCompile Include="passes\stack_propagation_pass.cpp" />
-    <ClCompile Include="passes\symbolic_rewrite_pass.cpp" />
+    <ClCompile Include="optimizer\bblock_extension_pass.cpp" />
+    <ClCompile Include="optimizer\branch_correction_pass.cpp" />
+    <ClCompile Include="optimizer\dead_code_elimination_pass.cpp" />
+    <ClCompile Include="optimizer\istack_ref_substitution_pass.cpp" />
+    <ClCompile Include="optimizer\mov_propagation_pass.cpp" />
+    <ClCompile Include="optimizer\register_renaming_pass.cpp" />
+    <ClCompile Include="optimizer\stack_pinning_pass.cpp" />
+    <ClCompile Include="optimizer\stack_propagation_pass.cpp" />
+    <ClCompile Include="optimizer\symbolic_rewrite_pass.cpp" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="common\apply_all.hpp" />
     <ClInclude Include="common\auxiliaries.hpp" />
     <ClInclude Include="common\interface.hpp" />
-    <ClInclude Include="passes\bblock_extension_pass.hpp" />
-    <ClInclude Include="passes\dead_code_elimination_pass.hpp" />
-    <ClInclude Include="passes\istack_ref_substitution_pass.hpp" />
-    <ClInclude Include="passes\mov_propagation_pass.hpp" />
-    <ClInclude Include="passes\branch_correction_pass.hpp" />
-    <ClInclude Include="passes\register_renaming_pass.hpp" />
-    <ClInclude Include="passes\stack_pinning_pass.hpp" />
-    <ClInclude Include="passes\stack_propagation_pass.hpp" />
-    <ClInclude Include="passes\symbolic_rewrite_pass.hpp" />
+    <ClInclude Include="optimizer\bblock_extension_pass.hpp" />
+    <ClInclude Include="optimizer\branch_correction_pass.hpp" />
+    <ClInclude Include="optimizer\dead_code_elimination_pass.hpp" />
+    <ClInclude Include="optimizer\istack_ref_substitution_pass.hpp" />
+    <ClInclude Include="optimizer\mov_propagation_pass.hpp" />
+    <ClInclude Include="optimizer\register_renaming_pass.hpp" />
+    <ClInclude Include="optimizer\stack_pinning_pass.hpp" />
+    <ClInclude Include="optimizer\stack_propagation_pass.hpp" />
+    <ClInclude Include="optimizer\symbolic_rewrite_pass.hpp" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="includes\vtil\optimizer" />
+    <None Include="includes\vtil\compiler" />
     <None Include="VTIL-Compiler.licenseheader" />
   </ItemGroup>
   <ItemGroup>

VTIL-Compiler/VTIL-Compiler.vcxproj.filters

@@ -1,67 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="passes\bblock_extension_pass.cpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClCompile>
-    <ClCompile Include="passes\istack_ref_substitution_pass.cpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClCompile>
-    <ClCompile Include="passes\stack_pinning_pass.cpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClCompile>
-    <ClCompile Include="passes\stack_propagation_pass.cpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClCompile>
-    <ClCompile Include="passes\mov_propagation_pass.cpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClCompile>
-    <ClCompile Include="passes\dead_code_elimination_pass.cpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClCompile>
     <ClCompile Include="common\auxiliaries.cpp">
       <Filter>Common</Filter>
     </ClCompile>
-    <ClCompile Include="passes\symbolic_rewrite_pass.cpp">
-      <Filter>Optimizer Passes</Filter>
+    <ClCompile Include="optimizer\bblock_extension_pass.cpp">
+      <Filter>Optimization Passes</Filter>
     </ClCompile>
-    <ClCompile Include="passes\register_renaming_pass.cpp">
-      <Filter>Optimizer Passes</Filter>
+    <ClCompile Include="optimizer\branch_correction_pass.cpp">
+      <Filter>Optimization Passes</Filter>
     </ClCompile>
-    <ClCompile Include="passes\branch_correction_pass.cpp">
-      <Filter>Optimizer Passes</Filter>
+    <ClCompile Include="optimizer\dead_code_elimination_pass.cpp">
+      <Filter>Optimization Passes</Filter>
+    </ClCompile>
+    <ClCompile Include="optimizer\istack_ref_substitution_pass.cpp">
+      <Filter>Optimization Passes</Filter>
+    </ClCompile>
+    <ClCompile Include="optimizer\mov_propagation_pass.cpp">
+      <Filter>Optimization Passes</Filter>
+    </ClCompile>
+    <ClCompile Include="optimizer\register_renaming_pass.cpp">
+      <Filter>Optimization Passes</Filter>
+    </ClCompile>
+    <ClCompile Include="optimizer\stack_pinning_pass.cpp">
+      <Filter>Optimization Passes</Filter>
+    </ClCompile>
+    <ClCompile Include="optimizer\stack_propagation_pass.cpp">
+      <Filter>Optimization Passes</Filter>
+    </ClCompile>
+    <ClCompile Include="optimizer\symbolic_rewrite_pass.cpp">
+      <Filter>Optimization Passes</Filter>
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="Includes">
       <UniqueIdentifier>{6307ebe6-d515-4f15-a927-44dacb7a337c}</UniqueIdentifier>
     </Filter>
-    <Filter Include="Optimizer Passes">
-      <UniqueIdentifier>{93550fd4-29f0-496a-ba4a-c90fcf11efb1}</UniqueIdentifier>
-    </Filter>
     <Filter Include="Common">
       <UniqueIdentifier>{5ad32c73-c84f-45a2-ba7b-e4170f51b3d3}</UniqueIdentifier>
     </Filter>
+    <Filter Include="Optimization Passes">
+      <UniqueIdentifier>{93550fd4-29f0-496a-ba4a-c90fcf11efb1}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="passes\mov_propagation_pass.hpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClInclude>
-    <ClInclude Include="passes\stack_propagation_pass.hpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClInclude>
-    <ClInclude Include="passes\dead_code_elimination_pass.hpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClInclude>
-    <ClInclude Include="passes\stack_pinning_pass.hpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClInclude>
-    <ClInclude Include="passes\bblock_extension_pass.hpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClInclude>
-    <ClInclude Include="passes\istack_ref_substitution_pass.hpp">
-      <Filter>Optimizer Passes</Filter>
-    </ClInclude>
     <ClInclude Include="common\apply_all.hpp">
       <Filter>Common</Filter>
     </ClInclude>
@@ -71,21 +53,39 @@
     <ClInclude Include="common\interface.hpp">
       <Filter>Common</Filter>
     </ClInclude>
-    <ClInclude Include="passes\symbolic_rewrite_pass.hpp">
-      <Filter>Optimizer Passes</Filter>
+    <ClInclude Include="optimizer\bblock_extension_pass.hpp">
+      <Filter>Optimization Passes</Filter>
     </ClInclude>
-    <ClInclude Include="passes\register_renaming_pass.hpp">
-      <Filter>Optimizer Passes</Filter>
+    <ClInclude Include="optimizer\branch_correction_pass.hpp">
+      <Filter>Optimization Passes</Filter>
     </ClInclude>
-    <ClInclude Include="passes\branch_correction_pass.hpp">
-      <Filter>Optimizer Passes</Filter>
+    <ClInclude Include="optimizer\dead_code_elimination_pass.hpp">
+      <Filter>Optimization Passes</Filter>
+    </ClInclude>
+    <ClInclude Include="optimizer\istack_ref_substitution_pass.hpp">
+      <Filter>Optimization Passes</Filter>
+    </ClInclude>
+    <ClInclude Include="optimizer\mov_propagation_pass.hpp">
+      <Filter>Optimization Passes</Filter>
+    </ClInclude>
+    <ClInclude Include="optimizer\register_renaming_pass.hpp">
+      <Filter>Optimization Passes</Filter>
+    </ClInclude>
+    <ClInclude Include="optimizer\stack_pinning_pass.hpp">
+      <Filter>Optimization Passes</Filter>
+    </ClInclude>
+    <ClInclude Include="optimizer\stack_propagation_pass.hpp">
+      <Filter>Optimization Passes</Filter>
+    </ClInclude>
+    <ClInclude Include="optimizer\symbolic_rewrite_pass.hpp">
+      <Filter>Optimization Passes</Filter>
     </ClInclude>
   </ItemGroup>
   <ItemGroup>
-    <None Include="includes\vtil\optimizer">
+    <None Include="VTIL-Compiler.licenseheader" />
+    <None Include="includes\vtil\compiler">
       <Filter>Includes</Filter>
     </None>
-    <None Include="VTIL-Compiler.licenseheader" />
   </ItemGroup>
   <ItemGroup>
     <Text Include="CMakeLists.txt" />

VTIL-Compiler/common/apply_all.hpp

@@ -27,15 +27,15 @@
 //
 #pragma once
 #include "interface.hpp"
-#include "../passes/stack_pinning_pass.hpp"
-#include "../passes/istack_ref_substitution_pass.hpp"
-#include "../passes/bblock_extension_pass.hpp"
-#include "../passes/stack_propagation_pass.hpp"
-#include "../passes/dead_code_elimination_pass.hpp"
-#include "../passes/mov_propagation_pass.hpp"
-#include "../passes/symbolic_rewrite_pass.hpp"
-#include "../passes/branch_correction_pass.hpp"
-#include "../passes/register_renaming_pass.hpp"
+#include "../optimizer/stack_pinning_pass.hpp"
+#include "../optimizer/istack_ref_substitution_pass.hpp"
+#include "../optimizer/bblock_extension_pass.hpp"
+#include "../optimizer/stack_propagation_pass.hpp"
+#include "../optimizer/dead_code_elimination_pass.hpp"
+#include "../optimizer/mov_propagation_pass.hpp"
+#include "../optimizer/symbolic_rewrite_pass.hpp"
+#include "../optimizer/branch_correction_pass.hpp"
+#include "../optimizer/register_renaming_pass.hpp"
 
 namespace vtil::optimizer
 {

VTIL/includes/vtil/vtil

@@ -2,4 +2,4 @@
 #include <vtil/common>
 #include <vtil/symex>
 #include <vtil/arch>
-#include <vtil/Compiler>
+#include <vtil/compiler>