Fix sampler

Author: xoofx

src/Ultra.Sampler/MacOS/MacOSUltraSampler.cs

@@ -293,7 +293,7 @@ private static unsafe void Sample(MacOS.MacOSLibSystem.mach_port_t rootTask, ulo
 
                     //Console.WriteLine($"sp: 0x{armThreadState.__sp:X8}, fp: 0x{armThreadState.__fp:X8}, lr: 0x{armThreadState.__lr:X8}");
                     int frameCount = WalkNativeCallStack(armThreadState.__sp, armThreadState.__fp, armThreadState.__lr, pFrames);
-                    nativeCallstack(threadInfo.thread_id, frameCount, (ulong)pFrames);
+                    nativeCallstack(threadInfo.thread_id, frameCount, (byte*)pFrames);
                 }
                 finally
                 {

src/Ultra.Sampler/MacOS/NativeCallstackDelegate.cs

@@ -4,4 +4,4 @@
 
 namespace Ultra.Sampler.MacOS;
 
-internal unsafe delegate void NativeCallstackDelegate(ulong threadId, int frameCount, ulong pFrames);
+internal unsafe delegate void NativeCallstackDelegate(ulong threadId, int frameCount, byte* pFrames);

src/Ultra.Sampler/UltraSamplerSource.cs

@@ -20,14 +20,14 @@ private UltraSamplerSource()
 
     [Event(UltraSamplerConstants.NativeCallStackEventId, Level = EventLevel.Informational)]
     [UnconditionalSuppressMessage("Trimming", "IL2026:Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code", Justification = "<Pending>")]
-    public unsafe void OnNativeCallstack(ulong threadId, int frameCount, ulong frames) // frames is last to allow perfview to visualize previous fixed size arguments and also, it is an ulong otherwise the EventSource will silently fail to register!
+    public unsafe void OnNativeCallstack(ulong threadId, int frameCount, byte* frames) // frames is last to allow perfview to visualize previous fixed size arguments and also, it is an ulong otherwise the EventSource will silently fail to register!
     {
         var evt = stackalloc EventData[3];
         evt[0].DataPointer = (nint)(void*)&threadId;
         evt[0].Size = sizeof(ulong);
-        evt[1].DataPointer = (int) &frameCount;
+        evt[1].DataPointer = (nint)(void*)&frameCount;
         evt[1].Size = sizeof(int);
-        evt[2].DataPointer = (nint)frames;
+        evt[2].DataPointer = (nint)(void*)&frames;
         evt[2].Size = frameCount * sizeof(ulong);
         WriteEventCore(UltraSamplerConstants.NativeCallStackEventId, 3, evt);
     }
@@ -56,8 +56,13 @@ private UltraSamplerSource()
                 evt[5].DataPointer = (nint)evtPathPtr;
                 evt[5].Size = modulePathUtf8Length;
             }
-            
-            WriteEventCore(UltraSamplerConstants.NativeModuleEventId, modulePathUtf8Length > 0 ? 6 : 5, evt);
+            else
+            {
+                evt[5].DataPointer = (nint)(void*)&loadAddress;
+                evt[5].Size = 0;
+            }
+
+            WriteEventCore(UltraSamplerConstants.NativeModuleEventId, 6, evt);
         }
     }