Merge pull request #2 from ntherning/alternate-mono_pmip-symbol-lookup

Alternate method of finding the mono_pmip symbol which also works on 64-bit processes

Author: jbevain

PmipRunner.cs

@@ -2,13 +2,13 @@
 using Microsoft.VisualStudio.Debugger;
 using Microsoft.VisualStudio.Debugger.CallStack;
 using Microsoft.VisualStudio.Debugger.Evaluation;
+using Microsoft.VisualStudio.Debugger.Native;
 
 namespace PmipMyCallStack
 {
 	class PmipRunner
 	{
 		private static readonly DkmLanguage CppLanguage = DkmLanguage.Create("C++", new DkmCompilerId(DkmVendorId.Microsoft, DkmLanguageId.Cpp));
-		private static readonly string[] Modules = { "mono", "monosgen-2.0" };
 
 		private readonly DkmStackContext _stackContext;
 		private readonly DkmStackWalkFrame _frame;
@@ -59,14 +59,12 @@ private bool TryGetPmipFunction(out PmipFunctionDataItem pmipFunction)
 			if (pmipFunction != null)
 				return true;
 
-			foreach (var module in Modules)
+			foreach (var module in this._frame.RuntimeInstance.GetModuleInstances())
 			{
-				var definition = $"{{,,{module}}}mono_pmip";
-
-				PmipFunctionDataItem item = null;
-				if (!EvaluateExpression(definition, r => item = new PmipFunctionDataItem {PmipFunction = definition}))
+				var address = (module as DkmNativeModuleInstance)?.FindExportName("mono_pmip", IgnoreDataExports: true);
+				if (address == null)
 					continue;
-
+				var item = new PmipFunctionDataItem { PmipFunction = "0x" + address.CPUInstructionPart.InstructionPointer.ToString("X") };
 				pmipFunction = item;
 				_stackContext.SetDataItem(DkmDataCreationDisposition.CreateAlways, item);
 				return true;
@@ -116,4 +114,4 @@ private bool EvaluateExpression(string expression, Action<DkmSuccessEvaluationRe
 			return success;
 		}
 	}
-}
+}