Strip SharpDisasm from LibCpp2IL in favor of iced

SamboyCoding · Sep 11, 2020 · 38fab4d · 38fab4d
1 parent 786f970
commit 38fab4d
Show file tree

Hide file tree

Showing 17 changed files with 437 additions and 410 deletions.
diff --git a/Cpp2IL/Analysis/ASMAnalyzer.cs b/Cpp2IL/Analysis/ASMAnalyzer.cs
diff --git a/Cpp2IL/Analysis/Actions/CallManagedFunctionAction.cs b/Cpp2IL/Analysis/Actions/CallManagedFunctionAction.cs
@@ -44,7 +44,7 @@ private bool CheckParameters(Il2CppMethodDefinition method, MethodAnalysis conte
 
         public CallManagedFunctionAction(MethodAnalysis context, Instruction instruction) : base(context, instruction)
         {
-            var jumpTarget = LibCpp2ILUtils.GetJumpTarget(instruction, context.MethodStart + instruction.PC);
+            var jumpTarget = Utils.GetJumpTarget(instruction, context.MethodStart + instruction.PC);
             var objectMethodBeingCalledOn = context.GetLocalInReg("rcx");
             var listOfCallableMethods = LibCpp2IlMain.GetManagedMethodImplementationsAtAddress(jumpTarget);
 

diff --git a/Cpp2IL/Analysis/Actions/CallVirtualMethodAction.cs b/Cpp2IL/Analysis/Actions/CallVirtualMethodAction.cs
@@ -21,7 +21,7 @@ public CallVirtualMethodAction(MethodAnalysis context, Instruction instruction)
 
             var classReadFrom = klass.backingType;
 
-            var readOffset = LibCpp2ILUtils.GetOperandMemoryOffset(instruction.Operands[0]);
+            var readOffset = Utils.GetOperandMemoryOffset(instruction.Operands[0]);
             Called = Utils.GetMethodFromReadKlassOffset(readOffset);
 
             if (Called == null) return;

diff --git a/Cpp2IL/Analysis/Actions/GlobalMethodRefToConstantAction.cs b/Cpp2IL/Analysis/Actions/GlobalMethodRefToConstantAction.cs
@@ -17,7 +17,7 @@ public class GlobalMethodRefToConstantAction : BaseAction
 
         public GlobalMethodRefToConstantAction(MethodAnalysis context, Instruction instruction) : base(context, instruction)
         {
-            var globalAddress = context.MethodStart + LibCpp2ILUtils.GetOffsetFromMemoryAccess(instruction, instruction.Operands[1]);
+            var globalAddress = context.MethodStart + Utils.GetOffsetFromMemoryAccess(instruction, instruction.Operands[1]);
             MethodData = LibCpp2IlMain.GetMethodDefinitionByGlobalAddress(globalAddress);
             var (type, genericParams) = Utils.TryLookupTypeDefByName(MethodData!.DeclaringType.FullName);
 

diff --git a/Cpp2IL/Analysis/Actions/GlobalStringRefToConstantAction.cs b/Cpp2IL/Analysis/Actions/GlobalStringRefToConstantAction.cs
@@ -13,7 +13,7 @@ public class GlobalStringRefToConstantAction : BaseAction
 
         public GlobalStringRefToConstantAction(MethodAnalysis context, Instruction instruction) : base(context, instruction)
         {
-            var globalAddress = context.MethodStart + LibCpp2ILUtils.GetOffsetFromMemoryAccess(instruction, instruction.Operands[1]);
+            var globalAddress = context.MethodStart + Utils.GetOffsetFromMemoryAccess(instruction, instruction.Operands[1]);
             ResolvedString = LibCpp2IlMain.GetLiteralByAddress(globalAddress);
 
             if (ResolvedString == null) return;

diff --git a/Cpp2IL/Analysis/Actions/GlobalTypeRefToConstantAction.cs b/Cpp2IL/Analysis/Actions/GlobalTypeRefToConstantAction.cs
@@ -15,7 +15,7 @@ public class GlobalTypeRefToConstantAction : BaseAction
 
         public GlobalTypeRefToConstantAction(MethodAnalysis context, Instruction instruction) : base(context, instruction)
         {
-            var globalAddress = context.MethodStart + LibCpp2ILUtils.GetOffsetFromMemoryAccess(instruction, instruction.Operands[1]);
+            var globalAddress = context.MethodStart + Utils.GetOffsetFromMemoryAccess(instruction, instruction.Operands[1]);
             var typeData = LibCpp2IlMain.GetTypeGlobalByAddress(globalAddress);
             var (type, genericParams) = Utils.TryLookupTypeDefByName(typeData!.ToString());
             ResolvedType = type;

diff --git a/Cpp2IL/Analysis/Actions/JumpIfNonZeroOrNonNullAction.cs b/Cpp2IL/Analysis/Actions/JumpIfNonZeroOrNonNullAction.cs
@@ -14,7 +14,7 @@ public class JumpIfNonZeroOrNonNullAction : BaseAction
 
         public JumpIfNonZeroOrNonNullAction(MethodAnalysis context, Instruction instruction) : base(context, instruction)
         {
-            jumpTarget = LibCpp2ILUtils.GetJumpTarget(instruction, instruction.PC + context.MethodStart);
+            jumpTarget = Utils.GetJumpTarget(instruction, instruction.PC + context.MethodStart);
 
             if (jumpTarget > context.MethodStart + instruction.PC && jumpTarget < context.AbsoluteMethodEnd)
             {

diff --git a/Cpp2IL/Analysis/Actions/JumpIfZeroOrNullAction.cs b/Cpp2IL/Analysis/Actions/JumpIfZeroOrNullAction.cs
@@ -14,7 +14,7 @@ public class JumpIfZeroOrNullAction : BaseAction
 
         public JumpIfZeroOrNullAction(MethodAnalysis context, Instruction instruction) : base(context, instruction)
         {
-            jumpTarget = LibCpp2ILUtils.GetJumpTarget(instruction, instruction.PC + context.MethodStart);
+            jumpTarget = Utils.GetJumpTarget(instruction, instruction.PC + context.MethodStart);
 
             if (jumpTarget > context.MethodStart + instruction.PC && jumpTarget < context.AbsoluteMethodEnd)
             {

diff --git a/Cpp2IL/Analysis/Actions/LoadVirtualFunctionPointerAction.cs b/Cpp2IL/Analysis/Actions/LoadVirtualFunctionPointerAction.cs
@@ -23,15 +23,15 @@ public LoadVirtualFunctionPointerAction(MethodAnalysis context, Instruction inst
 
             classReadFrom = klass.backingType;
 
-            var readOffset = LibCpp2ILUtils.GetOperandMemoryOffset(instruction.Operands[1]);
+            var readOffset = Utils.GetOperandMemoryOffset(instruction.Operands[1]);
             methodPointerRead = Utils.GetMethodFromReadKlassOffset(readOffset);
 
             if (methodPointerRead == null) return;
 
             var regPutInto = Utils.GetRegisterName(instruction.Operands[0]);
             if (regPutInto == "rsp")
             {
-                var stackOffset = LibCpp2ILUtils.GetOperandMemoryOffset(instruction.Operands[0]);
+                var stackOffset = Utils.GetOperandMemoryOffset(instruction.Operands[0]);
                 context.PushToStack(context.MakeConstant(typeof(MethodDefinition), methodPointerRead), stackOffset);
             }
             else