Support call <register> in X86InstructionSet

ItsBruhs · gompoc · commit 5d4be29ebf79 · 2024-12-17T17:58:38.000Z
diff --git a/Cpp2IL.Core/InstructionSets/X86InstructionSet.cs b/Cpp2IL.Core/InstructionSets/X86InstructionSet.cs
@@ -358,7 +358,11 @@ static InstructionSetIndependentOperand ConvertVector(string reg, int imm) =>
 
                 var target = instruction.NearBranchTarget;
 
-                if (context.AppContext.MethodsByAddress.TryGetValue(target, out var possibleMethods))
+                if (instruction.Op0Kind == OpKind.Register)
+                {
+                    builder.CallRegister(instruction.IP, ConvertOperand(instruction, 0));
+                }
+                else if (context.AppContext.MethodsByAddress.TryGetValue(target, out var possibleMethods))
                 {
                     if (possibleMethods.Count == 1)
                     {

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,11 @@ static InstructionSetIndependentOperand ConvertVector(string reg, int imm) =>`
`358`	`358`
`359`	`359`	`var target = instruction.NearBranchTarget;`
`360`	`360`
`361`		`- if (context.AppContext.MethodsByAddress.TryGetValue(target, out var possibleMethods))`
	`361`	`+ if (instruction.Op0Kind == OpKind.Register)`
	`362`	`+ {`
	`363`	`+ builder.CallRegister(instruction.IP, ConvertOperand(instruction, 0));`
	`364`	`+ }`
	`365`	`+ else if (context.AppContext.MethodsByAddress.TryGetValue(target, out var possibleMethods))`
`362`	`366`	`{`
`363`	`367`	`if (possibleMethods.Count == 1)`
`364`	`368`	`{`