Arm64

ClrPhlib/include/ClrPhlib.h

@@ -162,6 +162,7 @@ namespace Dependencies {
 
             // return the processorArchiture of PE
             String^ GetProcessor();
+            bool CheckProcessor(String^ ProcessorArch);
 
             // Return the ApiSetSchema
             ApiSetSchema^ GetApiSetSchema();

ClrPhlib/src/managed/PE.cpp

@@ -209,7 +209,18 @@ String^ PE::GetProcessor()
     return gcnew String("arm");
   if ((Properties->Machine & 0xffff) == IMAGE_FILE_MACHINE_ARM64)
     return gcnew String("arm64");
-
+  if ((Properties->Machine & 0xffff) == IMAGE_FILE_MACHINE_AMD64)
+    return gcnew String("amd64");
+
   return gcnew String("unknown");
 }
 
+bool PE::CheckProcessor(String^ ProcessorArch)
+{
+  if (((Properties->Machine & 0xffff) == IMAGE_FILE_MACHINE_ARM64) && (ProcessorArch == "amd64"))
+    return true;
+
+  if (GetProcessor() == ProcessorArch)
+    return true;
+  return false;
+}

DependenciesLib/FindPeModule.cs

@@ -85,7 +85,7 @@ static string FindPeFromPath(string ModuleName, List<string> CandidateFolders, s
                 if (TestPe != null && TestPe.LoadSuccessful)
                 { 
                     Debug.WriteLine("Attempt to load {0:s} {1:s} {2:s}", PeFilePath, TestPe.GetProcessor(), ProcessorArch);
-                    if (TestPe.GetProcessor() == ProcessorArch)
+                    if (TestPe.CheckProcessor(ProcessorArch))
                         return PeFilePath;
                 }
             }