DBG: Clean up various includes (ReSharper)

x64_dbg_dbg/BasicBlock.cpp

@@ -1,2 +0,0 @@
-#include "BasicBlock.h"
-#include "memory.h"

x64_dbg_dbg/FunctionPass.cpp

@@ -97,14 +97,14 @@ bool FunctionPass::Analyse()
     // Sort and remove duplicates
     std::sort(funcs.begin(), funcs.end());
     funcs.erase(std::unique(funcs.begin(), funcs.end()), funcs.end());
-    /*
+
     FunctionClear();
     for(auto & func : funcs)
     {
         FunctionAdd(func.VirtualStart, func.VirtualEnd - 1, true);
     }
     GuiUpdateAllViews();
-    */
+
     delete[] threadFunctions;
     return true;
 }
@@ -248,7 +248,7 @@ void FunctionPass::FindFunctionWorker(std::vector<FunctionDef>* Blocks)
                 if(block->Target != 0)
                 {
                     // Here's a problem: Compilers add tail-call elimination with a jump.
-                    // Solve this by creating a maximum jump limit: +/- 128 bytes from the end.
+                    // Solve this by creating a maximum jump limit: +/- 512 bytes from the end.
                     if(abs((__int64)(block->VirtualEnd - block->Target)) <= 512)
                         maximumAddr = max(maximumAddr, block->Target);
                 }
@@ -291,7 +291,7 @@ __endfunc:
                     }
                 }
 
-                // 4. Just continue
+                // 4. Continue
             }
         }
 

x64_dbg_dbg/_dbgfunctions.cpp

@@ -8,7 +8,6 @@
 #include "_dbgfunctions.h"
 #include "assemble.h"
 #include "debugger.h"
-#include "addrinfo.h"
 #include "patches.h"
 #include "memory.h"
 #include "disasm_fast.h"

x64_dbg_dbg/_exports.cpp

@@ -8,8 +8,6 @@
 #include "memory.h"
 #include "debugger.h"
 #include "value.h"
-#include "addrinfo.h"
-#include "console.h"
 #include "threading.h"
 #include "breakpoint.h"
 #include "disasm_helper.h"

x64_dbg_dbg/_global.cpp

@@ -6,7 +6,6 @@
 #include "_global.h"
 #include <objbase.h>
 #include <shlobj.h>
-#include <new>
 
 /**
 \brief x64dbg library instance.

x64_dbg_dbg/addrinfo.cpp

@@ -9,9 +9,6 @@
 #include "console.h"
 #include "memory.h"
 #include "breakpoint.h"
-#include "threading.h"
-#include "symbolinfo.h"
-#include "murmurhash.h"
 #include "lz4\lz4file.h"
 #include "patches.h"
 #include "module.h"

x64_dbg_dbg/assemble.cpp

@@ -6,11 +6,9 @@
 
 #include "assemble.h"
 #include "memory.h"
-#include "debugger.h"
 #include "XEDParse\XEDParse.h"
 #include "value.h"
 #include "disasm_helper.h"
-#include "console.h"
 
 static bool cbUnknown(const char* text, ULONGLONG* value)
 {

x64_dbg_dbg/bookmark.cpp

@@ -1,7 +1,6 @@
 #include "bookmark.h"
 #include "threading.h"
 #include "module.h"
-#include "debugger.h"
 #include "memory.h"
 
 std::unordered_map<uint, BOOKMARKSINFO> bookmarks;

x64_dbg_dbg/breakpoint.cpp

@@ -5,9 +5,6 @@
  */
 
 #include "breakpoint.h"
-#include "debugger.h"
-#include "addrinfo.h"
-#include "console.h"
 #include "memory.h"
 #include "threading.h"
 #include "module.h"

x64_dbg_dbg/capstone_wrapper.cpp

@@ -1,6 +1,5 @@
 #include "console.h"
 #include "capstone_wrapper.h"
-#include "TitanEngine\TitanEngine.h"
 
 csh Capstone::mHandle = 0;
 

x64_dbg_dbg/command.cpp

@@ -7,8 +7,6 @@
 #include "command.h"
 #include "value.h"
 #include "console.h"
-#include "debugger.h"
-#include "math.h"
 #include "commandparser.h"
 
 /**

x64_dbg_dbg/comment.cpp

@@ -1,7 +1,6 @@
 #include "comment.h"
 #include "threading.h"
 #include "module.h"
-#include "debugger.h"
 #include "memory.h"
 
 std::unordered_map<uint, COMMENTSINFO> comments;

x64_dbg_dbg/controlflowanalysis.cpp

@@ -1,5 +1,4 @@
 #include "controlflowanalysis.h"
-#include "memory.h"
 #include "console.h"
 
 ControlFlowAnalysis::ControlFlowAnalysis(uint base, uint size) : Analysis(base, size)

x64_dbg_dbg/disasm_fast.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "disasm_fast.h"
-#include "debugger.h"
 #include "memory.h"
 
 static MEMORY_SIZE argsize2memsize(int argsize)

x64_dbg_dbg/disasm_helper.cpp

@@ -7,10 +7,7 @@
 #include "disasm_helper.h"
 #include "value.h"
 #include "console.h"
-#include "debugger.h"
 #include "memory.h"
-#include <cwctype>
-#include <cwchar>
 #include "capstone_wrapper.h"
 
 uint disasmback(unsigned char* data, uint base, uint size, uint ip, int n)

x64_dbg_dbg/error.cpp

@@ -1,5 +1,5 @@
-#include "error.h"
 #include <unordered_map>
+#include "error.h"
 
 std::unordered_map<unsigned int, const char*> ErrorNames;
 

x64_dbg_dbg/exception.cpp

@@ -1,5 +1,5 @@
-#include "exception.h"
 #include <unordered_map>
+#include "exception.h"
 
 std::unordered_map<unsigned int, const char*> ExceptionNames;
 

x64_dbg_dbg/function.cpp

@@ -1,6 +1,5 @@
 #include "function.h"
 #include "module.h"
-#include "debugger.h"
 #include "memory.h"
 #include "threading.h"
 

x64_dbg_dbg/functionanalysis.cpp

@@ -7,6 +7,7 @@
 #include "BasicBlock.h"
 #include "FunctionPass.h"
 #include "LinearPass.h"
+#include "module.h"
 
 FunctionAnalysis::FunctionAnalysis(uint base, uint size) : Analysis(base, size)
 {
@@ -17,11 +18,14 @@ void FunctionAnalysis::Analyse()
     dputs("Starting analysis...");
     DWORD ticks = GetTickCount();
 
+    uint start = ModBaseFromAddr(_base);
+    uint end = start + ModSizeFromAddr(_base);
+
     BBlockArray blocks;
-    LinearPass* pass1 = new LinearPass(_base, _base + _size, blocks);
+    LinearPass* pass1 = new LinearPass(start, end, blocks);
     pass1->Analyse();
 
-    FunctionPass* pass2 = new FunctionPass(_base, _base + _size, blocks);
+    FunctionPass* pass2 = new FunctionPass(start, end, blocks);
     pass2->Analyse();
     /*
     PopulateReferences();

x64_dbg_dbg/label.cpp

@@ -2,7 +2,6 @@
 #include "threading.h"
 #include "module.h"
 #include "memory.h"
-#include "debugger.h"
 
 std::unordered_map<uint, LABELSINFO> labels;
 

x64_dbg_dbg/loop.cpp

@@ -1,5 +1,4 @@
 #include "loop.h"
-#include "debugger.h"
 #include "memory.h"
 #include "threading.h"
 #include "module.h"

x64_dbg_dbg/memory.cpp

@@ -7,7 +7,6 @@
 #include "memory.h"
 #include "debugger.h"
 #include "patches.h"
-#include "console.h"
 #include "threading.h"
 #include "module.h"
 

x64_dbg_dbg/msgqueue.cpp

@@ -1,5 +1,4 @@
 #include "msgqueue.h"
-#include <stdio.h>
 
 //allocate a message (internal)
 static MESSAGE* msgalloc()

x64_dbg_dbg/patches.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "patches.h"
-#include "addrinfo.h"
 #include "memory.h"
 #include "debugger.h"
 #include "console.h"

x64_dbg_dbg/plugin_loader.cpp

@@ -7,8 +7,6 @@
 #include "plugin_loader.h"
 #include "console.h"
 #include "debugger.h"
-#include "memory.h"
-#include "x64_dbg.h"
 
 /**
 \brief List of plugins.

x64_dbg_dbg/reference.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "reference.h"
-#include "debugger.h"
 #include "memory.h"
 #include "console.h"
 #include "module.h"

x64_dbg_dbg/simplescript.cpp

@@ -5,13 +5,10 @@
  */
 
 #include "simplescript.h"
-#include "value.h"
 #include "console.h"
 #include "variable.h"
-#include "threading.h"
 #include "x64_dbg.h"
 #include "debugger.h"
-#include "commandparser.h"
 
 static std::vector<LINEMAPENTRY> linemap;
 

x64_dbg_dbg/stackinfo.cpp

@@ -5,11 +5,9 @@
  */
 
 #include "stackinfo.h"
-#include "debugger.h"
 #include "memory.h"
 #include "disasm_helper.h"
 #include "disasm_fast.h"
-#include "addrinfo.h"
 #include "_exports.h"
 #include "module.h"
 

x64_dbg_dbg/stringformat.cpp

@@ -1,5 +1,4 @@
 #include "stringformat.h"
-#include "console.h"
 #include "value.h"
 #include "disasm_helper.h"
 

x64_dbg_dbg/stringutils.cpp

@@ -1,7 +1,6 @@
+#include <sstream>
 #include "stringutils.h"
 #include "memory.h"
-#include <iostream>
-#include <sstream>
 
 StringList StringUtils::Split(const String & s, char delim, std::vector<String> & elems)
 {

x64_dbg_dbg/symbolinfo.cpp

@@ -6,7 +6,6 @@
 
 #include "symbolinfo.h"
 #include "debugger.h"
-#include "addrinfo.h"
 #include "console.h"
 #include "module.h"
 #include "label.h"

x64_dbg_dbg/thread.cpp

@@ -5,8 +5,6 @@
  */
 
 #include "thread.h"
-#include "console.h"
-#include "undocumented.h"
 #include "memory.h"
 #include "threading.h"
 

x64_dbg_dbg/value.cpp

@@ -8,9 +8,7 @@
 #include "variable.h"
 #include "debugger.h"
 #include "console.h"
-#include "math.h"
 #include "memory.h"
-#include "addrinfo.h"
 #include "symbolinfo.h"
 #include "module.h"
 #include "label.h"

x64_dbg_dbg/x64_dbg.cpp

@@ -11,13 +11,10 @@
 #include "debugger.h"
 #include "simplescript.h"
 #include "console.h"
-#include "math.h"
 #include "x64_dbg.h"
 #include "msgqueue.h"
-#include "addrinfo.h"
 #include "threading.h"
 #include "plugin_loader.h"
-#include "assemble.h"
 #include "_dbgfunctions.h"
 #include "debugger_commands.h"
 #include "capstone_wrapper.h"

x64_dbg_dbg/x64_dbg_dbg.vcxproj

@@ -23,7 +23,6 @@
     <ClCompile Include="Analysis.cpp" />
     <ClCompile Include="AnalysisPass.cpp" />
     <ClCompile Include="assemble.cpp" />
-    <ClCompile Include="BasicBlock.cpp" />
     <ClCompile Include="bookmark.cpp" />
     <ClCompile Include="breakpoint.cpp" />
     <ClCompile Include="capstone_wrapper.cpp" />

x64_dbg_dbg/x64_dbg_dbg.vcxproj.filters

@@ -243,9 +243,6 @@
     <ClCompile Include="_scriptapi_gui.cpp">
       <Filter>Source Files\Interfaces/Exports\_scriptapi</Filter>
     </ClCompile>
-    <ClCompile Include="BasicBlock.cpp">
-      <Filter>Source Files\Analysis</Filter>
-    </ClCompile>
     <ClCompile Include="AnalysisPass.cpp">
       <Filter>Source Files\Analysis</Filter>
     </ClCompile>
@@ -264,6 +261,18 @@
     <ClCompile Include="Int3CoagulatorPass.cpp">
       <Filter>Source Files\Analysis</Filter>
     </ClCompile>
+    <ClCompile Include="controlflowanalysis.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="_scriptapi_assembler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="_scriptapi_misc.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="_scriptapi_stack.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="x64_dbg.h">
@@ -605,5 +614,17 @@
     <ClInclude Include="Int3CoagulatorPass.h">
       <Filter>Header Files\Analysis</Filter>
     </ClInclude>
+    <ClInclude Include="controlflowanalysis.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="_scriptapi_assembler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="_scriptapi_misc.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="_scriptapi_stack.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>