Slightly tweaked codegen location detection (mscorlib method) to work…

… with TLD.
SamboyCoding · Jan 22, 2021 · c097e6f · c097e6f
1 parent 75f9cd4
commit c097e6f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/LibCpp2IL/PE/PE.cs b/LibCpp2IL/PE/PE.cs
@@ -340,10 +340,7 @@ public bool PlusSearch(int methodCount, int typeDefinitionsCount)
             plusSearch.SetSearch(imageBase, dataSections);
             plusSearch.SetDataSections(imageBase, dataSections);
             plusSearch.SetExecSections(imageBase, execSections);
-            if (LibCpp2IlMain.MetadataVersion >= 24.2f)
-                codeRegistration = plusSearch.FindCodeRegistrationUsingMscorlib();
-            else
-                codeRegistration = is32Bit ? plusSearch.FindCodeRegistration() : plusSearch.FindCodeRegistration64Bit();
+
             if (is32Bit)
             {
                 Console.WriteLine("\t(32-bit PE)");
@@ -356,6 +353,11 @@ public bool PlusSearch(int methodCount, int typeDefinitionsCount)
                 plusSearch.SetExecSections(imageBase, dataSections);
                 metadataRegistration = plusSearch.FindMetadataRegistration64Bit();
             }
+
+            if (LibCpp2IlMain.MetadataVersion >= 24.2f)
+                codeRegistration = plusSearch.FindCodeRegistrationUsingMscorlib();
+            else
+                codeRegistration = is32Bit ? plusSearch.FindCodeRegistration() : plusSearch.FindCodeRegistration64Bit();
 
 #if ALLOW_CODEREG_FALLBACK
             if (codeRegistration == 0 || metadataRegistration == 0)

diff --git a/LibCpp2IL/PlusSearch.cs b/LibCpp2IL/PlusSearch.cs
@@ -172,7 +172,7 @@ internal ulong FindCodeRegistrationUsingMscorlib()
                     && i.OpCount == 2
                     && i.Op0Kind == OpKind.Register
                     && i.Op1Kind == OpKind.Memory
-                    && i.Op0Register == Register.RCX).ToList();
+                    /*&& i.Op0Register == Register.RCX*/).ToList();
 
                 var sanity = 0;
                 while (sanity++ < 500)