bel
/
ryubing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor syscall method generation for static methods 

Introduce `isStaticMethod` dictionary to track static methods. Update `GenerateMethod32` and `GenerateMethod64` to adjust method signatures and invocations based on static status. Modify `GenerateDispatch` to call methods correctly depending on their static nature. Add `Is32BitInteger` helper method for type checking.
merge-requests/93/head
MrKev312 2025-08-01 22:44:44 +02:00 committed by GreemDev
parent f5f89609f4
commit 17f7ca8bdc
1 changed files with 39 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/Ryujinx.Horizon.Kernel.Generators/SyscallGenerator.cs
View File

@ -146,11 +146,15 @@ namespace Ryujinx.Horizon.Kernel.Generators
generator.AppendLine();
List<SyscallIdAndName> syscalls = [];
Dictionary<string, bool> isStaticMethod = new();
foreach (MethodDeclarationSyntax method in syntaxReceiver.SvcImplementations)
{
GenerateMethod32(generator, context.Compilation, method);
GenerateMethod64(generator, context.Compilation, method);
bool isStatic = method.Modifiers.Any(SyntaxKind.StaticKeyword);
isStaticMethod[method.Identifier.Text] = isStatic;
GenerateMethod32(generator, context.Compilation, method, isStatic);
GenerateMethod64(generator, context.Compilation, method, isStatic);
foreach (AttributeSyntax attribute in method.AttributeLists.SelectMany(attributeList =>
attributeList.Attributes.Where(attribute =>
@ -166,9 +170,9 @@ namespace Ryujinx.Horizon.Kernel.Generators
syscalls.Sort();
GenerateDispatch(generator, syscalls, A32Suffix);
GenerateDispatch(generator, syscalls, A32Suffix, isStaticMethod);
generator.AppendLine();
GenerateDispatch(generator, syscalls, A64Suffix);
GenerateDispatch(generator, syscalls, A64Suffix, isStaticMethod);
generator.LeaveScope();
generator.LeaveScope();
@ -193,9 +197,13 @@ namespace Ryujinx.Horizon.Kernel.Generators
generator.LeaveScope();
}
private static void GenerateMethod32(CodeGenerator generator, Compilation compilation, MethodDeclarationSyntax method)
private static void GenerateMethod32(CodeGenerator generator, Compilation compilation, MethodDeclarationSyntax method, bool isStatic)
{
generator.EnterScope($"private static void {method.Identifier.Text}{A32Suffix}(Syscall syscall, {TypeExecutionContext} context)");
string methodParams = isStatic
? $"{TypeExecutionContext} context"
: $"Syscall syscall, {TypeExecutionContext} context";
generator.EnterScope($"private static void {method.Identifier.Text}{A32Suffix}({methodParams})");
string[] args = new string[method.ParameterList.Parameters.Count];
int index = 0;
@ -266,9 +274,12 @@ namespace Ryujinx.Horizon.Kernel.Generators
string result = null;
string canonicalReturnTypeName = null;
string callPrefix = isStatic
? $"{(method.Parent is ClassDeclarationSyntax cls ? cls.Identifier.Text + "." : "")}{method.Identifier.Text}"
: $"syscall.{method.Identifier.Text}";
if (method.ReturnType.ToString() != "void")
{
generator.AppendLine($"var {ResultVariableName} = syscall.{method.Identifier.Text}({argsList});");
generator.AppendLine($"var {ResultVariableName} = {callPrefix}({argsList});");
canonicalReturnTypeName = GetCanonicalTypeName(compilation, method.ReturnType);
if (canonicalReturnTypeName == TypeResult)
@ -289,7 +300,7 @@ namespace Ryujinx.Horizon.Kernel.Generators
}
else
{
generator.AppendLine($"syscall.{method.Identifier.Text}({argsList});");
generator.AppendLine($"{callPrefix}({argsList});");
}
foreach (OutParameter outParameter in outParameters)
@ -313,9 +324,12 @@ namespace Ryujinx.Horizon.Kernel.Generators
generator.AppendLine();
}
private static void GenerateMethod64(CodeGenerator generator, Compilation compilation, MethodDeclarationSyntax method)
private static void GenerateMethod64(CodeGenerator generator, Compilation compilation, MethodDeclarationSyntax method, bool isStatic)
{
generator.EnterScope($"private static void {method.Identifier.Text}{A64Suffix}(Syscall syscall, {TypeExecutionContext} context)");
string methodParams = isStatic
? $"{TypeExecutionContext} context"
: $"Syscall syscall, {TypeExecutionContext} context";
generator.EnterScope($"private static void {method.Identifier.Text}{A64Suffix}({methodParams})");
string[] args = new string[method.ParameterList.Parameters.Count];
int registerIndex = 0;
@ -356,9 +370,12 @@ namespace Ryujinx.Horizon.Kernel.Generators
string result = null;
string canonicalReturnTypeName = null;
string callPrefix = isStatic
? $"{(method.Parent is ClassDeclarationSyntax cls ? cls.Identifier.Text + "." : "")}{method.Identifier.Text}"
: $"syscall.{method.Identifier.Text}";
if (method.ReturnType.ToString() != "void")
{
generator.AppendLine($"var {ResultVariableName} = syscall.{method.Identifier.Text}({argsList});");
generator.AppendLine($"var {ResultVariableName} = {callPrefix}({argsList});");
canonicalReturnTypeName = GetCanonicalTypeName(compilation, method.ReturnType);
if (canonicalReturnTypeName == TypeResult)
@ -374,7 +391,7 @@ namespace Ryujinx.Horizon.Kernel.Generators
}
else
{
generator.AppendLine($"syscall.{method.Identifier.Text}({argsList});");
generator.AppendLine($"{callPrefix}({argsList});");
}
foreach (OutParameter outParameter in outParameters)
@ -463,7 +480,7 @@ namespace Ryujinx.Horizon.Kernel.Generators
generator.AppendLine($"Logger.{logLevel}?.PrintMsg(LogClass.{logClass}, $\"{log}\");");
}
private static void GenerateDispatch(CodeGenerator generator, List<SyscallIdAndName> syscalls, string suffix)
private static void GenerateDispatch(CodeGenerator generator, List<SyscallIdAndName> syscalls, string suffix, Dictionary<string, bool> isStaticMethod)
{
generator.EnterScope($"public static void Dispatch{suffix}(Syscall syscall, {TypeExecutionContext} context, int id)");
generator.EnterScope("switch (id)");
@ -473,7 +490,14 @@ namespace Ryujinx.Horizon.Kernel.Generators
generator.AppendLine($"case {syscall.Id}:");
generator.IncreaseIndentation();
generator.AppendLine($"{syscall.Name}{suffix}(syscall, context);");
if (isStaticMethod.TryGetValue(syscall.Name, out bool isStatic) && isStatic)
{
generator.AppendLine($"{syscall.Name}{suffix}(context);");
}
else
{
generator.AppendLine($"{syscall.Name}{suffix}(syscall, context);");
}
generator.AppendLine("break;");
generator.DecreaseIndentation();
@ -490,6 +514,7 @@ namespace Ryujinx.Horizon.Kernel.Generators
generator.LeaveScope();
}
private static bool Is32BitInteger(string canonicalTypeName)
{
return canonicalTypeName is TypeSystemInt32 or TypeSystemUInt32;