GetFindableID -> GetID, split up Extensions, refactor DMD gens

MonoMod · Jul 18, 2019 · a70072c · a70072c
1 parent bfa8124
commit a70072c
Show file tree

Hide file tree

Showing 12 changed files with 28 additions and 317 deletions.
diff --git a/MonoMod.Common b/MonoMod.Common
diff --git a/MonoMod.DebugIL/DebugILGenerator.cs b/MonoMod.DebugIL/DebugILGenerator.cs
@@ -194,7 +194,7 @@ public static void Generate(MonoModder modder)
                 writer.Write("// Method: (");
                 writer.Write(method.Attributes);
                 writer.Write(") ");
-                writer.WriteLine(method.GetFindableID()); Line++;
+                writer.WriteLine(method.GetID()); Line++;
                 writer.WriteLine(); Line++;
 
                 // TODO: [DbgILGen] Other method metadata?

diff --git a/MonoMod.RuntimeDetour/Detour.cs b/MonoMod.RuntimeDetour/Detour.cs
@@ -59,7 +59,7 @@ public class Detour : ISortableDetour {
             get => _ID;
             set {
                 if (string.IsNullOrEmpty(value))
-                    value = Target.GetFindableID(simple: true);
+                    value = Target.GetID(simple: true);
                 if (_ID == value)
                     return;
                 _ID = value;
@@ -144,7 +144,7 @@ public class Detour : ISortableDetour {
             }
 
             using (DynamicMethodDefinition dmd = new DynamicMethodDefinition(
-                $"Chain<{Method.GetFindableID(simple: true)}>?{GetHashCode()}",
+                $"Chain<{Method.GetID(simple: true)}>?{GetHashCode()}",
                 (Method as MethodInfo)?.ReturnType ?? typeof(void), argTypes
             ))
                 _ChainedTrampoline = dmd.StubCriticalDetour().Generate().Pin();
@@ -338,7 +338,7 @@ public Detour(Expression<Action> from, Expression<Action> to)
                 argTypes[i] = args[i].ParameterType;
 
             using (DynamicMethodDefinition dmd = new DynamicMethodDefinition(
-                $"Trampoline<{Method.GetFindableID(simple: true)}>?{GetHashCode()}",
+                $"Trampoline<{Method.GetID(simple: true)}>?{GetHashCode()}",
                 returnType, argTypes
             )) {
                 ILProcessor il = dmd.GetILProcessor();

diff --git a/MonoMod.RuntimeDetour/DetourContext.cs b/MonoMod.RuntimeDetour/DetourContext.cs
@@ -96,7 +96,7 @@ public sealed class DetourContext : IDisposable {
                 Creator = caller;
                 break;
             }
-            _FallbackID = Creator?.DeclaringType?.Assembly?.GetName().Name ?? Creator?.GetFindableID(simple: true);
+            _FallbackID = Creator?.DeclaringType?.Assembly?.GetName().Name ?? Creator?.GetID(simple: true);
 
             Last = this;
             Contexts.Add(this);

diff --git a/MonoMod.RuntimeDetour/Hook.cs b/MonoMod.RuntimeDetour/Hook.cs
@@ -90,7 +90,7 @@ public class Hook : IDetour {
             ILProcessor il;
 
             using (dmd = new DynamicMethodDefinition(
-                $"Hook<{Method.GetFindableID(simple: true)}>?{GetHashCode()}",
+                $"Hook<{Method.GetID(simple: true)}>?{GetHashCode()}",
                 (Method as MethodInfo)?.ReturnType ?? typeof(void), argTypes
             )) {
                 il = dmd.GetILProcessor();
@@ -121,7 +121,7 @@ public class Hook : IDetour {
                     origArgTypes[i] = origArgs[i].ParameterType;
 
                 using (dmd = new DynamicMethodDefinition(
-                    $"Chain:TMP<{Method.GetFindableID(simple: true)}>?{GetHashCode()}",
+                    $"Chain:TMP<{Method.GetID(simple: true)}>?{GetHashCode()}",
                     (origInvoke as MethodInfo)?.ReturnType ?? typeof(void), origArgTypes
                 )) {
                     il = dmd.GetILProcessor();

diff --git a/MonoMod.RuntimeDetour/HookGen/HookEndpointManager.cs b/MonoMod.RuntimeDetour/HookGen/HookEndpointManager.cs
@@ -10,15 +10,6 @@ public static class HookEndpointManager {
         private static readonly Dictionary<MethodBase, object> HookEndpointMap = new Dictionary<MethodBase, object>();
         private static readonly Dictionary<object, List<HookEntry>> OwnedHookLists = new Dictionary<object, List<HookEntry>>();
 
-        [Obsolete("Use the ILHook counterpart instead")]
-        public static event Func<AssemblyName, ModuleDefinition> OnGenerateCecilModule {
-            add => ILHook.OnGenerateCecilModule += value;
-            remove => ILHook.OnGenerateCecilModule += value;
-        }
-        [Obsolete("Use the ILHook counterpart instead")]
-        public static ModuleDefinition GenerateCecilModule(AssemblyName name)
-            => ILHook.GenerateCecilModule(name);
-
         public static event Func<Delegate, object> OnGetOwner;
         public static object GetOwner(Delegate hook)
             => (OnGetOwner ?? DefaultOnGetOwner).InvokeWhileNull<object>(hook);

diff --git a/MonoMod.RuntimeDetour/ILHook.cs b/MonoMod.RuntimeDetour/ILHook.cs
@@ -33,10 +33,6 @@ public class ILHook : ISortableDetour {
 
         private Context _Ctx => _Map.TryGetValue(Method, out Context ctx) ? ctx : null;
 
-        public static event Func<AssemblyName, ModuleDefinition> OnGenerateCecilModule;
-        public static ModuleDefinition GenerateCecilModule(AssemblyName name)
-            => OnGenerateCecilModule?.InvokeWhileNull<ModuleDefinition>(name);
-
         public bool IsValid => Index != -1;
         public bool IsApplied { get; private set; }
 
@@ -62,7 +58,7 @@ public static ModuleDefinition GenerateCecilModule(AssemblyName name)
             get => _ID;
             set {
                 if (string.IsNullOrEmpty(value))
-                    value = Manipulator.Method?.GetFindableID(simple: true) ?? GetHashCode().ToString();
+                    value = Manipulator.Method?.GetID(simple: true) ?? GetHashCode().ToString();
                 if (_ID == value)
                     return;
                 _ID = value;
@@ -243,7 +239,7 @@ private class Context {
                     DetourSorter<ILHook>.Sort(hooks);
 
                     MethodBase dm;
-                    using (DynamicMethodDefinition dmd = new DynamicMethodDefinition(Method, GenerateCecilModule)) {
+                    using (DynamicMethodDefinition dmd = new DynamicMethodDefinition(Method)) {
                         MethodDefinition def = dmd.Definition;
                         foreach (ILHook cb in hooks)
                             InvokeManipulator(def, cb.Manipulator);

diff --git a/MonoMod.RuntimeDetour/NativeDetour.cs b/MonoMod.RuntimeDetour/NativeDetour.cs
@@ -238,7 +238,7 @@ public NativeDetour(Delegate from, Delegate to)
                 argTypes[i] = args[i].ParameterType;
 
             using (DynamicMethodDefinition dmd = new DynamicMethodDefinition(
-                $"Trampoline:Native<{Method?.GetFindableID(simple: true) ?? ((long) Data.Method).ToString("X16")}>?{GetHashCode()}",
+                $"Trampoline:Native<{Method?.GetID(simple: true) ?? ((long) Data.Method).ToString("X16")}>?{GetHashCode()}",
                 returnType, argTypes
             )) {
                 ILProcessor il = dmd.GetILProcessor();

diff --git a/MonoMod.Utils/Extensions.cs b/MonoMod.Utils/Extensions.cs
@@ -221,20 +221,5 @@ public static string ToHexadecimalString(this byte[] data)
             }
         }
 
-        public static bool IsCompatible(this Type type, Type other)
-            => _IsCompatible(type, other) || _IsCompatible(other, type);
-        public static bool _IsCompatible(this Type type, Type other) {
-            if (type == other)
-                return true;
-
-            if (type.IsAssignableFrom(other))
-                return true;
-
-            if (other.IsEnum && IsCompatible(type, Enum.GetUnderlyingType(other)))
-                return true;
-
-            return false;
-        }
-
     }
 }
diff --git a/MonoMod.Utils/FastReflectionHelper.cs b/MonoMod.Utils/FastReflectionHelper.cs
@@ -16,7 +16,7 @@ public static class FastReflectionHelper {
         private static readonly MethodInfo m_object_GetType = typeof(object).GetMethod("GetType");
 
         public static FastReflectionDelegate CreateFastDelegate(this MethodBase method, bool directBoxValueAccess = true) {
-            DynamicMethod dynam = new DynamicMethod($"FastReflection<{method.GetFindableID(simple: true)}>", typeof(object), _DynamicMethodDelegateArgs, typeof(FastReflectionHelper).Module, true);
+            DynamicMethod dynam = new DynamicMethod($"FastReflection<{method.GetID(simple: true)}>", typeof(object), _DynamicMethodDelegateArgs, typeof(FastReflectionHelper).Module, true);
             ILGenerator il = dynam.GetILGenerator();
 
             ParameterInfo[] args = method.GetParameters();
@@ -114,7 +114,7 @@ public static class FastReflectionHelper {
             for (int i = 0; i < args.Length; i++)
                 argTypes[i] = args[i].ParameterType;
 
-            DynamicMethod dynam = new DynamicMethod($"FastReflection:JMP<{method.GetFindableID(simple: true)}>", invoke.ReturnType, argTypes, typeof(FastReflectionHelper).Module, true);
+            DynamicMethod dynam = new DynamicMethod($"FastReflection:JMP<{method.GetID(simple: true)}>", invoke.ReturnType, argTypes, typeof(FastReflectionHelper).Module, true);
             ILGenerator il = dynam.GetILGenerator();
 
             il.Emit(OpCodes.Jmp, (MethodInfo) method);