ryujinx/Opentk
1
0
Fork 0
mirror of https://github.com/Ryujinx/Opentk.git synced 2024-12-23 20:05:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Correct convenience wrapper implementation

Browse source
This commit is contained in:
Stefanos A 2013-12-04 22:26:30 +01:00
parent e2801c8c6c
commit 7487aab4d9
1 changed files with 62 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

104
Source/OpenTK.Rewrite/Program.cs
View file

@ -225,7 +225,6 @@ namespace OpenTK.Rewrite
// Create body for method // Create body for method
static void ProcessMethod(MethodDefinition wrapper, MethodDefinition native, int slot, FieldDefinition entry_points) static void ProcessMethod(MethodDefinition wrapper, MethodDefinition native, int slot, FieldDefinition entry_points)
{ {
var nint = wrapper.DeclaringType.Module.Import(mscorlib.MainModule.GetType("System.IntPtr"));
var body = wrapper.Body; var body = wrapper.Body;
var il = body.GetILProcessor(); var il = body.GetILProcessor();
var instructions = body.Instructions; var instructions = body.Instructions;
@ -233,13 +232,15 @@ namespace OpenTK.Rewrite
// Declare pinned variables for every reference and array parameter // Declare pinned variables for every reference and array parameter
// and push each parameter on the stack // and push each parameter on the stack
EmitParameters(wrapper, nint, body, il);
// Patch convenience wrappers // Patch convenience wrappers
if (wrapper.Parameters.Count < native.Parameters.Count) if (wrapper.Parameters.Count == native.Parameters.Count)
{ {
int parameter_count = EmitParameters(wrapper, nint, body, il); EmitParameters(wrapper, body, il);
int difference = native.Parameters.Count - parameter_count; }
else
{
int difference = native.Parameters.Count - wrapper.Parameters.Count;
EmitConvenienceWrapper(wrapper, native, difference, body, il); EmitConvenienceWrapper(wrapper, native, difference, body, il);
} }
@ -253,11 +254,15 @@ namespace OpenTK.Rewrite
{ {
EmitReturnTypeWrapper(wrapper, native, body, il); EmitReturnTypeWrapper(wrapper, native, body, il);
} }
if (wrapper.Parameters.Any(p => p.ParameterType.Name == "StringBuilder")) if (wrapper.Parameters.Any(p => p.ParameterType.Name == "StringBuilder"))
{ {
EmitStringBuilderEpilogue(wrapper, native, body, il); EmitStringBuilderEpilogue(wrapper, native, body, il);
} }
if (wrapper.Parameters.Any(p => p.ParameterType.Name == "StringBuilder" && p.ParameterType.IsArray))
{
EmitStringArrayEpilogue(wrapper, native, body, il);
}
// return // return
il.Emit(OpCodes.Ret); il.Emit(OpCodes.Ret);
@ -409,50 +414,65 @@ namespace OpenTK.Rewrite
private static void EmitConvenienceWrapper(MethodDefinition wrapper, private static void EmitConvenienceWrapper(MethodDefinition wrapper,
MethodDefinition native, int difference, MethodBody body, ILProcessor il) MethodDefinition native, int difference, MethodBody body, ILProcessor il)
{ {
if (difference == 2) if (wrapper.Parameters.Count > 1)
{ {
// Convert sized out-array/reference to return value, for example: EmitParameters(wrapper, body, il);
// void GenTextures(int n, int[] textures) -> int GenTexture()
// {
// const int n = 1;
// int buffers;
// calli GenTextures(n, &textures);
// return result;
// }
body.Variables.Add(new VariableDefinition(native.Parameters.Last().ParameterType));
il.Emit(OpCodes.Ldc_I4, 1); // const int n = 1
il.Emit(OpCodes.Ldloca, body.Variables.Count - 1); // &buffers
} }
else if (difference == 1 && wrapper.ReturnType.Name != "Void")
if (wrapper.ReturnType.Name != "Void")
{ {
// Convert unsized out-array/reference to return value, for example: if (difference == 2)
// void GetBoolean(GetPName pname, out bool data) -> bool GetBoolean(GetPName pname) {
// { // Convert sized out-array/reference to return value, for example:
// bool result; // void GenTextures(int n, int[] textures) -> int GenTexture()
// GetBooleanv(pname, &result); // {
// return result; // const int n = 1;
// } // int buffers;
body.Variables.Add(new VariableDefinition(wrapper.ReturnType)); // calli GenTextures(n, &textures);
il.Emit(OpCodes.Ldloca, body.Variables.Count - 1); // return result;
} // }
else if (difference == 1 && wrapper.ReturnType.Name == "Void") body.Variables.Add(new VariableDefinition(wrapper.ReturnType));
{ il.Emit(OpCodes.Ldc_I4, 1); // const int n = 1
// Convert in-array/reference to single element, for example: il.Emit(OpCodes.Ldloca, body.Variables.Count - 1); // &buffers
// void DeleteTextures(int n, ref int textures) -> void DeleteTexture(int texture) }
// { else if (difference == 1)
// const int n = 1; {
// calli DeleteTextures(n, &textures); // Convert unsized out-array/reference to return value, for example:
// } // void GetBoolean(GetPName pname, out bool data) -> bool GetBoolean(GetPName pname)
il.Emit(OpCodes.Ldc_I4, 1); // const int n = 1 // {
il.Emit(OpCodes.Ldarga, wrapper.Parameters.Last()); // &textures // bool result;
// GetBooleanv(pname, &result);
// return result;
// }
body.Variables.Add(new VariableDefinition(wrapper.ReturnType));
il.Emit(OpCodes.Ldloca, body.Variables.Count - 1);
}
else
{
Console.Error.WriteLine("Unknown wrapper type for ({0})", native.Name);
}
} }
else else
{ {
Console.Error.WriteLine("Unknown wrapper type for ({0})", native.Name); if (difference == 1)
{
// Convert in-array/reference to single element, for example:
// void DeleteTextures(int n, ref int textures) -> void DeleteTexture(int texture)
// {
// const int n = 1;
// calli DeleteTextures(n, &textures);
// }
il.Emit(OpCodes.Ldc_I4, 1); // const int n = 1
il.Emit(OpCodes.Ldarga, wrapper.Parameters.Last()); // &textures
}
else
{
Console.Error.WriteLine("Unknown wrapper type for ({0})", native.Name);
}
} }
} }
static int EmitParameters(MethodDefinition method, TypeReference nint, MethodBody body, ILProcessor il) static int EmitParameters(MethodDefinition method, MethodBody body, ILProcessor il)
{ {
int i; int i;
for (i = 0; i < method.Parameters.Count; i++) for (i = 0; i < method.Parameters.Count; i++)
@ -479,7 +499,7 @@ namespace OpenTK.Rewrite
// IntPtr ptr; // IntPtr ptr;
var variable_name = p.Name + " _sb_ptr"; var variable_name = p.Name + " _sb_ptr";
body.Variables.Add(new VariableDefinition(variable_name, nint)); body.Variables.Add(new VariableDefinition(variable_name, TypeIntPtr));
int index = body.Variables.Count - 1; int index = body.Variables.Count - 1;
// ptr = Marshal.AllocHGlobal(sb.Capacity + 1); // ptr = Marshal.AllocHGlobal(sb.Capacity + 1);