Refactor event keyword

zfs990 · Oct 7, 2022 · 7162f6b · 7162f6b
1 parent c6715cc
commit 7162f6b
Showing 1 changed file with 26 additions and 35 deletions.
diff --git a/ILRuntime/Runtime/Intepreter/ILIntepreter.cs b/ILRuntime/Runtime/Intepreter/ILIntepreter.cs
@@ -1997,24 +1997,7 @@ public object Run(ILMethod method, object instance, object[] p)
                                             }
                                             else if (ilm.IsEventAdd)
                                             {
-                                                instance = null;
-                                                var dele = StackObject.ToObject(esp - 1, domain, mStack);
-                                                Free(esp - 1);
-                                                if (ilm.IsStatic)
-                                                {
-                                                    instance = ((ILType)ilm.DeclearingType).StaticInstance;
-                                                    objRef = esp - 1;
-                                                }
-                                                else
-                                                {
-                                                    objRef = esp - 2;
-                                                    instance = StackObject.ToObject(objRef, domain, mStack) as ILTypeInstance;
-                                                    Free(objRef);
-                                                }
-                                                obj = instance[ilm.EventFieldIndex];
-
-                                                objRef = PushObject(objRef, mStack, obj);
-                                                objRef = PushObject(objRef, mStack, dele);
+                                                objRef = PrepareEventHandler(esp, ilm, mStack, out instance);
 
                                                 esp = CLRRedirections.DelegateCombine(this, objRef, mStack, null, false);
                                                 obj = StackObject.ToObject(esp - 1, domain, mStack);
@@ -2025,23 +2008,7 @@ public object Run(ILMethod method, object instance, object[] p)
                                             }
                                             else if (ilm.IsEventRemove)
                                             {
-                                                instance = null;
-                                                var dele = StackObject.ToObject(esp - 1, domain, mStack);
-                                                Free(esp - 1);
-                                                if (ilm.IsStatic)
-                                                {
-                                                    instance = ((ILType)ilm.DeclearingType).StaticInstance;
-                                                    objRef = esp - 1;
-                                                }
-                                                else
-                                                {
-                                                    objRef = esp - 2;
-                                                    instance = StackObject.ToObject(objRef, domain, mStack) as ILTypeInstance;
-                                                    Free(objRef);
-                                                }
-                                                obj = instance[ilm.EventFieldIndex];
-                                                objRef = PushObject(objRef, mStack, obj);
-                                                objRef = PushObject(objRef, mStack, dele);
+                                                objRef = PrepareEventHandler(esp, ilm, mStack, out instance);
 
                                                 esp = CLRRedirections.DelegateRemove(this, objRef, mStack, null, false);
                                                 obj = StackObject.ToObject(esp - 1, domain, mStack);
@@ -4713,6 +4680,30 @@ public object Run(ILMethod method, object instance, object[] p)
             //ClearStack
             return stack.PopFrame(ref frame, esp);
         }
+
+        StackObject* PrepareEventHandler(StackObject* esp, ILMethod ilm, AutoList mStack, out ILTypeInstance instance)
+        {
+            instance = null;
+            StackObject* objRef;
+            var dele = StackObject.ToObject(esp - 1, domain, mStack);
+            Free(esp - 1);
+            if (ilm.IsStatic)
+            {
+                instance = ((ILType)ilm.DeclearingType).StaticInstance;
+                objRef = esp - 1;
+            }
+            else
+            {
+                objRef = esp - 2;
+                instance = StackObject.ToObject(objRef, domain, mStack) as ILTypeInstance;
+                Free(objRef);
+            }
+            var obj = instance[ilm.EventFieldIndex];
+
+            objRef = PushObject(objRef, mStack, obj);
+            objRef = PushObject(objRef, mStack, dele);
+            return objRef;
+        }
         ExceptionHandler FindExceptionHandlerByBranchTarget(int addr, int branchTarget, ExceptionHandler[] ehs)
         {
             ExceptionHandler eh = null;