DBG: Small fixes from merge

x64_dbg_dbg/AnalysisPass.h

@@ -33,6 +33,7 @@ protected:
     }
 
     BasicBlock* FindBBlockInRange(uint Address);
+    uint FindBBlockIndex(BasicBlock* Block);
     void AcquireReadLock();
     void ReleaseReadLock();
     void AcquireExclusiveLock();

x64_dbg_dbg/Int3CoagulatorPass.cpp

@@ -1,3 +1,4 @@
+#include <thread>
 #include "AnalysisPass.h"
 #include "Int3CoagulatorPass.h"
 #include "console.h"

x64_dbg_dbg/Int3CoagulatorPass.h

@@ -1,8 +1,5 @@
 #pragma once
 
-#include <vector>
-#include <thread>
-
 #include "AnalysisPass.h"
 #include "BasicBlock.h"
 
@@ -16,5 +13,5 @@ public:
     virtual bool Analyse() override;
 
 private:
-    void AnalysisWorker(uint Start, uint End, std::vector<BasicBlock>* Blocks);
+    void AnalysisWorker(uint Start, uint End, BBlockArray* Blocks);
 };

x64_dbg_dbg/LinearPass.cpp

@@ -1,9 +1,8 @@
-#include "AnalysisPass.h"
-#include "LinearPass.h"
 #include <thread>
 #include <ppl.h>
-#include "console.h"
-#include "function.h"
+#include "AnalysisPass.h"
+#include "LinearPass.h"
+#include "capstone_wrapper.h"
 
 LinearPass::LinearPass(uint VirtualStart, uint VirtualEnd, BBlockArray & MainBlocks)
     : AnalysisPass(VirtualStart, VirtualEnd, MainBlocks)

x64_dbg_dbg/LinearPass.h

@@ -2,7 +2,6 @@
 
 #include "AnalysisPass.h"
 #include "BasicBlock.h"
-#include "capstone_wrapper.h"
 
 class LinearPass : public AnalysisPass
 {

x64_dbg_dbg/functionanalysis.cpp

@@ -3,6 +3,11 @@
 #include "memory.h"
 #include "function.h"
 
+#include "AnalysisPass.h"
+#include "BasicBlock.h"
+#include "FunctionPass.h"
+#include "LinearPass.h"
+
 FunctionAnalysis::FunctionAnalysis(uint base, uint size) : Analysis(base, size)
 {
 }
@@ -12,10 +17,17 @@ void FunctionAnalysis::Analyse()
     dputs("Starting analysis...");
     DWORD ticks = GetTickCount();
 
+    BBlockArray blocks;
+    LinearPass* pass1 = new LinearPass(_base, _base + _size, blocks);
+    pass1->Analyse();
+
+    FunctionPass* pass2 = new FunctionPass(_base, _base + _size, blocks);
+    pass2->Analyse();
+    /*
     PopulateReferences();
     dprintf("%u called functions populated\n", _functions.size());
     AnalyseFunctions();
-
+    */
     dprintf("Analysis finished in %ums!\n", GetTickCount() - ticks);
 }