[change] change type of the first argument methodPointer of Managed2NativeFunctionPointer from const void* to Il2CppMethodPointer

Author: pirunxi

Editor/MethodBridge/CallNativeMethodSignatureInfo.cs

@@ -0,0 +1,9 @@
+using dnlib.DotNet;
+
+namespace HybridCLR.Editor.MethodBridge
+{
+    public class CallNativeMethodSignatureInfo
+    {
+        public MethodSig MethodSig { get; set; }
+    }
+}

Editor/MethodBridge/CallNativeMethodSignatureInfo.cs.meta

@@ -10,18 +10,13 @@
 namespace HybridCLR.Editor.MethodBridge
 {
 
-    public class RawCalliMethodSignatureInfo
-    {
-        public MethodSig MethodSig { get; set; }
-    }
-
     public class CalliAnalyzer
     {
         private readonly List<ModuleDefMD> _rootModules = new List<ModuleDefMD>();
 
-        private readonly List<RawCalliMethodSignatureInfo> _calliMethodSignatures = new List<RawCalliMethodSignatureInfo>();
+        private readonly List<CallNativeMethodSignatureInfo> _calliMethodSignatures = new List<CallNativeMethodSignatureInfo>();
 
-        public List<RawCalliMethodSignatureInfo> CalliMethodSignatures => _calliMethodSignatures;
+        public List<CallNativeMethodSignatureInfo> CalliMethodSignatures => _calliMethodSignatures;
 
         public CalliAnalyzer(AssemblyCache cache, List<string> assemblyNames)
         {
@@ -51,7 +46,7 @@ private void CollectCalli()
                         {
                             MethodSig methodSig = (MethodSig)il.Operand;
 
-                            _calliMethodSignatures.Add(new RawCalliMethodSignatureInfo()
+                            _calliMethodSignatures.Add(new CallNativeMethodSignatureInfo()
                             {
                                 MethodSig = methodSig,
                             });

Editor/MethodBridge/CalliAnalyzer.cs

@@ -32,7 +32,7 @@ public class Options
 
             public List<RawReversePInvokeMethodInfo> ReversePInvokeMethods { get; set; }
 
-            public IReadOnlyCollection<RawCalliMethodSignatureInfo> CalliMethodSignatures { get; set; }
+            public IReadOnlyCollection<CallNativeMethodSignatureInfo> CalliMethodSignatures { get; set; }
 
             public bool Development { get; set; }
         }
@@ -61,7 +61,7 @@ private class CalliMethodInfo
 
         private readonly List<RawReversePInvokeMethodInfo> _originalReversePInvokeMethods;
 
-        private readonly List<RawCalliMethodSignatureInfo> _originalCalliMethodSignatures;
+        private readonly List<CallNativeMethodSignatureInfo> _originalCalliMethodSignatures;
 
         private readonly string _templateCode;
 
@@ -624,7 +624,7 @@ private List<ABIReversePInvokeMethodInfo> BuildABIMethods(List<RawReversePInvoke
             return newMethods;
         }
 
-        private List<CalliMethodInfo> BuildCalliMethods(List<RawCalliMethodSignatureInfo> rawMethods)
+        private List<CalliMethodInfo> BuildCalliMethods(List<CallNativeMethodSignatureInfo> rawMethods)
         {
             var methodsBySig = new Dictionary<string, CalliMethodInfo>();
             foreach (var method in rawMethods)
@@ -1228,7 +1228,7 @@ private void GenerateManaged2NativeFunctionPointerMethod(CalliMethodInfo methodI
             string paramNameListStr = string.Join(", ", method.ParamInfos.Select(p => GetManaged2NativePassParam(p.Type, $"localVarBase+argVarIndexs[{p.Index}]")));
             string il2cppCallConventionName = GetIl2cppCallConventionName(methodInfo.Callvention);
             lines.Add($@"
-static void __M2NF_{methodInfo.Signature}(const void* methodPointer, uint16_t* argVarIndexs, StackObject* localVarBase, void* ret)
+static void __M2NF_{methodInfo.Signature}(Il2CppMethodPointer methodPointer, uint16_t* argVarIndexs, StackObject* localVarBase, void* ret)
 {{
     typedef {method.ReturnInfo.Type.GetTypeName()} ({il2cppCallConventionName} *NativeMethod)({paramListStr});
     {(!method.ReturnInfo.IsVoid ? $"*({method.ReturnInfo.Type.GetTypeName()}*)ret = " : "")}((NativeMethod)(methodPointer))({paramNameListStr});