Added separate calling convention detection pass

yegord · Jun 14, 2015 · 8dcd9e2 · 8dcd9e2
1 parent 6cd5753
commit 8dcd9e2
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 15 deletions.
diff --git a/src/nc/arch/x86/X86MasterAnalyzer.cpp b/src/nc/arch/x86/X86MasterAnalyzer.cpp
@@ -82,27 +82,39 @@ void X86MasterAnalyzer::createProgram(core::Context &context) const {
     }
 }
 
-void X86MasterAnalyzer::detectCallingConvention(core::Context &context, const core::ir::calling::CalleeId &calleeId) const {
-    auto architecture = context.image()->architecture();
+void X86MasterAnalyzer::detectCallingConventions(core::Context &context) const {
+    context.logToken().info(tr("Detecting calling conventions."));
 
-    auto setConvention = [&](const char *name) {
-        context.conventions()->setConvention(calleeId, architecture->getCallingConvention(QLatin1String(name)));
-    };
+    auto architecture = context.image()->architecture();
 
     if (architecture->bitness() == 32) {
-        if (auto addr = calleeId.entryAddress()) {
-            if (auto symbol = context.image()->getSymbol(*addr)) {
-                int index = symbol->name().lastIndexOf(QChar('@'));
-                if (index != -1) {
-                    if (auto argumentsSize = stringToInt<ByteSize>(symbol->name().mid(index + 1))) {
-                        setConvention("stdcall32");
-                        context.conventions()->setStackArgumentsSize(calleeId, *argumentsSize);
-                        return;
-                    }
-                }
+        auto stdcall32 = architecture->getCallingConvention(QLatin1String("stdcall32"));
+
+        foreach (auto symbol, context.image()->symbols()) {
+            if (!symbol->value()) {
+                continue;
+            }
+            auto index = symbol->name().lastIndexOf(QChar('@'));
+            if (index == -1) {
+                continue;
             }
+            auto argumentsSize = stringToInt<ByteSize>(symbol->name().mid(index + 1));
+            if (!argumentsSize) {
+                continue;
+            }
+            core::ir::calling::CalleeId calleeId(core::ir::calling::EntryAddress(*symbol->value()));
+            context.conventions()->setConvention(calleeId, stdcall32);
+            context.conventions()->setStackArgumentsSize(calleeId, *argumentsSize);
         }
     }
+}
+
+void X86MasterAnalyzer::detectCallingConvention(core::Context &context, const core::ir::calling::CalleeId &calleeId) const {
+    auto architecture = context.image()->architecture();
+
+    auto setConvention = [&](const char *name) {
+        context.conventions()->setConvention(calleeId, architecture->getCallingConvention(QLatin1String(name)));
+    };
 
     switch (architecture->bitness()) {
         case 16:

diff --git a/src/nc/arch/x86/X86MasterAnalyzer.h b/src/nc/arch/x86/X86MasterAnalyzer.h
@@ -34,6 +34,7 @@ namespace x86 {
 class X86MasterAnalyzer: public core::MasterAnalyzer {
 public:
     void createProgram(core::Context &context) const override;
+    void detectCallingConventions(core::Context &context) const override;
     void detectCallingConvention(core::Context &context, const core::ir::calling::CalleeId &calleeId) const override;
 };
 

diff --git a/src/nc/core/MasterAnalyzer.cpp b/src/nc/core/MasterAnalyzer.cpp
@@ -96,6 +96,10 @@ void MasterAnalyzer::createHooks(Context &context) const {
     });
 }
 
+void MasterAnalyzer::detectCallingConventions(Context &) const {
+    return;
+}
+
 void MasterAnalyzer::detectCallingConvention(Context &context, const ir::calling::CalleeId &calleeId) const {
     if (!context.image()->architecture()->conventions().empty()) {
         context.conventions()->setConvention(calleeId, context.image()->architecture()->conventions().front());
@@ -230,6 +234,9 @@ void MasterAnalyzer::decompile(Context &context) const {
     createHooks(context);
     context.cancellationToken().poll();
 
+    detectCallingConventions(context);
+    context.cancellationToken().poll();
+
     dataflowAnalysis(context);
     context.cancellationToken().poll();
 

diff --git a/src/nc/core/MasterAnalyzer.h b/src/nc/core/MasterAnalyzer.h
@@ -81,6 +81,8 @@ class MasterAnalyzer {
      */
     virtual void createHooks(Context &context) const;
 
+    virtual void detectCallingConventions(Context &context) const;
+
     /**
      * Detects and sets the calling convention of a function.
      *